Fix CivilisationEncoder for big numbers

Apparently, 54 civs are one too many.

Author: HSZemi

src/__tests__/models/CivilisationEncoder.test.tsx

@@ -19,12 +19,11 @@ it('vikings only yields 2^30', () => {
     expect(encoded).toEqual('40000000');
 });
 
-it('all 45+1+3 civs yield 2^49-1', () => {
+it('all 45+1+3+5 civs yield 2^54-1', () => {
     const encoded = CivilisationEncoder.encodeCivilisationArray(Civilisation.ALL);
-    expect(Civilisation.ALL.length).toEqual(45+1+3);
+    expect(Civilisation.ALL.length).toEqual(45+1+3+5);
     expect(Civilisation.ALL_ACTIVE.length).toEqual(45);
-    expect(encoded).toEqual(CivilisationEncoder.toHexString(Math.pow(2, 49) - 1));
-    expect(encoded).toEqual('1ffffffffffff');
+    expect(encoded).toEqual('3fffffffffffff');
 });
 
 it('decode 0 yields empty array', () => {
@@ -44,8 +43,8 @@ it('decode 2^30 yields vikings', () => {
 
 });
 
-it('decode 2^49-1 yields all civs', () => {
-    const decoded = CivilisationEncoder.decodeCivilisationArray('1ffffffffffff');
+it('decode 2^54-1 yields all civs', () => {
+    const decoded = CivilisationEncoder.decodeCivilisationArray('3fffffffffffff');
     expect(decoded).toEqual([...Civilisation.ALL].sort((a, b) => a.name.localeCompare(b.name)));
 });
 
@@ -58,6 +57,7 @@ it('assert order of civilisations has not changed', () => {
     expect(Civilisation.ALL).toMatchSnapshot();
 });
 
+
 describe('The decoding shortcut does not lie', () => {
     it.each`
     civilisationArray | expectedLength
@@ -74,3 +74,21 @@ describe('The decoding shortcut does not lie', () => {
         expect(decoded.length).toEqual(expectedLength);
     });
 });
+
+describe('toBits works well', () => {
+    it.each`
+    encoded | result
+    ${''}    | ${[]}
+    ${'1'}    | ${[true]}
+    ${'2'}    | ${[true, false]}
+    ${'3'}    | ${[true, true]}
+    ${'4'}    | ${[true, false, false]}
+    ${'8'}    | ${[true, false, false, false]}
+    ${'f'}    | ${[true, true, true, true]}
+    ${'3f'}    | ${[true, true, true, true, true, true]}
+    ${'ff'}    | ${[true, true, true, true, true, true, true, true]}
+  `('$civilisationArray', ({encoded, result}) => {
+        const bits = CivilisationEncoder.toBits(encoded);
+        expect(bits).toEqual(result);
+    });
+});

src/__tests__/models/__snapshots__/CivilisationEncoder.test.tsx.snap

@@ -639,5 +639,70 @@ Array [
     },
     "name": "Spartans",
   },
+  Civilisation {
+    "category": "default",
+    "gameVersion": 13,
+    "i18nPrefix": "civs.",
+    "id": "Shu",
+    "imageUrls": Object {
+      "animated_left": "/images/units-animated/shu-left.apng",
+      "animated_right": "/images/units-animated/shu-right.apng",
+      "emblem": "/images/civemblems/shu.png",
+      "unit": "/images/civs/shu.png",
+    },
+    "name": "Shu",
+  },
+  Civilisation {
+    "category": "default",
+    "gameVersion": 13,
+    "i18nPrefix": "civs.",
+    "id": "Wu",
+    "imageUrls": Object {
+      "animated_left": "/images/units-animated/wu-left.apng",
+      "animated_right": "/images/units-animated/wu-right.apng",
+      "emblem": "/images/civemblems/wu.png",
+      "unit": "/images/civs/wu.png",
+    },
+    "name": "Wu",
+  },
+  Civilisation {
+    "category": "default",
+    "gameVersion": 13,
+    "i18nPrefix": "civs.",
+    "id": "Wei",
+    "imageUrls": Object {
+      "animated_left": "/images/units-animated/wei-left.apng",
+      "animated_right": "/images/units-animated/wei-right.apng",
+      "emblem": "/images/civemblems/wei.png",
+      "unit": "/images/civs/wei.png",
+    },
+    "name": "Wei",
+  },
+  Civilisation {
+    "category": "default",
+    "gameVersion": 13,
+    "i18nPrefix": "civs.",
+    "id": "Jurchens",
+    "imageUrls": Object {
+      "animated_left": "/images/units-animated/jurchens-left.apng",
+      "animated_right": "/images/units-animated/jurchens-right.apng",
+      "emblem": "/images/civemblems/jurchens.png",
+      "unit": "/images/civs/jurchens.png",
+    },
+    "name": "Jurchens",
+  },
+  Civilisation {
+    "category": "default",
+    "gameVersion": 13,
+    "i18nPrefix": "civs.",
+    "id": "Khitans",
+    "imageUrls": Object {
+      "animated_left": "/images/units-animated/khitans-left.apng",
+      "animated_right": "/images/units-animated/khitans-right.apng",
+      "emblem": "/images/civemblems/khitans.png",
+      "unit": "/images/civs/khitans.png",
+    },
+    "name": "Khitans",
+  },
 ]
 `;

src/util/CivilisationEncoder.ts

@@ -2,14 +2,20 @@ import Civilisation from "../models/Civilisation";
 
 export const CivilisationEncoder = {
     encodeCivilisationArray(civilisations: Civilisation[]): string {
-        let encoded: number = 0;
+        let value = '';
         const civilisationIds = civilisations.map(value => value.id);
-        for (let i = 0; i < Civilisation.ALL.length; i++) {
-            if (civilisationIds.includes(Civilisation.ALL[i].id)) {
-                encoded += Math.pow(2, i);
+        for (let i = 0; i < Civilisation.ALL.length; i += 4) {
+            let encoded: number = 0;
+            for (let j = 0; j < 4; j++) {
+                const index = i + j;
+                if (index < Civilisation.ALL.length && civilisationIds.includes(Civilisation.ALL[index].id)) {
+                    encoded += Math.pow(2, j);
+                }
             }
+            value = CivilisationEncoder.toHexString(encoded) + value;
         }
-        return CivilisationEncoder.toHexString(encoded);
+        value = value.replace(/^0+/, '') || '0'
+        return value;
     },
 
     decodeCivilisationArray(encoded: string): Civilisation[] {
@@ -19,12 +25,10 @@ export const CivilisationEncoder = {
             return civilisations;
         }
         try {
-            const encodedNumber = parseInt(encoded, 16);
-            const binaryString: string = encodedNumber.toString(2);
-            const bits: string[] = binaryString.split('');
+            const bits = CivilisationEncoder.toBits(encoded);
             const civilisations = [];
             for (let i = 0; i < bits.length; i++) {
-                if (bits[i] === '1') {
+                if (bits[i]) {
                     civilisations.push(Civilisation.ALL[bits.length - 1 - i]);
                 }
             }
@@ -38,5 +42,24 @@ export const CivilisationEncoder = {
 
     toHexString(input: number): string {
         return input.toString(16);
+    },
+
+    toBits(encoded: string): boolean[] {
+        const bits: boolean[] = []
+        const items = encoded.split('');
+        for (const item of items) {
+            const number = parseInt(item, 16);
+            if(isNaN(number)){
+                return []
+            }
+            let binaryString = number.toString(2);
+            binaryString = binaryString.padStart(4, '0');
+            const stringBits = binaryString.split('');
+            for (let i = 0; i < stringBits.length; i++) {
+                bits.push(stringBits[i] === '1');
+            }
+        }
+        const first = bits.indexOf(true);
+        return bits.slice(first);
     }
 };