wc3maptranslator 4.0.3 → 5.0.0

package/dist/src/W3Buffer.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.W3Buffer = void 0;
-const round_to_1 = __importDefault(require("round-to"));
+const round_to_1 = require("round-to");
 class W3Buffer {
     constructor(buffer) {
         this._offset = 0;
@@ -15,6 +12,11 @@ class W3Buffer {
         this._offset += 4;
         return int;
     }
+    readInt24() {
+        const int = this._buffer.readIntLE(this._offset, 3);
+        this._offset += 3;
+        return int;
+    }
     readShort() {
         const int = this._buffer.readInt16LE(this._offset);
         this._offset += 2;
@@ -23,7 +25,7 @@ class W3Buffer {
     readFloat() {
         const float = this._buffer.readFloatLE(this._offset);
         this._offset += 4;
-        return round_to_1.default(float, 3);
+        return (0, round_to_1.roundTo)(float, 3);
     }
     readString() {
         const string = [];
@@ -31,12 +33,12 @@ class W3Buffer {
             string.push(this._buffer[this._offset]);
             this._offset += 1;
         }
-        this._offset += 1; // consume the \0 end-of-string delimiter
+        this._offset += 1;
         return string.map((ch) => {
             return String.fromCharCode(ch);
         }).join('');
     }
-    readChars(len = 1) {
+    readChars(len = 1, allowNull = false) {
         const string = [];
         const numCharsToRead = len || 1;
         for (let i = 0; i < numCharsToRead; i++) {
@@ -44,13 +46,15 @@ class W3Buffer {
             this._offset += 1;
         }
         return string.map((ch) => {
-            if (ch === 0x0)
+            if (!allowNull && ch === 0x0)
                 return '0';
             return String.fromCharCode(ch);
         }).join('');
     }
+    readFourCC() {
+        return this.readChars(4, true);
+    }
     readByte() {
-        // TODO what kind of binary? Do we use a BigInt or a node provided type from Buffer?
         const byte = this._buffer[this._offset];
         this._offset += 1;
         return byte;

package/dist/src/W3Buffer.js.map

@@ -1 +1 @@
-{"version":3,"file":"W3Buffer.js","sourceRoot":"","sources":["../../src/W3Buffer.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAE/B,MAAa,QAAQ;IAKjB,YAAY,MAAc;QAHlB,YAAO,GAAG,CAAC,CAAC;QAIhB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAEM,OAAO;QACV,MAAM,GAAG,GAAW,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,SAAS;QACZ,MAAM,GAAG,GAAW,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,SAAS;QACZ,MAAM,KAAK,GAAW,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,kBAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;IAEM,UAAU;QACb,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;SACrB;QACD,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,yCAAyC;QAE5D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YACrB,OAAO,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;IAEM,SAAS,CAAC,MAAc,CAAC;QAC5B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,cAAc,GAAG,GAAG,IAAI,CAAC,CAAC;QAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;SACrB;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YACrB,IAAI,EAAE,KAAK,GAAG;gBAAE,OAAO,GAAG,CAAC;YAC3B,OAAO,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;IAEM,QAAQ;QACX,oFAAoF;QACpF,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAChD,CAAC;CACJ;AAlED,4BAkEC"}
+{"version":3,"file":"W3Buffer.js","sourceRoot":"","sources":["../../src/W3Buffer.ts"],"names":[],"mappings":"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"}

package/dist/src/cli.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=cli.d.ts.map

package/dist/src/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":""}

package/dist/src/cli.js

@@ -0,0 +1,162 @@
+#!/usr/bin/env node
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
+const commander_1 = require("commander");
+const fs = __importStar(require("fs-extra"));
+const node_path_1 = __importDefault(require("node:path"));
+const package_json_1 = require("../package.json");
+const CommonInterfaces_1 = require("./CommonInterfaces");
+const index_1 = require("./index");
+const TranslatorMappings_1 = __importDefault(require("./TranslatorMappings"));
+const knownWarFiles = TranslatorMappings_1.default.map((mapping) => mapping.warFile);
+const knownJsonFiles = TranslatorMappings_1.default.map((mapping) => mapping.jsonFile);
+const isDirectory = (path) => fs.existsSync(path) && fs.statSync(path).isDirectory();
+var Method;
+(function (Method) {
+    Method[Method["warToJson"] = 1] = "warToJson";
+    Method[Method["jsonToWar"] = 2] = "jsonToWar";
+})(Method || (Method = {}));
+commander_1.program
+    .name('wc3maptranslator')
+    .description('Translate between war3map and json formats for WarCraft III .w3x maps')
+    .version(package_json_1.version);
+commander_1.program
+    .argument('<input>', 'The input file or directory to be translated')
+    .argument('[output]', 'The output file or directory to save the translated data to')
+    .option('-l, --list', 'list available translators', false)
+    .option('-f, --force', 'force overwrite any existing output file', false)
+    .option('-s, --silent', 'if specified, do not print success message details (errors are still printed)', false)
+    .option('-w, --toWar', 'translate the provided input into a WC3 binary file')
+    .option('-j, --toJson', 'translate the provided input into a JSON file')
+    .configureOutput({
+    outputError(str, write) {
+        write(`${chalk_1.default.white.bold('⚔ WC3MapTranslator')} ${chalk_1.default.white.bgRed.bold(' ERROR ')}\n${chalk_1.default.gray(str)}\n${chalk_1.default.gray('Need help? Use -h or --help')}\n`);
+    }
+})
+    .action((inputPath, outputPath, options) => {
+    const resolvedInputFile = node_path_1.default.resolve(inputPath);
+    if (!fs.existsSync(resolvedInputFile)) {
+        return commander_1.program.error(`The input provided (${resolvedInputFile}) does not exist!\nPlease provide a valid file or directory to translate.`);
+    }
+    if (options.list) {
+        console.info(chalk_1.default.white('Available translators:'));
+        console.table(TranslatorMappings_1.default.map((entry) => ({
+            Name: entry.name,
+            Translator: entry.translator.name,
+            'JSON File (default)': entry.jsonFile,
+            'War File (default)': entry.warFile,
+            'Object Type': entry.objectType
+        })));
+        return;
+    }
+    const isInputDirectory = isDirectory(inputPath);
+    const isOutputDirectory = outputPath && isDirectory(outputPath);
+    if (isInputDirectory && outputPath && !isOutputDirectory) {
+        return commander_1.program.error('If input directory is specified, output must be a directory too (or output directory might not exist).');
+    }
+    if (isInputDirectory && !options.toWar && !options.toJson) {
+        return commander_1.program.error('Either --toWar (-w) or --toJson (-j) must be specified when input is a directory.');
+    }
+    if (options.toWar && options.toJson) {
+        return commander_1.program.error('Cannot use --toWar (-w) and --toJson (-j) at the same time. Choose one flag.');
+    }
+    if ((options.toWar || options.toJson) && !isInputDirectory) {
+        return commander_1.program.error('Cannot use --toWar (-w) or --toJson (-j) when input is not a directory.');
+    }
+    const writeFile = (inputFile, outputFile, data, translator) => {
+        if (!options.force && fs.existsSync(outputFile)) {
+            console.info(chalk_1.default.white.bold('⚔ WC3MapTranslator'), chalk_1.default.white.bgYellow.bold(' SKIP '), inputFile, '→', node_path_1.default.basename(outputFile), chalk_1.default.gray(`(already exists, use --force (-f) to overwrite)`));
+        }
+        else if (!options.silent) {
+            fs.writeFileSync(outputFile, data);
+            console.info(chalk_1.default.white.bold('⚔ WC3MapTranslator'), chalk_1.default.white.bgGreen.bold(' SUCCESS '), inputFile, '→', node_path_1.default.basename(outputFile), chalk_1.default.gray(`(using ${translator.name})`));
+        }
+    };
+    const fileNamesToTranslate = isInputDirectory
+        ? (options.toWar ? knownJsonFiles : knownWarFiles)
+        : [node_path_1.default.parse(inputPath).base];
+    for (const nameOfFileToTranslate of fileNamesToTranslate) {
+        const inputFile = isInputDirectory ? node_path_1.default.resolve(inputPath, nameOfFileToTranslate) : resolvedInputFile;
+        if (isInputDirectory && !fs.existsSync(inputFile)) {
+            continue;
+        }
+        let fileMapper = TranslatorMappings_1.default.find((mapper) => [mapper.jsonFile, mapper.warFile].includes(nameOfFileToTranslate));
+        if (nameOfFileToTranslate.endsWith('war3mapSkin.w3b'))
+            fileMapper = TranslatorMappings_1.default.find((mapper) => mapper.objectType === index_1.ObjectsTranslator.ObjectType.Destructables);
+        if (!fileMapper) {
+            return commander_1.program.error('The provided input file is not a standard name for either a war3map file or JSON file.\nPlease use a standard file name as shown in the --list (-l) command.');
+        }
+        const method = isInputDirectory
+            ? (options.toWar ? Method.jsonToWar : Method.warToJson)
+            : (nameOfFileToTranslate === fileMapper.jsonFile ? Method.jsonToWar : Method.warToJson);
+        let outputFilePath = '';
+        const mappedFileName = method === Method.jsonToWar ? fileMapper.warFile : fileMapper.jsonFile;
+        outputFilePath = isOutputDirectory
+            ? node_path_1.default.resolve(outputPath, mappedFileName)
+            : node_path_1.default.resolve(isInputDirectory ? inputPath : node_path_1.default.dirname(inputPath), mappedFileName);
+        const isDestructableTranslator = fileMapper.translator === index_1.ObjectsTranslator && fileMapper.objectType === index_1.ObjectsTranslator.ObjectType.Destructables;
+        const inputFileData = method === Method.jsonToWar ? fs.readJSONSync(inputFile) : fs.readFileSync(inputFile);
+        const translatorMethod = method === Method.jsonToWar ? fileMapper.translator.jsonToWar : fileMapper.translator.warToJson;
+        let skinInputFileData = undefined;
+        if (isDestructableTranslator && method === Method.warToJson) {
+            const skinDestructableFilePath = node_path_1.default.resolve(node_path_1.default.dirname(inputPath), 'war3mapSkin.w3b');
+            if (fs.existsSync(skinDestructableFilePath)) {
+                skinInputFileData = fs.readFileSync(skinDestructableFilePath);
+            }
+        }
+        try {
+            const result = fileMapper.translator === index_1.ObjectsTranslator
+                ? translatorMethod(fileMapper.objectType, inputFileData, skinInputFileData)
+                : translatorMethod(inputFileData);
+            writeFile(nameOfFileToTranslate, outputFilePath, method === Method.jsonToWar
+                ? (result.buffer)
+                : JSON.stringify(result.json, null, 2), fileMapper.translator);
+            if (isDestructableTranslator && method === Method.jsonToWar && result.bufferSkin) {
+                writeFile(nameOfFileToTranslate, node_path_1.default.resolve(node_path_1.default.dirname(outputFilePath), 'war3mapSkin.w3b'), result.bufferSkin, fileMapper.translator);
+            }
+        }
+        catch (e) {
+            if (e instanceof CommonInterfaces_1.VersionError) {
+                console.info(chalk_1.default.white.bold('⚔ WC3MapTranslator'), chalk_1.default.white.bgRed.bold(' ERROR '), nameOfFileToTranslate, '→', node_path_1.default.basename(outputFilePath), chalk_1.default.gray((`(using ${fileMapper.translator.name})`)));
+                console.error(chalk_1.default.gray(`  ${e.message}`));
+                console.error(chalk_1.default.gray(`  Expected version: ${e.expectedVersion}`));
+                console.error(chalk_1.default.gray(`  Actual version: ${e.foundVersion}`));
+            }
+            else if (e instanceof Error) {
+                commander_1.program.error(e.message);
+            }
+            else {
+                throw new Error('Unknown error occurred');
+            }
+        }
+    }
+});
+commander_1.program.parse();
+//# sourceMappingURL=cli.js.map

package/dist/src/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,kDAA0B;AAC1B,yCAAoC;AACpC,6CAA+B;AAC/B,0DAA6B;AAC7B,kDAA0C;AAC1C,yDAAsF;AACtF,mCAA4C;AAC5C,8EAAsD;AAEtD,MAAM,aAAa,GAAG,4BAAkB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAC3E,MAAM,cAAc,GAAG,4BAAkB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE7E,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;AAE7F,IAAK,MAGJ;AAHD,WAAK,MAAM;IACP,6CAAa,CAAA;IACb,6CAAa,CAAA;AACjB,CAAC,EAHI,MAAM,KAAN,MAAM,QAGV;AAED,mBAAO;KACF,IAAI,CAAC,kBAAkB,CAAC;KACxB,WAAW,CAAC,uEAAuE,CAAC;KACpF,OAAO,CAAC,sBAAO,CAAC,CAAC;AAEtB,mBAAO;KACF,QAAQ,CAAC,SAAS,EAAE,8CAA8C,CAAC;KACnE,QAAQ,CAAC,UAAU,EAAE,6DAA6D,CAAC;KACnF,MAAM,CAAC,YAAY,EAAE,4BAA4B,EAAE,KAAK,CAAC;KACzD,MAAM,CAAC,aAAa,EAAE,0CAA0C,EAAE,KAAK,CAAC;KACxE,MAAM,CAAC,cAAc,EAAE,+EAA+E,EAAE,KAAK,CAAC;KAC9G,MAAM,CAAC,aAAa,EAAE,qDAAqD,CAAC;KAC5E,MAAM,CAAC,cAAc,EAAE,+CAA+C,CAAC;KACvE,eAAe,CAAC;IACb,WAAW,CAAC,GAAG,EAAE,KAAK;QAClB,KAAK,CAAC,GAAG,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,eAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;IAChK,CAAC;CACJ,CAAC;KACD,MAAM,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;IAEvC,MAAM,iBAAiB,GAAG,mBAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;QACnC,OAAO,mBAAO,CAAC,KAAK,CAAC,uBAAuB,iBAAiB,2EAA2E,CAAC,CAAC;KAC7I;IAED,IAAI,OAAO,CAAC,IAAI,EAAE;QACd,OAAO,CAAC,IAAI,CAAC,eAAK,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACpD,OAAO,CAAC,KAAK,CAAC,4BAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7C,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,UAAU,EAAG,KAAK,CAAC,UAAkB,CAAC,IAAI;YAC1C,qBAAqB,EAAE,KAAK,CAAC,QAAQ;YACrC,oBAAoB,EAAE,KAAK,CAAC,OAAO;YACnC,aAAa,EAAE,KAAK,CAAC,UAAU;SAClC,CAAC,CAAC,CAAC,CAAC;QACL,OAAO;KACV;IAED,MAAM,gBAAgB,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC;IAKhE,IAAI,gBAAgB,IAAI,UAAU,IAAI,CAAC,iBAAiB,EAAE;QACtD,OAAO,mBAAO,CAAC,KAAK,CAAC,wGAAwG,CAAC,CAAC;KAClI;IAED,IAAI,gBAAgB,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACvD,OAAO,mBAAO,CAAC,KAAK,CAAC,mFAAmF,CAAC,CAAC;KAC7G;IAED,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;QACjC,OAAO,mBAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;KACxG;IAED,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;QACxD,OAAO,mBAAO,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAC;KACnG;IAED,MAAM,SAAS,GAAG,CAAC,SAAiB,EAAE,UAAkB,EAAE,IAAqB,EAAE,UAAuB,EAAE,EAAE;QAExG,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC7C,OAAO,CAAC,IAAI,CACR,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,EACtC,eAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EACnC,SAAS,EAAE,GAAG,EACd,mBAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EACzB,eAAK,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAChE,CAAC;SACL;aAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxB,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAEnC,OAAO,CAAC,IAAI,CACR,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,EACtC,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EACrC,SAAS,EACT,GAAG,EACH,mBAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EACzB,eAAK,CAAC,IAAI,CAAC,UAAW,UAAkB,CAAC,IAAI,GAAG,CAAC,CACpD,CAAC;SACL;IACL,CAAC,CAAC;IAKF,MAAM,oBAAoB,GAAG,gBAAgB;QACzC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC;QAClD,CAAC,CAAC,CAAC,mBAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;IAEnC,KAAK,MAAM,qBAAqB,IAAI,oBAAoB,EAAE;QACtD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACxG,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC/C,SAAS;SACZ;QAED,IAAI,UAAU,GAAG,4BAAkB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACxH,IAAI,qBAAqB,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YAAE,UAAU,GAAG,4BAAkB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,yBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC1K,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,mBAAO,CAAC,KAAK,CAAC,8JAA8J,CAAC,CAAC;SACxL;QAED,MAAM,MAAM,GAAG,gBAAgB;YAC3B,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;YACvD,CAAC,CAAC,CAAC,qBAAqB,KAAK,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAI5F,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,MAAM,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC9F,cAAc,GAAG,iBAAiB;YAC9B,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;YAC1C,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,CAAC;QAG3F,MAAM,wBAAwB,GAAG,UAAU,CAAC,UAAU,KAAK,yBAAiB,IAAI,UAAU,CAAC,UAAU,KAAK,yBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC;QACrJ,MAAM,aAAa,GAAG,MAAM,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC5G,MAAM,gBAAgB,GAAG,MAAM,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC;QAEzH,IAAI,iBAAiB,GAAG,SAAS,CAAC;QAClC,IAAI,wBAAwB,IAAI,MAAM,KAAK,MAAM,CAAC,SAAS,EAAE;YACzD,MAAM,wBAAwB,GAAG,mBAAI,CAAC,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAC;YAC1F,IAAI,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;gBACzC,iBAAiB,GAAG,EAAE,CAAC,YAAY,CAAC,wBAAwB,CAAC,CAAC;aACjE;SACJ;QAED,IAAI;YACA,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,KAAK,yBAAiB;gBACtD,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,EAAE,aAAa,EAAE,iBAAiB,CAAC;gBAC3E,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAEtC,SAAS,CACL,qBAAqB,EACrB,cAAc,EACd,MAAM,KAAK,MAAM,CAAC,SAAS;gBACvB,CAAC,CAAC,CAAE,MAAoB,CAAC,MAAM,CAAC;gBAChC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAE,MAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAC1D,UAAU,CAAC,UAAU,CACxB,CAAC;YAGF,IAAI,wBAAwB,IAAI,MAAM,KAAK,MAAM,CAAC,SAAS,IAAK,MAAoB,CAAC,UAAU,EAAE;gBAC7F,SAAS,CACL,qBAAqB,EACrB,mBAAI,CAAC,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,iBAAiB,CAAC,EAC5D,MAAoB,CAAC,UAAW,EACjC,UAAU,CAAC,UAAU,CACxB,CAAC;aACL;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,YAAY,+BAAY,EAAE;gBAC3B,OAAO,CAAC,IAAI,CACR,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,EACtC,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EACjC,qBAAqB,EACrB,GAAG,EACH,mBAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAC7B,eAAK,CAAC,IAAI,CAAC,CAAC,UAAW,UAAU,CAAC,UAAkB,CAAC,IAAI,GAAG,CAAC,CAAC,CACjE,CAAC;gBACF,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC5C,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBACtE,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;aACpE;iBAAM,IAAI,CAAC,YAAY,KAAK,EAAE;gBAC3B,mBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aAC5B;iBAAM;gBACH,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;aAC7C;SACJ;KACJ;AACL,CAAC,CAAC,CAAC;AAEP,mBAAO,CAAC,KAAK,EAAE,CAAC"}

package/dist/src/index.d.ts

@@ -1,3 +1,12 @@
-import { CamerasTranslator, DoodadsTranslator, ImportsTranslator, InfoTranslator, ObjectsTranslator, RegionsTranslator, SoundsTranslator, StringsTranslator, TerrainTranslator, UnitsTranslator } from './translators';
+import CamerasTranslator from './translators/CamerasTranslator';
+import DoodadsTranslator from './translators/DoodadsTranslator';
+import ImportsTranslator from './translators/ImportsTranslator';
+import InfoTranslator from './translators/InfoTranslator';
+import ObjectsTranslator from './translators/ObjectsTranslator';
+import RegionsTranslator from './translators/RegionsTranslator';
+import SoundsTranslator from './translators/SoundsTranslator';
+import StringsTranslator from './translators/StringsTranslator';
+import TerrainTranslator from './translators/TerrainTranslator';
+import UnitsTranslator from './translators/UnitsTranslator';
 export { CamerasTranslator, DoodadsTranslator, ImportsTranslator, InfoTranslator, ObjectsTranslator, RegionsTranslator, SoundsTranslator, StringsTranslator, TerrainTranslator, UnitsTranslator };
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EAClB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EAClB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,iBAAiB,MAAM,iCAAiC,CAAC;AAChE,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EAClB,CAAC"}

package/dist/src/index.js

@@ -1,15 +1,27 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnitsTranslator = exports.TerrainTranslator = exports.StringsTranslator = exports.SoundsTranslator = exports.RegionsTranslator = exports.ObjectsTranslator = exports.InfoTranslator = exports.ImportsTranslator = exports.DoodadsTranslator = exports.CamerasTranslator = void 0;
-const translators_1 = require("./translators");
-Object.defineProperty(exports, "CamerasTranslator", { enumerable: true, get: function () { return translators_1.CamerasTranslator; } });
-Object.defineProperty(exports, "DoodadsTranslator", { enumerable: true, get: function () { return translators_1.DoodadsTranslator; } });
-Object.defineProperty(exports, "ImportsTranslator", { enumerable: true, get: function () { return translators_1.ImportsTranslator; } });
-Object.defineProperty(exports, "InfoTranslator", { enumerable: true, get: function () { return translators_1.InfoTranslator; } });
-Object.defineProperty(exports, "ObjectsTranslator", { enumerable: true, get: function () { return translators_1.ObjectsTranslator; } });
-Object.defineProperty(exports, "RegionsTranslator", { enumerable: true, get: function () { return translators_1.RegionsTranslator; } });
-Object.defineProperty(exports, "SoundsTranslator", { enumerable: true, get: function () { return translators_1.SoundsTranslator; } });
-Object.defineProperty(exports, "StringsTranslator", { enumerable: true, get: function () { return translators_1.StringsTranslator; } });
-Object.defineProperty(exports, "TerrainTranslator", { enumerable: true, get: function () { return translators_1.TerrainTranslator; } });
-Object.defineProperty(exports, "UnitsTranslator", { enumerable: true, get: function () { return translators_1.UnitsTranslator; } });
+const CamerasTranslator_1 = __importDefault(require("./translators/CamerasTranslator"));
+exports.CamerasTranslator = CamerasTranslator_1.default;
+const DoodadsTranslator_1 = __importDefault(require("./translators/DoodadsTranslator"));
+exports.DoodadsTranslator = DoodadsTranslator_1.default;
+const ImportsTranslator_1 = __importDefault(require("./translators/ImportsTranslator"));
+exports.ImportsTranslator = ImportsTranslator_1.default;
+const InfoTranslator_1 = __importDefault(require("./translators/InfoTranslator"));
+exports.InfoTranslator = InfoTranslator_1.default;
+const ObjectsTranslator_1 = __importDefault(require("./translators/ObjectsTranslator"));
+exports.ObjectsTranslator = ObjectsTranslator_1.default;
+const RegionsTranslator_1 = __importDefault(require("./translators/RegionsTranslator"));
+exports.RegionsTranslator = RegionsTranslator_1.default;
+const SoundsTranslator_1 = __importDefault(require("./translators/SoundsTranslator"));
+exports.SoundsTranslator = SoundsTranslator_1.default;
+const StringsTranslator_1 = __importDefault(require("./translators/StringsTranslator"));
+exports.StringsTranslator = StringsTranslator_1.default;
+const TerrainTranslator_1 = __importDefault(require("./translators/TerrainTranslator"));
+exports.TerrainTranslator = TerrainTranslator_1.default;
+const UnitsTranslator_1 = __importDefault(require("./translators/UnitsTranslator"));
+exports.UnitsTranslator = UnitsTranslator_1.default;
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAWuB;AAGnB,kGAbA,+BAAiB,OAaA;AACjB,kGAbA,+BAAiB,OAaA;AACjB,kGAbA,+BAAiB,OAaA;AACjB,+FAbA,4BAAc,OAaA;AACd,kGAbA,+BAAiB,OAaA;AACjB,kGAbA,+BAAiB,OAaA;AACjB,iGAbA,8BAAgB,OAaA;AAChB,kGAbA,+BAAiB,OAaA;AACjB,kGAbA,+BAAiB,OAaA;AACjB,gGAbA,6BAAe,OAaA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAgE;AAY5D,4BAZG,2BAAiB,CAYH;AAXrB,wFAAgE;AAY5D,4BAZG,2BAAiB,CAYH;AAXrB,wFAAgE;AAY5D,4BAZG,2BAAiB,CAYH;AAXrB,kFAA0D;AAYtD,yBAZG,wBAAc,CAYH;AAXlB,wFAAgE;AAY5D,4BAZG,2BAAiB,CAYH;AAXrB,wFAAgE;AAY5D,4BAZG,2BAAiB,CAYH;AAXrB,sFAA8D;AAY1D,2BAZG,0BAAgB,CAYH;AAXpB,wFAAgE;AAY5D,4BAZG,2BAAiB,CAYH;AAXrB,wFAAgE;AAY5D,4BAZG,2BAAiB,CAYH;AAXrB,oFAA4D;AAYxD,0BAZG,yBAAe,CAYH"}

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

@@ -1,21 +1,26 @@
 /// <reference types="node" />
-import { WarResult, JsonResult, angle } from '../CommonInterfaces';
+/// <reference types="node" />
+import { WarResult, JsonResult, angle, ITranslator } from '../CommonInterfaces';
 interface Camera {
     target: CameraTarget;
     offsetZ: number;
-    rotation: angle;
+    rotation?: angle;
     aoa: angle;
     distance: number;
-    roll: number;
+    roll?: number;
     fov: angle;
     farClipping: number;
+    nearClipping?: number;
     name: string;
+    localPitch?: number;
+    localYaw?: number;
+    localRoll?: number;
 }
 interface CameraTarget {
     x: number;
     y: number;
 }
-export declare abstract class CamerasTranslator {
+export default abstract class CamerasTranslator extends ITranslator {
     static jsonToWar(cameras: Camera[]): WarResult;
     static warToJson(buffer: Buffer): JsonResult<Camera[]>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"CamerasTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/CamerasTranslator.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAElE,UAAU,MAAM;IACZ,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,YAAY;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACb;AAED,8BAAsB,iBAAiB;WAErB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;WAkCvC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;CA2ChE"}
+{"version":3,"file":"CamerasTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/CamerasTranslator.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AAE/F,UAAU,MAAM;IACZ,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,GAAG,EAAE,KAAK,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,YAAY;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,iBAAkB,SAAQ,WAAW;WACjD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS;WAkCvC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;CAiDhE"}

package/dist/src/translators/CamerasTranslator.js

@@ -1,43 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CamerasTranslator = void 0;
 const HexBuffer_1 = require("../HexBuffer");
 const W3Buffer_1 = require("../W3Buffer");
-class CamerasTranslator {
+const CommonInterfaces_1 = require("../CommonInterfaces");
+class CamerasTranslator extends CommonInterfaces_1.ITranslator {
     static jsonToWar(cameras) {
         const outBufferToWar = new HexBuffer_1.HexBuffer();
-        /*
-         * Header
-         */
-        outBufferToWar.addInt(0); // file version
-        outBufferToWar.addInt(cameras.length); // number of cameras
-        /*
-         * Body
-         */
-        cameras.forEach((camera) => {
+        outBufferToWar.addInt(0);
+        outBufferToWar.addInt(cameras.length);
+        for (const camera of cameras) {
             outBufferToWar.addFloat(camera.target.x);
             outBufferToWar.addFloat(camera.target.y);
             outBufferToWar.addFloat(camera.offsetZ);
-            outBufferToWar.addFloat(camera.rotation || 0); // optional
+            outBufferToWar.addFloat(camera.rotation || 0);
             outBufferToWar.addFloat(camera.aoa);
             outBufferToWar.addFloat(camera.distance);
             outBufferToWar.addFloat(camera.roll || 0);
             outBufferToWar.addFloat(camera.fov);
             outBufferToWar.addFloat(camera.farClipping);
-            outBufferToWar.addFloat(100); // (?) unknown - usually set to 100
-            // Camera name - must be null-terminated
+            outBufferToWar.addFloat(camera.nearClipping || 100);
+            outBufferToWar.addFloat(camera.localPitch || 0);
+            outBufferToWar.addFloat(camera.localYaw || 0);
+            outBufferToWar.addFloat(camera.localRoll || 0);
             outBufferToWar.addString(camera.name);
-        });
+        }
         return {
-            errors: [],
             buffer: outBufferToWar.getBuffer()
         };
     }
     static warToJson(buffer) {
         const result = [];
         const outBufferToJSON = new W3Buffer_1.W3Buffer(buffer);
-        const fileVersion = outBufferToJSON.readInt(), // File version
-        numCameras = outBufferToJSON.readInt(); // # of cameras
+        (0, CommonInterfaces_1.expectVersion)(0, outBufferToJSON.readInt());
+        const numCameras = outBufferToJSON.readInt();
         for (let i = 0; i < numCameras; i++) {
             const camera = {
                 target: {
@@ -51,26 +46,32 @@ class CamerasTranslator {
                 roll: 0,
                 fov: 0,
                 farClipping: 0,
-                name: ''
+                nearClipping: 0,
+                name: '',
+                localPitch: 0,
+                localYaw: 0,
+                localRoll: 0
             };
             camera.target.x = outBufferToJSON.readFloat();
             camera.target.y = outBufferToJSON.readFloat();
             camera.offsetZ = outBufferToJSON.readFloat();
             camera.rotation = outBufferToJSON.readFloat();
-            camera.aoa = outBufferToJSON.readFloat(); // angle of attack
+            camera.aoa = outBufferToJSON.readFloat();
             camera.distance = outBufferToJSON.readFloat();
             camera.roll = outBufferToJSON.readFloat();
-            camera.fov = outBufferToJSON.readFloat(); // field of view
+            camera.fov = outBufferToJSON.readFloat();
             camera.farClipping = outBufferToJSON.readFloat();
-            outBufferToJSON.readFloat(); // consume this unknown float field
+            camera.nearClipping = outBufferToJSON.readFloat();
+            camera.localPitch = outBufferToJSON.readFloat();
+            camera.localYaw = outBufferToJSON.readFloat();
+            camera.localRoll = outBufferToJSON.readFloat();
             camera.name = outBufferToJSON.readString();
             result.push(camera);
         }
         return {
-            errors: [],
             json: result
         };
     }
 }
-exports.CamerasTranslator = CamerasTranslator;
+exports.default = CamerasTranslator;
 //# sourceMappingURL=CamerasTranslator.js.map

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

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

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

@@ -1,23 +1,36 @@
 /// <reference types="node" />
-import { WarResult, JsonResult, angle } from '../CommonInterfaces';
+/// <reference types="node" />
+import { WarResult, JsonResult, angle, ITranslator } from '../CommonInterfaces';
+type ItemSet = Record<string, number>;
+interface DoodadJson {
+    regular: Doodad[];
+    special?: SpecialDoodad[];
+}
 interface Doodad {
     type: string;
-    variation: number;
+    variation?: number;
     position: number[];
     angle: angle;
     scale: number[];
-    skinId: string;
+    skinId?: string;
     flags: DoodadFlag;
-    life: number;
+    life?: number;
     id: number;
+    randomItemSetId?: number;
+    customItemSets?: ItemSet[];
+}
+interface SpecialDoodad {
+    type: string;
+    position: number[];
 }
 interface DoodadFlag {
-    visible: any;
-    solid: any;
+    visible: boolean;
+    solid: boolean;
+    fixedZ: boolean;
 }
-export declare abstract class DoodadsTranslator {
-    static jsonToWar(doodadsJson: Doodad[]): WarResult;
-    static warToJson(buffer: Buffer): JsonResult<Doodad[]>;
+export default abstract class DoodadsTranslator extends ITranslator {
+    static jsonToWar(doodadsJson: DoodadJson): WarResult;
+    static warToJson(buffer: Buffer): JsonResult<DoodadJson>;
 }
 export {};
 //# sourceMappingURL=DoodadsTranslator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DoodadsTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/DoodadsTranslator.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAElE,UAAU,MAAM;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACd;AAED,UAAU,UAAU;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;CACd;AAWD,8BAAsB,iBAAiB;WAErB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,SAAS;WAkE3C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;CA8EhE"}
+{"version":3,"file":"DoodadsTranslator.d.ts","sourceRoot":"","sources":["../../../src/translators/DoodadsTranslator.ts"],"names":[],"mappings":";;AAGA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AAE/F,KAAK,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEtC,UAAU,UAAU;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,UAAU,MAAM;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC;CAC9B;AAED,UAAU,aAAa;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,UAAU,UAAU;IAIhB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IAGf,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,iBAAkB,SAAQ,WAAW;WACjD,SAAS,CAAC,WAAW,EAAE,UAAU,GAAG,SAAS;WAwF7C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC;CA8FlE"}