wc3maptranslator 4.0.3 → 5.0.0

package/dist/src/translators/DoodadsTranslator.js

@@ -1,146 +1,138 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DoodadsTranslator = void 0;
 const HexBuffer_1 = require("../HexBuffer");
 const W3Buffer_1 = require("../W3Buffer");
 const AngleConverter_1 = require("../AngleConverter");
-var flag;
-(function (flag) {
-    // 0= invisible and non-solid tree
-    // 1= visible but non-solid tree
-    // 2= normal tree (visible and solid)
-    flag[flag["undefined"] = 0] = "undefined";
-    flag[flag["visible"] = 1 || 2] = "visible";
-    flag[flag["solid"] = 3] = "solid";
-})(flag || (flag = {}));
-class DoodadsTranslator {
+const CommonInterfaces_1 = require("../CommonInterfaces");
+class DoodadsTranslator extends CommonInterfaces_1.ITranslator {
     static jsonToWar(doodadsJson) {
+        var _a;
         const outBufferToWar = new HexBuffer_1.HexBuffer();
-        /*
-         * Header
-         */
-        outBufferToWar.addChars('W3do'); // file id
-        outBufferToWar.addInt(8); // file version
-        outBufferToWar.addInt(11); // subversion 0x0B
-        outBufferToWar.addInt(doodadsJson.length); // num of trees
-        /*
-         * Body
-         */
-        doodadsJson.forEach((tree) => {
-            outBufferToWar.addChars(tree.type);
-            outBufferToWar.addInt(tree.variation || 0); // optional - default value 0
-            outBufferToWar.addFloat(tree.position[0]);
-            outBufferToWar.addFloat(tree.position[1]);
-            outBufferToWar.addFloat(tree.position[2]);
-            // Angle
-            // Doodads format is unique because it uses radians for angles, as opposed
-            // to angles in any other file which use degrees. Hence conversion is needed.
-            //    war3map: Expects angle in RADIANS
-            //    JSON: Spec defines angle in DEGREES
-            outBufferToWar.addFloat(AngleConverter_1.deg2Rad(tree.angle) || 0); // optional - default value 0
-            // Scale
-            if (!tree.scale)
-                tree.scale = [1, 1, 1];
-            outBufferToWar.addFloat(tree.scale[0] || 1);
-            outBufferToWar.addFloat(tree.scale[1] || 1);
-            outBufferToWar.addFloat(tree.scale[2] || 1);
-            outBufferToWar.addChars(tree.skinId);
-            // Tree flags
-            /* | Visible | Solid | Flag value |
-               |   no    |  no   |     0      |
-               |  yes    |  no   |     1      |
-               |  yes    |  yes  |     2      | */
-            let treeFlag = 2; // default: normal tree
-            if (!tree.flags)
-                tree.flags = { visible: true, solid: true }; // defaults if no flags are specified
-            if (!tree.flags.visible && !tree.flags.solid)
-                treeFlag = 0;
-            else if (tree.flags.visible && !tree.flags.solid)
-                treeFlag = 1;
-            else if (tree.flags.visible && tree.flags.solid)
-                treeFlag = 2;
-            // Note: invisible and solid is not an option
+        outBufferToWar.addChars('W3do');
+        outBufferToWar.addInt(8);
+        outBufferToWar.addInt(11);
+        outBufferToWar.addInt(doodadsJson.regular.length);
+        for (const doodad of doodadsJson.regular) {
+            outBufferToWar.addChars(doodad.type);
+            outBufferToWar.addInt(doodad.variation || 0);
+            outBufferToWar.addFloat(doodad.position[0]);
+            outBufferToWar.addFloat(doodad.position[1]);
+            outBufferToWar.addFloat(doodad.position[2]);
+            outBufferToWar.addFloat((0, AngleConverter_1.deg2Rad)(doodad.angle) || 0);
+            if (!doodad.scale)
+                doodad.scale = [1, 1, 1];
+            outBufferToWar.addFloat(doodad.scale[0] || 1);
+            outBufferToWar.addFloat(doodad.scale[1] || 1);
+            outBufferToWar.addFloat(doodad.scale[2] || 1);
+            outBufferToWar.addChars(doodad.skinId || doodad.type);
+            let treeFlag = 0;
+            if (doodad.flags.visible) {
+                treeFlag = (doodad.flags.solid) ? 2 : 1;
+            }
+            if (doodad.flags.fixedZ)
+                treeFlag += 4;
             outBufferToWar.addByte(treeFlag);
-            outBufferToWar.addByte(tree.life || 100);
-            outBufferToWar.addInt(0); // NOT SUPPORTED: random item table pointer: fixed to 0
-            outBufferToWar.addInt(0); // NOT SUPPORTED: number of items dropped for item table
-            outBufferToWar.addInt(tree.id);
-        });
-        /*
-         * Footer
-         */
-        outBufferToWar.addInt(0); // special doodad format number, fixed at 0x00
-        outBufferToWar.addInt(0); // NOT SUPPORTED: number of special doodads
+            outBufferToWar.addByte(doodad.life || 100);
+            outBufferToWar.addInt(doodad.randomItemSetId && doodad.randomItemSetId >= 0 ? doodad.randomItemSetId : -1);
+            if (doodad.customItemSets && (!doodad.randomItemSetId || doodad.randomItemSetId === -1)) {
+                outBufferToWar.addInt(doodad.customItemSets.length);
+                for (const itemSet of doodad.customItemSets) {
+                    outBufferToWar.addInt(Object.keys(itemSet).length);
+                    for (const [itemId, dropChance] of Object.entries(itemSet)) {
+                        outBufferToWar.addChars(itemId);
+                        outBufferToWar.addInt(dropChance);
+                    }
+                }
+            }
+            else {
+                outBufferToWar.addInt(0);
+            }
+            outBufferToWar.addInt(doodad.id);
+        }
+        outBufferToWar.addInt(0);
+        outBufferToWar.addInt(((_a = doodadsJson.special) === null || _a === void 0 ? void 0 : _a.length) || 0);
+        for (const specialDoodad of doodadsJson.special || []) {
+            outBufferToWar.addChars(specialDoodad.type);
+            outBufferToWar.addInt(specialDoodad.position[2]);
+            outBufferToWar.addInt(specialDoodad.position[0]);
+            outBufferToWar.addInt(specialDoodad.position[1]);
+        }
         return {
-            errors: [],
             buffer: outBufferToWar.getBuffer()
         };
     }
     static warToJson(buffer) {
-        const result = [];
+        var _a;
+        const result = { regular: [], special: [] };
         const outBufferToJSON = new W3Buffer_1.W3Buffer(buffer);
-        const fileId = outBufferToJSON.readChars(4); // W3do for doodad file
-        const fileVersion = outBufferToJSON.readInt(); // File version = 8
-        const subVersion = outBufferToJSON.readInt(); // 0B 00 00 00
-        const numDoodads = outBufferToJSON.readInt(); // # of doodads
+        outBufferToJSON.readChars(4);
+        (0, CommonInterfaces_1.expectVersion)(8, outBufferToJSON.readInt());
+        (0, CommonInterfaces_1.expectVersion)(11, outBufferToJSON.readInt());
+        const numDoodads = outBufferToJSON.readInt();
         for (let i = 0; i < numDoodads; i++) {
             const doodad = {
                 type: '',
-                variation: 0,
                 position: [0, 0, 0],
                 angle: -1,
                 scale: [0, 0, 0],
-                skinId: '',
-                flags: { visible: flag.visible, solid: flag.solid },
-                life: -1,
+                flags: { visible: true, solid: true, fixedZ: false },
                 id: -1
             };
             doodad.type = outBufferToJSON.readChars(4);
             doodad.variation = outBufferToJSON.readInt();
-            doodad.position = [outBufferToJSON.readFloat(), outBufferToJSON.readFloat(), outBufferToJSON.readFloat()]; // X Y Z coords
-            // Angle
-            // Doodads format is unique because it uses radians for angles, as opposed
-            // to angles in any other file which use degrees. Hence conversion is needed.
-            //    war3map: Expects angle in RADIANS
-            //    JSON: Spec defines angle in DEGREES
-            doodad.angle = AngleConverter_1.rad2Deg(outBufferToJSON.readFloat());
-            doodad.scale = [outBufferToJSON.readFloat(), outBufferToJSON.readFloat(), outBufferToJSON.readFloat()]; // X Y Z scaling
-            doodad.skinId = outBufferToJSON.readChars(4);
-            const flags = outBufferToJSON.readByte();
-            doodad.flags = {
-                visible: flags === 1 || flags === 2,
-                solid: flags === 2
-            };
-            doodad.life = outBufferToJSON.readByte(); // as a %
-            // UNSUPPORTED: random item set drops when doodad is destroyed/killed
-            // This section just consumes the bytes from the file
-            const randomItemSetPtr = outBufferToJSON.readInt(); // points to an item set defined in the map (rather than custom one defined below)
-            const numberOfItemSets = outBufferToJSON.readInt(); // this should be 0 if randomItemSetPtr is >= 0
-            for (let j = 0; j < numberOfItemSets; j++) {
-                // Read the item set
-                const numberOfItems = outBufferToJSON.readInt();
-                for (let k = 0; k < numberOfItems; k++) {
-                    outBufferToJSON.readChars(4); // Item ID
-                    outBufferToJSON.readInt(); // % chance to drop
+            doodad.position = [outBufferToJSON.readFloat(), outBufferToJSON.readFloat(), outBufferToJSON.readFloat()];
+            doodad.angle = (0, AngleConverter_1.rad2Deg)(outBufferToJSON.readFloat());
+            doodad.scale = [outBufferToJSON.readFloat(), outBufferToJSON.readFloat(), outBufferToJSON.readFloat()];
+            const skinId = outBufferToJSON.readChars(4);
+            if (skinId !== doodad.type)
+                doodad.skinId = skinId;
+            let flags = outBufferToJSON.readByte();
+            if (flags > 4) {
+                flags -= 4;
+                doodad.flags.fixedZ = true;
+            }
+            doodad.flags.visible = flags >= 1;
+            doodad.flags.solid = flags === 2;
+            const life = outBufferToJSON.readByte();
+            if (life !== 100)
+                doodad.life = life;
+            const randomItemSetPtr = outBufferToJSON.readInt();
+            const numberOfItemSets = outBufferToJSON.readInt();
+            if (randomItemSetPtr >= 0) {
+                doodad.randomItemSetId = randomItemSetPtr;
+            }
+            else if (numberOfItemSets) {
+                doodad.customItemSets = [];
+                for (let j = 0; j < numberOfItemSets; j++) {
+                    const itemSet = {};
+                    const numberOfItems = outBufferToJSON.readInt();
+                    for (let k = 0; k < numberOfItems; k++) {
+                        const itemId = outBufferToJSON.readChars(4);
+                        const dropChance = outBufferToJSON.readInt();
+                        itemSet[itemId] = dropChance;
+                    }
+                    doodad.customItemSets.push(itemSet);
                 }
             }
             doodad.id = outBufferToJSON.readInt();
-            result.push(doodad);
+            result.regular.push(doodad);
         }
-        // UNSUPPORTED: Special doodads
-        outBufferToJSON.readInt(); // special doodad format version set to '0'
+        outBufferToJSON.readInt();
         const numSpecialDoodads = outBufferToJSON.readInt();
         for (let i = 0; i < numSpecialDoodads; i++) {
-            outBufferToJSON.readChars(4); // doodad ID
-            outBufferToJSON.readInt();
-            outBufferToJSON.readInt();
-            outBufferToJSON.readInt();
+            const id = outBufferToJSON.readChars(4);
+            const posZ = outBufferToJSON.readInt();
+            const posX = outBufferToJSON.readInt();
+            const posY = outBufferToJSON.readInt();
+            (_a = result.special) === null || _a === void 0 ? void 0 : _a.push({
+                type: id,
+                position: [posX, posY, posZ]
+            });
         }
         return {
-            errors: [],
             json: result
         };
     }
 }
-exports.DoodadsTranslator = DoodadsTranslator;
+exports.default = DoodadsTranslator;
 //# sourceMappingURL=DoodadsTranslator.js.map

package/dist/src/translators/DoodadsTranslator.js.map

@@ -1 +1 @@
-{"version":3,"file":"DoodadsTranslator.js","sourceRoot":"","sources":["../../../src/translators/DoodadsTranslator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DoodadsTranslator.js","sourceRoot":"","sources":["../../../src/translators/DoodadsTranslator.ts"],"names":[],"mappings":"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"}

package/dist/src/translators/ImportsTranslator.d.ts

@@ -1,16 +1,8 @@
 /// <reference types="node" />
-import { WarResult, JsonResult } from '../CommonInterfaces';
-declare enum ImportType {
-    Standard = "standard",
-    Custom = "custom"
-}
-interface Import {
-    path: string;
-    type: ImportType;
-}
-export declare class ImportsTranslator {
-    static jsonToWar(imports: Import[]): WarResult;
-    static warToJson(buffer: Buffer): JsonResult<Import[]>;
+/// <reference types="node" />
+import { WarResult, JsonResult, ITranslator } from '../CommonInterfaces';
+export default abstract class ImportsTranslator extends ITranslator {
+    static jsonToWar(imports: string[]): WarResult;
+    static warToJson(buffer: Buffer): JsonResult<string[]>;
 }
-export {};
 //# sourceMappingURL=ImportsTranslator.d.ts.map

package/dist/src/translators/ImportsTranslator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImportsTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/ImportsTranslator.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAE3D,aAAK,UAAU;IACX,QAAQ,aAAa;IACrB,MAAM,WAAW;CACpB;AAED,UAAU,MAAM;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CACpB;AAED,qBAAa,iBAAiB;WAEZ,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;WA+BvC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;CA8BhE"}
+{"version":3,"file":"ImportsTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/ImportsTranslator.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AAIxF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,iBAAkB,SAAQ,WAAW;WACjD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;WAsBvC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;CAiBhE"}

package/dist/src/translators/ImportsTranslator.js

@@ -1,62 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportsTranslator = void 0;
 const HexBuffer_1 = require("../HexBuffer");
 const W3Buffer_1 = require("../W3Buffer");
-var ImportType;
-(function (ImportType) {
-    ImportType["Standard"] = "standard";
-    ImportType["Custom"] = "custom";
-})(ImportType || (ImportType = {}));
-class ImportsTranslator {
+const CommonInterfaces_1 = require("../CommonInterfaces");
+const CurrentPathVersion = 21;
+class ImportsTranslator extends CommonInterfaces_1.ITranslator {
     static jsonToWar(imports) {
         const outBufferToWar = new HexBuffer_1.HexBuffer();
-        /*
-         * Header
-         */
-        outBufferToWar.addInt(1); // file version
-        outBufferToWar.addInt(imports.length); // number of imports
-        /*
-         * Body
-         */
-        imports.forEach((importedFile) => {
-            outBufferToWar.addByte(importedFile.type === ImportType.Custom ? 13 : 5);
-            // Temporary: always start the file path with war3mapImported\ until other file support is added
-            if (!importedFile.path.startsWith('war3mapImported\\') && importedFile.type === ImportType.Custom) {
-                importedFile.path = 'war3mapImported\\' + importedFile.path;
-            }
-            outBufferToWar.addString(importedFile.path);
-        });
+        outBufferToWar.addInt(1);
+        outBufferToWar.addInt(imports.length);
+        for (const importedFile of imports) {
+            outBufferToWar.addByte(CurrentPathVersion);
+            outBufferToWar.addString(importedFile);
+        }
         return {
-            errors: [],
             buffer: outBufferToWar.getBuffer()
         };
     }
     static warToJson(buffer) {
         const result = [];
         const outBufferToJSON = new W3Buffer_1.W3Buffer(buffer);
-        const fileVersion = outBufferToJSON.readInt(); // File version
-        const numImports = outBufferToJSON.readInt(); // # of imports
+        (0, CommonInterfaces_1.expectVersion)(1, outBufferToJSON.readInt());
+        const numImports = outBufferToJSON.readInt();
         for (let i = 0; i < numImports; i++) {
-            const typeValue = outBufferToJSON.readByte();
-            const typeEnum = {
-                0: 'standard',
-                5: 'standard',
-                8: 'standard',
-                10: 'custom',
-                13: 'custom' // * preferred
-            };
-            const importedFile = {
-                type: typeEnum[typeValue],
-                path: outBufferToJSON.readString() // e.g. "war3mapImported\mysound.wav"
-            };
-            result.push(importedFile);
+            outBufferToJSON.readByte();
+            const path = outBufferToJSON.readString();
+            result.push(path);
         }
         return {
-            errors: [],
             json: result
         };
     }
 }
-exports.ImportsTranslator = ImportsTranslator;
+exports.default = ImportsTranslator;
 //# sourceMappingURL=ImportsTranslator.js.map

package/dist/src/translators/ImportsTranslator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportsTranslator.js","sourceRoot":"","sources":["../../../src/translators/ImportsTranslator.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AACzC,0CAAuC;AAGvC,IAAK,UAGJ;AAHD,WAAK,UAAU;IACX,mCAAqB,CAAA;IACrB,+BAAiB,CAAA;AACrB,CAAC,EAHI,UAAU,KAAV,UAAU,QAGd;AAOD,MAAa,iBAAiB;IAEnB,MAAM,CAAC,SAAS,CAAC,OAAiB;QACrC,MAAM,cAAc,GAAG,IAAI,qBAAS,EAAE,CAAC;QAEvC;;WAEG;QACH,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe;QACzC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB;QAE3D;;WAEG;QACH,OAAO,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC7B,cAAc,CAAC,OAAO,CAClB,YAAY,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CACnD,CAAC;YAEF,gGAAgG;YAChG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,YAAY,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE;gBAC/F,YAAY,CAAC,IAAI,GAAG,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC;aAC/D;YAED,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,OAAO;YACH,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,cAAc,CAAC,SAAS,EAAE;SACrC,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,MAAc;QAClC,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,IAAI,mBAAQ,CAAC,MAAM,CAAC,CAAC;QAE7C,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,eAAe;QAC9D,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,eAAe;QAE7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE;YACjC,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG;gBACb,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,UAAU;gBACb,CAAC,EAAE,UAAU;gBACb,EAAE,EAAE,QAAQ;gBACZ,EAAE,EAAE,QAAQ,CAAE,cAAc;aAC/B,CAAC;YAEF,MAAM,YAAY,GAAG;gBACjB,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC;gBACzB,IAAI,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC,qCAAqC;aAC3E,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC7B;QAED,OAAO;YACH,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,MAAM;SACf,CAAC;IACN,CAAC;CACJ;AA/DD,8CA+DC"}
+{"version":3,"file":"ImportsTranslator.js","sourceRoot":"","sources":["../../../src/translators/ImportsTranslator.ts"],"names":[],"mappings":";;AAAA,4CAAyC;AACzC,0CAAuC;AACvC,0DAAwF;AAExF,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,MAA8B,iBAAkB,SAAQ,8BAAW;IACxD,MAAM,CAAC,SAAS,CAAC,OAAiB;QACrC,MAAM,cAAc,GAAG,IAAI,qBAAS,EAAE,CAAC;QAKvC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAKzB,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtC,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE;YAChC,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAC3C,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,OAAO;YACH,MAAM,EAAE,cAAc,CAAC,SAAS,EAAE;SACrC,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,MAAc;QAClC,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,IAAI,mBAAQ,CAAC,MAAM,CAAC,CAAC;QAE7C,IAAA,gCAAa,EAAC,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5C,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC;QAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE;YACjC,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrB;QAED,OAAO;YACH,IAAI,EAAE,MAAM;SACf,CAAC;IACN,CAAC;CACJ;AAxCD,oCAwCC"}

package/dist/src/translators/InfoTranslator.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" />
-import { WarResult, JsonResult } from '../CommonInterfaces';
+/// <reference types="node" />
+import { WarResult, JsonResult, ITranslator } from '../CommonInterfaces';
+import { PlayerArray } from '../PlayerBitfield';
 interface Map {
     name: string;
     author: string;
@@ -31,10 +33,15 @@ interface MapFlags {
     useCustomUpgrades: boolean;
     waterWavesOnCliffShores: boolean;
     waterWavesOnRollingShores: boolean;
+    useTerrainFog: boolean;
     useItemClassificationSystem: boolean;
     enableWaterTinting: boolean;
     useAccurateProbabilityForCalculations: boolean;
     useCustomAbilitySkins: boolean;
+    disableDenyIcon: boolean;
+    forceDefaultCameraZoom: boolean;
+    forceMaxCameraZoom: boolean;
+    forceMinCameraZoom: boolean;
 }
 interface LoadingScreen {
     background: number;
@@ -43,11 +50,6 @@ interface LoadingScreen {
     title: string;
     subtitle: string;
 }
-declare enum FogType {
-    Linear = 0,
-    Exponential1 = 1,
-    Exponential2 = 2
-}
 interface Fog {
     type: FogType;
     startHeight: number;
@@ -69,6 +71,8 @@ interface Info {
     saves: number;
     gameVersion: GameVersion;
     editorVersion: number;
+    gameDataSet: GameDataSet;
+    gameDataVersion: GameDataVersion;
     scriptLanguage: ScriptLanguage;
     supportedModes: SupportedModes;
     map: Map;
@@ -82,6 +86,13 @@ interface Info {
     water: number[];
     players: Player[];
     forces: Force[];
+    forceDefaultCameraZoom: number;
+    forceMaxCameraZoom: number;
+    forceMinCameraZoom: number;
+    upgrades: Upgrade[];
+    techtree: Techtree[];
+    randomGroupTable: RandomGroupTable[];
+    randomItemTable: RandomItemTable[];
 }
 interface PlayerStartingPosition {
     x: number;
@@ -90,10 +101,14 @@ interface PlayerStartingPosition {
 }
 interface Player {
     playerNum: number;
-    type: number;
-    race: number;
+    type: PlayerType;
+    race: PlayerRace;
     name: string;
     startingPos: PlayerStartingPosition;
+    allyLowPriorityFlags?: PlayerArray;
+    allyHighPriorityFlags?: PlayerArray;
+    enemyLowPriorityFlags?: PlayerArray;
+    enemyHighPriorityFlags?: PlayerArray;
 }
 interface ForceFlags {
     allied: boolean;
@@ -104,9 +119,69 @@ interface ForceFlags {
 }
 interface Force {
     flags: ForceFlags;
-    players: number;
+    players: PlayerArray;
     name: string;
 }
+interface RandomItem {
+    chance: number;
+    id: string;
+}
+interface RandomItemTable {
+    number: number;
+    name: string;
+    sets: RandomItem[][];
+}
+interface RandomGroupRow {
+    chance: number;
+    entries: string[];
+}
+interface RandomGroupTable {
+    number: number;
+    name: string;
+    positions: RandomGroupType[];
+    rows: RandomGroupRow[];
+}
+interface Techtree {
+    players: PlayerArray;
+    id: string;
+}
+interface Upgrade {
+    players: PlayerArray;
+    id: string;
+    level: number;
+    availability: UpgradeAvailability;
+}
+declare enum UpgradeAvailability {
+    Unavailable = 0,
+    Available = 1,
+    Researched = 2
+}
+declare enum PlayerType {
+    Human = 1,
+    Computer = 2,
+    Neutral = 3,
+    Rescuable = 4
+}
+declare enum PlayerRace {
+    Human = 1,
+    Orc = 2,
+    Undead = 3,
+    NightElf = 4
+}
+declare enum FogType {
+    Linear = 0,
+    Exponential1 = 1,
+    Exponential2 = 2
+}
+declare enum GameDataSet {
+    Default = 0,
+    Custom101 = 1,
+    MeleeLatestPath = 2
+}
+declare enum GameDataVersion {
+    ROC = 0,
+    TFT = 1
+}
 declare enum ScriptLanguage {
     JASS = 0,
     Lua = 1
@@ -116,7 +191,20 @@ declare enum SupportedModes {
     HD = 2,
     Both = 3
 }
-export declare abstract class InfoTranslator {
+declare enum RandomGroupType {
+    Unit = 0,
+    Building = 1,
+    Item = 2
+}
+export default abstract class InfoTranslator extends ITranslator {
+    static readonly PlayerType: typeof PlayerType;
+    static readonly PlayerRace: typeof PlayerRace;
+    static readonly FogType: typeof FogType;
+    static readonly GameDataSet: typeof GameDataSet;
+    static readonly GameDataVersion: typeof GameDataVersion;
+    static readonly ScriptLanguage: typeof ScriptLanguage;
+    static readonly SupportedModes: typeof SupportedModes;
+    static readonly UpgradeAvailability: typeof UpgradeAvailability;
     static jsonToWar(infoJson: Info): WarResult;
     static warToJson(buffer: Buffer): JsonResult<Info>;
 }

package/dist/src/translators/InfoTranslator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InfoTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/InfoTranslator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"InfoTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/InfoTranslator.ts"],"names":[],"mappings":"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"}