Merge branch 'master' into develop

Moose Development/Moose/Functional/Artillery.lua

@@ -534,7 +534,7 @@
 ARTY={
   ClassName="ARTY",
   lid=nil,
-  Debug=true,
+  Debug=false,
   targets={},
   moves={},
   currentTarget=nil,
@@ -629,23 +629,95 @@ ARTY.WeaponType={
 -- Table key is the "type name" and table value is and `ARTY.dbitem`.
 -- @type ARTY.db
 ARTY.db={
+  ["LeFH_18-40-105"] = {
+    displayname = "FH LeFH-18 105mm", -- name displayed in the ME
+    minrange    = 500,                -- min range (green circle) in meters
+    maxrange    = 10500,              -- max range (red circle) in meters
+    reloadtime  = nil,                -- reload time in seconds
+  },
+  ["M2A1-105"] = {
+    displayname = "FH M2A1 105mm",
+    minrange    = 500,
+    maxrange    = 11500,
+    reloadtime  = nil,
+  },
+  ["Pak40"] = {
+    displayname = "FH Pak 40 75mm",
+    minrange    = 500,
+    maxrange    = 3000,
+    reloadtime  = nil,
+  },      
+  ["L118_Unit"] = {
+    displayname = "L118 Light Artillery Gun",
+    minrange    = 500,
+    maxrange    = 17500,
+    reloadtime  = nil,
+  },
+  ["Smerch"] = {
+    displayname = "MLRS 9A52 Smerch CM 300mm",
+    minrange    = 20000,
+    maxrange    = 70000,
+    reloadtime  = 2160,
+  },
+  ["Smerch_HE"] = {
+    displayname = "MLRS 9A52 Smerch HE 300mm",
+    minrange    = 20000,
+    maxrange    = 70000,
+    reloadtime  = 2160,
+  },
+  ["Uragan_BM-27"] = {
+    displayname = "MLRS 9K57 Uragan BM-27 220mm",
+    minrange   = 11500,
+    maxrange   = 35800,
+    reloadtime = 840,
+  },
+  ["Grad-URAL"] = {
+    displayname = "MLRS BM-21 Grad 122mm",
+    minrange   = 5000,
+    maxrange   = 19000,
+    reloadtime = 420,
+  },
+  ["HL_B8M1"] = {
+    displayname = "MLRS HL with B8M1 80mm",
+    minrange   = 500,
+    maxrange   = 5000,
+    reloadtime = nil,
+  },
+  ["tt_B8M1"] = {
+    displayname = "MLRS LC with B8M1 80mm",
+    minrange   = 500,
+    maxrange   = 5000,
+    reloadtime = nil,
+  },
+  ["MLRS"] = {
+    displayname = "MLRS M270 227mm",
+    minrange   = 10000,
+    maxrange   = 32000,
+    reloadtime = 540,
+  },
   ["2B11 mortar"] = {
     displayname = "Mortar 2B11 120mm", 
-    minrange    = 500,  -- correct?
+    minrange    = 500,
-    maxrange    = 7000, -- 7 km
+    maxrange    = 7000,
-    reloadtime  = 30,   -- 30 sec
+    reloadtime  = 30,
+  },
+  ["PLZ05"] = {
+    displayname = "PLZ-05", 
+    minrange    = 500,
+    maxrange    = 23500,
+    reloadtime  = nil,
   },
   ["SAU Gvozdika"] = {
     displayname = "SPH 2S1 Gvozdika 122mm",
-    minrange    = 300,      -- correct?
+    minrange    = 300,
-    maxrange    = 15000,    -- 15 km
+    maxrange    = 15000,
-    reloadtime  = nil,      -- unknown
+    reloadtime  = nil,
   },
   ["SAU Msta"] = {
     displayname = "SPH 2S19 Msta 152mm",
-    minrange    = 300,     -- correct?
+    minrange    = 300,
-    maxrange    = 23500,   -- 23.5 km
+    maxrange    = 23500,
-    reloadtime  = nil,     -- unknown
+    reloadtime  = nil,
   },
   ["SAU Akatsia"] = {
     displayname = "SPH 2S3 Akatsia 152mm",
@@ -653,43 +725,17 @@ ARTY.db={
     maxrange    = 17000,
     reloadtime  = nil,
   },
-  ["SAU 2-C9"] = {
-    displayname = "SPM 2S9 Nona 120mm M",
-    minrange    = 500,
-    maxrange    = 7000,
-    reloadtime  = nil,
-  },
-  ["M-109"] = {
-    displayname = "SPH M109 Paladin 155mm",
-    minrange    = 300,
-    maxrange    = 22000,
-    reloadtime  = nil,
-  },
   ["SpGH_Dana"] = {
     displayname = "SPH Dana vz77 152mm",
     minrange    = 300,
     maxrange    = 18700,
     reloadtime  = nil,
   },
-  ["MLRS BM-21 Grad"] = { --type "Grad-URAL", alias "MLRS BM-21 Grad"
+  ["M-109"] = {
-    minrange = 5000,
+    displayname = "SPH M109 Paladin 155mm",
-    maxrange = 19000,
+    minrange    = 300,
-    reloadtime = 420,
+    maxrange    = 22000,
-  },
+    reloadtime  = nil,
-  ["MLRS 9K57 Uragan BM-27"] = { -- type "Uragan_BM-27"
-    minrange   = 11500,
-    maxrange   = 35800,
-    reloadtime = 840,
-  },
-  ["MLRS 9A52 Smerch"] = { -- type "Smerch"
-    minrange   = 20000,
-    maxrange   = 70000,
-    reloadtime = 2160,
-  },
-  ["MLRS M270"] = { --type "MRLS", alias "M270 MRLS"
-    minrange   = 10000,
-    maxrange   = 32000,
-    reloadtime = 540,
   }, 
   ["M12_GMC"] = {
     displayname = "SPH M12 GMC 155mm",
@@ -709,10 +755,11 @@ ARTY.db={
     maxrange    = 41000,
     reloadtime  = nil,
   },
-  ["LeFH_18-40-105"] = {
+  ["SAU 2-C9"] = {
-    minrange   = 500,   -- 500 m(?)
+    displayname = "SPM 2S9 Nona 120mm M",
-    maxrange   = 10500, -- 32 km
+    minrange    = 500,
-    reloadtime = 540,   -- 9 min
+    maxrange    = 7000,
+    reloadtime  = nil,
   },  
 }
 
@@ -733,7 +780,7 @@ ARTY.db={
 
 --- Arty script version.
 -- @field #string version
-ARTY.version="1.3.2"
+ARTY.version="1.3.3"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -835,8 +882,8 @@ function ARTY:New(group, alias)
   -- Maximum speed in km/h.
   self.SpeedMax=group:GetSpeedMax()
 
-  -- Group is mobile or not (e.g. mortars).
+  -- Group is mobile or not (e.g. mortars). Some immobile units have a speed of 1 m/s = 3.6 km/h. So we check this number.
-  if self.SpeedMax>1 then
+  if self.SpeedMax>3.6 then
     self.ismobile=true
   else
     self.ismobile=false
@@ -2007,8 +2054,8 @@ function ARTY:onafterStart(Controllable, From, Event, To)
   text=text..string.format("Type                = %s\n", self.Type)
   text=text..string.format("Display Name        = %s\n", self.DisplayName)
   text=text..string.format("Number of units     = %d\n", self.IniGroupStrength)
-  text=text..string.format("Speed max           = %d km/h\n", self.SpeedMax)
+  text=text..string.format("Speed max           = %.1f km/h\n", self.SpeedMax)
-  text=text..string.format("Speed default       = %d km/h\n", self.Speed)
+  text=text..string.format("Speed default       = %.1f km/h\n", self.Speed)
   text=text..string.format("Is mobile           = %s\n", tostring(self.ismobile))
   text=text..string.format("Is cargo            = %s\n", tostring(self.iscargo))
   text=text..string.format("Min range           = %.1f km\n", self.minrange/1000)