@jtff/miztemplate-lib 3.0.0-rc14 → 3.0.0-rc15

package/lib/mizlib.js

@@ -107,19 +107,17 @@ class Mizlib {
         return MizFile.loadAsync(mizData);
     }
 
-    async mizUpdate(mizPath, copyPath, strTheatreSettings) {
-        const zip = await this.getZipObjectFromMizPath(mizPath);
-        this.injectLuaFilesFromFolderIntoZipObject(zip, 'src');
-        this.injectLuaFilesFromFolderIntoZipObject(zip, 'lib');
-        if (strTheatreSettings === null) {
-            // TODO: Inject fake data
-            console.log("NO THEATRE SPECIFIED. RADIO PRESETS WILL NOT BE AVAILABLE !");
-        } else {
-            await this.injectRadioPresetsFromFolderIntoZipObject(zip, 'resources/radios/' + strTheatreSettings);
-        }
-        this.mizUpdateSettingsLuaFiles(zip, strTheatreSettings);
-        await this.mizUpdateSoundFolders(zip);
-        const inputZip = await zip.generateAsync({
+    async buildMizFileFromMizTemplate(mizPath, copyPath) {
+        const zipObject = await this.getZipObjectFromMizPath(mizPath);
+        const missionObject = await this.getMissionObjectFromZipObject(zipObject);
+        const strTheatreSettings = missionObject.theatre;
+        // TODO: D'abord mettre à jour les fichiers src et lib depuis la miztemplate sauf 200-mission.lua
+        this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'src');
+        this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'lib');
+        await this.injectRadioPresetsFromFolderIntoZipObject(zipObject, 'resources/radios/' + strTheatreSettings);
+        this.mizUpdateSettingsLuaFiles(zipObject, strTheatreSettings);
+        await this.mizUpdateSoundFolders(zipObject);
+        const inputZip = await zipObject.generateAsync({
             type: 'nodebuffer',
             streamFiles: true,
             compression: "DEFLATE",

package/lua/src/199-skynet.lua

@@ -568,7 +568,7 @@ function manageIADSNetworkMenu(networkRootMenu, iadsconfig, IADSObjectIndex)
                     deactivateSkynet,
                     { iadsconfig, IADSObjectIndex, networkRootMenu }
             )
-            --TODO: A tweaker pour que les objets skynets seront basés sur la coalition et non sur la mission globale
+            --TODO: A tweaker pour que les objets skynets soient basés sur la coalition et non sur la mission globale
             if (type(iadsconfig.gci) == "table") then
                 local CommandGCIActivate = MENU_MISSION_COMMAND:New(
                         "GCI Activation",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.0.0-rc14",
+  "version": "3.0.0-rc15",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [

package/scripts/build.js

@@ -4,7 +4,7 @@ function build(jtffci) {
     fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
     jtffci.config.missionTemplates.forEach(async missionTemplate => {
         if (missionTemplate.filename) {
-            await jtffci.mizlib.mizUpdate(
+            await jtffci.mizlib.buildMizFileFromMizTemplate(
                 missionTemplate.filename,
                 [
                     jtffci.config.general.missionFolder + '/' + jtffci.config.general.missionPrefix,
@@ -15,9 +15,9 @@ function build(jtffci) {
                     '_',
                     jtffci.displayVersion(jtffci.getVersion()),
                     ".miz"
-                ].join(""), missionTemplate.theatre);
+                ].join(""));
         } else {
-            await jtffci.mizlib.mizUpdate([
+            await jtffci.mizlib.buildMizFileFromMizTemplate([
                 missionTemplate.prefix,
                 '_',
                 missionTemplate.theatre,
@@ -31,7 +31,7 @@ function build(jtffci) {
                 '_',
                 jtffci.displayVersion(jtffci.getVersion()),
                 ".miz"
-            ].join(""), missionTemplate.theatre);
+            ].join(""));
         }
         let publicationConfig = {
             theatre: missionTemplate.theatre,

package/scripts/template-update.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 function templateUpdate(jtffci) {
     fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
     jtffci.config.missionTemplates.map(async missionTemplate => {
-        await this.mizlib.mizUpdate([
+        await this.mizlib.buildMizFileFromMizTemplate([
             missionTemplate.prefix,
             '_',
             missionTemplate.theatre,