@jtff/miztemplate-lib 3.4.16 → 3.4.18

package/lua/lib/funkman.lua

@@ -1 +1 @@
-FunkMan = SOCKET:New(10042, "127.0.0.1")
+FunkMan = SOCKET:New(FunkmanConfig.port, FunkmanConfig.ip)

package/lua/settings/settings-airboss.lua

@@ -3,7 +3,6 @@ AirBossConfig = {
         enable = false,
         srs = {
             useSRS = true,
-            path = "C:\\SRS",
         },
         carriername = 'CSG-1 CVN-71-1',
         alias = 'roosevelt',
@@ -66,7 +65,6 @@ AirBossConfig = {
         enable = false,
         srs = {
             useSRS = true,
-            path = "C:\\SRS",
         },
         carriername = 'CSG-2 CVN-73',
         alias = 'washington',

package/lua/settings/settings-atis.lua

@@ -24,8 +24,6 @@ AtisConfig = {
             freq = 109.3,
             runway = '05'
         },
-        srs = {
-            path = "C:\\SRS"
-        }
+        useSRS = true,
     }
 }

package/lua/settings/settings-training_ranges.lua

@@ -5,7 +5,6 @@ TrainingRangeConfig = {
         targetsheetpath = "C:/rangeboss-targetsheets",
         srs = {
             useSRS = true,
-            path = "C:\\SRS",
         },
         instructionradio = {
             unitname = "toto",

package/lua/src/020-mission_functions.lua

@@ -24,6 +24,23 @@ JTFF_LOGLEVEL = 'info'
 
 use_jtff_sound_mod = false
 
+if (not(FunkmanConfig)) then
+    jtff_log.error(string.format("Local Funkman Bot config not specified ! Initializing empty values for Funkman"), "Initialization")
+    FunkmanConfig = {
+        ip= "127.0.0.1",
+        port = 10042,
+    }
+end
+
+if (not(SRSConfig)) then
+    jtff_log.error(string.format("Local SRS config not specified ! Initializing empty values for SRS"), "Initialization")
+    SRSConfig= {
+        port = 5002,
+        path = "C:\\SRS",
+        ip = "127.0.0.1",
+    }
+end
+
 spawnStandardDelay = 15
 
 sead = SEAD:New({})

package/lua/src/130-airboss.lua

@@ -1191,7 +1191,7 @@ for index, airbossconfig in ipairs(AirBossConfig) do
         objAirboss:SetMaxSectionSize(4)
         objAirboss:SetMaxMarshalStacks(airbossconfig.maxstacks)
         objAirboss:SetDefaultPlayerSkill(airbossconfig.difficulty) -- other options EASY / HARD
-        objAirboss:SetFunkManOn(10042, "127.0.0.1")
+        objAirboss:SetFunkManOn(FunkmanConfig.port, FunkmanConfig.ip)
         if airbossconfig.wirecorrection then
             objAirboss:SetMPWireCorrection(airbossconfig.wirecorrection)
         else
@@ -1230,7 +1230,7 @@ for index, airbossconfig in ipairs(AirBossConfig) do
         objAirboss:SetAirbossNiceGuy(airbossconfig.enable_niceguy)
         if ( type(airbossconfig.srs) ~= nil ) then
             if ( airbossconfig.srs.useSRS == true) then
-                objAirboss:EnableSRS(airbossconfig.srs.path, airbossconfig.srs.port, 'en-US')
+                objAirboss:EnableSRS(SRSConfig.path, SRSConfig.port, 'en-US')
             else
                 objAirboss:SetSoundfilesFolder(soundFilesPrefix .. "AIRBOSS/Airboss Soundfiles/")
                 if airbossconfig.voices.marshall then

package/lua/src/160-atis.lua

@@ -43,8 +43,8 @@ for index, atisconfig in ipairs(AtisConfig) do
                 objAtis:AddILS(atisconfig.ils.freq)
             end
         end
-        if (atisconfig.srs) then
-            objAtis:SetSRS(atisconfig.srs.path, "male", "en-US", nil, serverSRSPort or 5002)
+        if (atisconfig.useSRS) then
+            objAtis:SetSRS(SRSConfig.path, "male", "en-US", nil, SRSConfig.port)
         end
         objAtis.customconfig = atisconfig
         ATISArray[compteur] = objAtis

package/lua/src/193-training_ranges.lua

@@ -15,12 +15,12 @@ for index, traingingrangeconfig in ipairs(TrainingRangeConfig) do
         trainingRange:SetDefaultPlayerSmokeBomb(false)
         trainingRange:SetRangeRadius(0.2) -- bomb impact at more than 200m is out of range
         trainingRange:SetScoreBombDistance(100)-- bomb impact at more than 100m won't be taken into account
-        trainingRange:SetFunkManOn(10042,"127.0.0.1")
+        trainingRange:SetFunkManOn(FunkmanConfig.port, FunkmanConfig.ip)
         trainingRange:SetAutosaveOn()
         trainingRange:SetTargetSheet(traingingrangeconfig.targetsheetpath)
         if ( type(traingingrangeconfig.srs) ~= nil ) then
             if ( traingingrangeconfig.srs.useSRS == true) then
-                trainingRange:SetSRS(traingingrangeconfig.srs.path, serverSRSPort or 5002, coalition.side.BLUE)
+                trainingRange:SetSRS(SRSConfig.path, SRSConfig.port, coalition.side.BLUE)
             else
                 trainingRange:SetSoundfilesPath(soundFilesPrefix .. 'RANGE/Range Soundfiles/')
             end

package/package.json

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