From 9e5dde4f3533ca25b3d2c7798b3d1f71911b64e4 Mon Sep 17 00:00:00 2001 From: funkyfranky Date: Mon, 5 Feb 2024 19:37:27 +0000 Subject: [PATCH] Updated Moose.lua --- .../EVT-001 - API Demo 1/MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../Moose_Test_MENU_CLIENT.lua | 22 ++++++++++++------- .../Moose_Test_MENU_COALITION.lua | 22 ++++++++++++------- .../Moose_Test_MENU_GROUP.lua | 22 ++++++++++++------- .../Moose_Test_SET_AIRBASE.lua | 22 ++++++++++++------- .../Moose_Test_SET_CLIENT.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../Moose_Test_SPAWN_InitRandomizeZones.lua | 22 ++++++++++++------- .../Moose_Test_SPAWN_SpawnFromUnit.lua | 22 ++++++++++++------- .../Moose_Test_SPAWN_SpawnFromVec2.lua | 22 ++++++++++++------- .../Moose_Test_SPAWN_SpawnFromVec3.lua | 22 ++++++++++++------- .../MOOSE_Spawn_Test.lua | 22 ++++++++++++------- .../Moose_Test_ZONE_RADIUS.lua | 22 ++++++++++++------- .../Moose_Test_ZONE_POLYGON.lua | 22 ++++++++++++------- .../Moose_Test_MISSILETRAINER.lua | 22 ++++++++++++------- .../Moose_Test_SEAD.lua | 22 ++++++++++++------- .../CSAR-100 - Caucasus/Moose_dev_small.lua | 22 ++++++++++++------- .../CSAR-100 - Nevada/Moose_dev_small.lua | 22 ++++++++++++------- .../Moose_Test_GROUP_TaskFollow.lua | 22 ++++++++++++------- 55 files changed, 770 insertions(+), 440 deletions(-) diff --git a/Core/Base/Event-Handling/EVT-001 - API Demo 1/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-001 - API Demo 1/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-001 - API Demo 1/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-001 - API Demo 1/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-001 - UNIT OnEventShot Stability Test/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-001 - UNIT OnEventShot Stability Test/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-001 - UNIT OnEventShot Stability Test/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-001 - UNIT OnEventShot Stability Test/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-002 - UNIT OnEventLand ReSpawn Test/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-002 - UNIT OnEventLand ReSpawn Test/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-002 - UNIT OnEventLand ReSpawn Test/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-002 - UNIT OnEventLand ReSpawn Test/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-100 - UNIT OnEventShot Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-100 - UNIT OnEventShot Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-100 - UNIT OnEventShot Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-100 - UNIT OnEventShot Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-101 - UNIT OnEventHit Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-101 - UNIT OnEventHit Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-101 - UNIT OnEventHit Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-101 - UNIT OnEventHit Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-102 - UNIT OnEventTakeoff Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-102 - UNIT OnEventTakeoff Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-102 - UNIT OnEventTakeoff Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-102 - UNIT OnEventTakeoff Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-103 - UNIT OnEventLand Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-103 - UNIT OnEventLand Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-103 - UNIT OnEventLand Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-103 - UNIT OnEventLand Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-104 - UNIT OnEventCrash Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-104 - UNIT OnEventCrash Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-104 - UNIT OnEventCrash Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-104 - UNIT OnEventCrash Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-105 - UNIT OnEventPlayerEnterUnit Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-105 - UNIT OnEventPlayerEnterUnit Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-105 - UNIT OnEventPlayerEnterUnit Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-105 - UNIT OnEventPlayerEnterUnit Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-200 - GROUP OnEventShot Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-200 - GROUP OnEventShot Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-200 - GROUP OnEventShot Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-200 - GROUP OnEventShot Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-201 - GROUP OnEventHit Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-201 - GROUP OnEventHit Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-201 - GROUP OnEventHit Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-201 - GROUP OnEventHit Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-204 - GROUP OnEventCrash Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-204 - GROUP OnEventCrash Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-204 - GROUP OnEventCrash Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-204 - GROUP OnEventCrash Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-205 - GROUP OnEventDead Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-205 - GROUP OnEventDead Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-205 - GROUP OnEventDead Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-205 - GROUP OnEventDead Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-401 - Generic OnEventHit Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-401 - Generic OnEventHit Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-401 - Generic OnEventHit Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-401 - Generic OnEventHit Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-402 - Generic OnEventMissionEnd Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-402 - Generic OnEventMissionEnd Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-402 - Generic OnEventMissionEnd Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-402 - Generic OnEventMissionEnd Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-403 - Generic OnEventBirth Example/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-403 - Generic OnEventBirth Example/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-403 - Generic OnEventBirth Example/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-403 - Generic OnEventBirth Example/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-500 - OnEventLand LandingChallenge/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-500 - OnEventLand LandingChallenge/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-500 - OnEventLand LandingChallenge/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-500 - OnEventLand LandingChallenge/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-501 - OnEventLand LandingChallengeComplex/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-501 - OnEventLand LandingChallengeComplex/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-501 - OnEventLand LandingChallengeComplex/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-501 - OnEventLand LandingChallengeComplex/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Base/Event-Handling/EVT-600 - OnEventHit Example with a Set of Units/MOOSE_Spawn_Test.lua b/Core/Base/Event-Handling/EVT-600 - OnEventHit Example with a Set of Units/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Base/Event-Handling/EVT-600 - OnEventHit Example with a Set of Units/MOOSE_Spawn_Test.lua +++ b/Core/Base/Event-Handling/EVT-600 - OnEventHit Example with a Set of Units/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Menu/Normandy/MEN-001 - Menu Client/Moose_Test_MENU_CLIENT.lua b/Core/Menu/Normandy/MEN-001 - Menu Client/Moose_Test_MENU_CLIENT.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Menu/Normandy/MEN-001 - Menu Client/Moose_Test_MENU_CLIENT.lua +++ b/Core/Menu/Normandy/MEN-001 - Menu Client/Moose_Test_MENU_CLIENT.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Menu/Normandy/MEN-002 - Menu Coalition/Moose_Test_MENU_COALITION.lua b/Core/Menu/Normandy/MEN-002 - Menu Coalition/Moose_Test_MENU_COALITION.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Menu/Normandy/MEN-002 - Menu Coalition/Moose_Test_MENU_COALITION.lua +++ b/Core/Menu/Normandy/MEN-002 - Menu Coalition/Moose_Test_MENU_COALITION.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Menu/Normandy/MEN-003 - Menu Group/Moose_Test_MENU_GROUP.lua b/Core/Menu/Normandy/MEN-003 - Menu Group/Moose_Test_MENU_GROUP.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Menu/Normandy/MEN-003 - Menu Group/Moose_Test_MENU_GROUP.lua +++ b/Core/Menu/Normandy/MEN-003 - Menu Group/Moose_Test_MENU_GROUP.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Set/SET-001 - Airbase Sets/Moose_Test_SET_AIRBASE.lua b/Core/Set/SET-001 - Airbase Sets/Moose_Test_SET_AIRBASE.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Set/SET-001 - Airbase Sets/Moose_Test_SET_AIRBASE.lua +++ b/Core/Set/SET-001 - Airbase Sets/Moose_Test_SET_AIRBASE.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Set/SET-201 - Client Sets/Moose_Test_SET_CLIENT.lua b/Core/Set/SET-201 - Client Sets/Moose_Test_SET_CLIENT.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Set/SET-201 - Client Sets/Moose_Test_SET_CLIENT.lua +++ b/Core/Set/SET-201 - Client Sets/Moose_Test_SET_CLIENT.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-011 - Ground Ops - Simple Spawning/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-011 - Ground Ops - Simple Spawning/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-011 - Ground Ops - Simple Spawning/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-011 - Ground Ops - Simple Spawning/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-012 - Ground Ops - Multiple Spawns/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-012 - Ground Ops - Multiple Spawns/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-012 - Ground Ops - Multiple Spawns/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-012 - Ground Ops - Multiple Spawns/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-013 - Ground Ops - Scheduled Spawns/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-013 - Ground Ops - Scheduled Spawns/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-013 - Ground Ops - Scheduled Spawns/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-013 - Ground Ops - Scheduled Spawns/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-014 - Ground Ops - Scheduled Spawns Limited/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-014 - Ground Ops - Scheduled Spawns Limited/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-014 - Ground Ops - Scheduled Spawns Limited/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-014 - Ground Ops - Scheduled Spawns Limited/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-015 - Ground Ops - Randomize Route/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-015 - Ground Ops - Randomize Route/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-015 - Ground Ops - Randomize Route/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-015 - Ground Ops - Randomize Route/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-016 - Ground Ops - Randomize Zones/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-016 - Ground Ops - Randomize Zones/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-016 - Ground Ops - Randomize Zones/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-016 - Ground Ops - Randomize Zones/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-018 - Ground Ops - Randomize Templates/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-018 - Ground Ops - Randomize Templates/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-018 - Ground Ops - Randomize Templates/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-018 - Ground Ops - Randomize Templates/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-019 - Ground Ops - Randomize Templates without Waypoints/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-019 - Ground Ops - Randomize Templates without Waypoints/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-019 - Ground Ops - Randomize Templates without Waypoints/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-019 - Ground Ops - Randomize Templates without Waypoints/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-020 - Ground Ops - Randomize Templates in Zones no WP/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-020 - Ground Ops - Randomize Templates in Zones no WP/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-020 - Ground Ops - Randomize Templates in Zones no WP/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-020 - Ground Ops - Randomize Templates in Zones no WP/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-021 - Ground Ops - Scheduled Spawns Limited Keep Unit Names/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-021 - Ground Ops - Scheduled Spawns Limited Keep Unit Names/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-021 - Ground Ops - Scheduled Spawns Limited Keep Unit Names/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-021 - Ground Ops - Scheduled Spawns Limited Keep Unit Names/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-022 - Ground Ops - Scheduled Spawns Limited with long interval/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-022 - Ground Ops - Scheduled Spawns Limited with long interval/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-022 - Ground Ops - Scheduled Spawns Limited with long interval/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-022 - Ground Ops - Scheduled Spawns Limited with long interval/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-023 - Ground Ops - SpawnStart and SpawnStop/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-023 - Ground Ops - SpawnStart and SpawnStop/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-023 - Ground Ops - SpawnStart and SpawnStop/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-023 - Ground Ops - SpawnStart and SpawnStop/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-024 - Ground Ops - Arrays Normandy/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-024 - Ground Ops - Arrays Normandy/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-024 - Ground Ops - Arrays Normandy/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-024 - Ground Ops - Arrays Normandy/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-024 - Ground Ops - Arrays/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-024 - Ground Ops - Arrays/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-024 - Ground Ops - Arrays/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-024 - Ground Ops - Arrays/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-025 - Ground Ops - Spawn Hidden/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-025 - Ground Ops - Spawn Hidden/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-025 - Ground Ops - Spawn Hidden/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-025 - Ground Ops - Spawn Hidden/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-026 - Ground Ops - Spawn RandomizeTemplate Hidden/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-026 - Ground Ops - Spawn RandomizeTemplate Hidden/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-026 - Ground Ops - Spawn RandomizeTemplate Hidden/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-026 - Ground Ops - Spawn RandomizeTemplate Hidden/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-027 - Ground Ops - Respawning After Destroy/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-027 - Ground Ops - Respawning After Destroy/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-027 - Ground Ops - Respawning After Destroy/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-027 - Ground Ops - Respawning After Destroy/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-110 - Limit Spawning/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-110 - Limit Spawning/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-110 - Limit Spawning/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-110 - Limit Spawning/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-200 - Randomize Unit Types/MOOSE_Spawn_Test.lua b/Core/Spawn/SPA-200 - Randomize Unit Types/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-200 - Randomize Unit Types/MOOSE_Spawn_Test.lua +++ b/Core/Spawn/SPA-200 - Randomize Unit Types/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-220 - Randomize Zones/Moose_Test_SPAWN_InitRandomizeZones.lua b/Core/Spawn/SPA-220 - Randomize Zones/Moose_Test_SPAWN_InitRandomizeZones.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-220 - Randomize Zones/Moose_Test_SPAWN_InitRandomizeZones.lua +++ b/Core/Spawn/SPA-220 - Randomize Zones/Moose_Test_SPAWN_InitRandomizeZones.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-320 - Spawn at Unit position/Moose_Test_SPAWN_SpawnFromUnit.lua b/Core/Spawn/SPA-320 - Spawn at Unit position/Moose_Test_SPAWN_SpawnFromUnit.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-320 - Spawn at Unit position/Moose_Test_SPAWN_SpawnFromUnit.lua +++ b/Core/Spawn/SPA-320 - Spawn at Unit position/Moose_Test_SPAWN_SpawnFromUnit.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-330 - Spawn at Vec2 position/Moose_Test_SPAWN_SpawnFromVec2.lua b/Core/Spawn/SPA-330 - Spawn at Vec2 position/Moose_Test_SPAWN_SpawnFromVec2.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-330 - Spawn at Vec2 position/Moose_Test_SPAWN_SpawnFromVec2.lua +++ b/Core/Spawn/SPA-330 - Spawn at Vec2 position/Moose_Test_SPAWN_SpawnFromVec2.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Spawn/SPA-340 - Spawn at Vec3 position/Moose_Test_SPAWN_SpawnFromVec3.lua b/Core/Spawn/SPA-340 - Spawn at Vec3 position/Moose_Test_SPAWN_SpawnFromVec3.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Spawn/SPA-340 - Spawn at Vec3 position/Moose_Test_SPAWN_SpawnFromVec3.lua +++ b/Core/Spawn/SPA-340 - Spawn at Vec3 position/Moose_Test_SPAWN_SpawnFromVec3.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/SpawnStatic/SPS - 010 - Simple Spawning/MOOSE_Spawn_Test.lua b/Core/SpawnStatic/SPS - 010 - Simple Spawning/MOOSE_Spawn_Test.lua index 7425af104e..11b1f3c302 100644 --- a/Core/SpawnStatic/SPS - 010 - Simple Spawning/MOOSE_Spawn_Test.lua +++ b/Core/SpawnStatic/SPS - 010 - Simple Spawning/MOOSE_Spawn_Test.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Zone/ZON-400 - Radius Zone/Moose_Test_ZONE_RADIUS.lua b/Core/Zone/ZON-400 - Radius Zone/Moose_Test_ZONE_RADIUS.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Zone/ZON-400 - Radius Zone/Moose_Test_ZONE_RADIUS.lua +++ b/Core/Zone/ZON-400 - Radius Zone/Moose_Test_ZONE_RADIUS.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Core/Zone/ZON-500 - Polygon Zone/Moose_Test_ZONE_POLYGON.lua b/Core/Zone/ZON-500 - Polygon Zone/Moose_Test_ZONE_POLYGON.lua index 7425af104e..11b1f3c302 100644 --- a/Core/Zone/ZON-500 - Polygon Zone/Moose_Test_ZONE_POLYGON.lua +++ b/Core/Zone/ZON-500 - Polygon Zone/Moose_Test_ZONE_POLYGON.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Functional/MissileTrainer/MIT-001 - Missile Trainer/Moose_Test_MISSILETRAINER.lua b/Functional/MissileTrainer/MIT-001 - Missile Trainer/Moose_Test_MISSILETRAINER.lua index 7425af104e..11b1f3c302 100644 --- a/Functional/MissileTrainer/MIT-001 - Missile Trainer/Moose_Test_MISSILETRAINER.lua +++ b/Functional/MissileTrainer/MIT-001 - Missile Trainer/Moose_Test_MISSILETRAINER.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Functional/Sead/SEV-001 - SEAD Evasion/Moose_Test_SEAD.lua b/Functional/Sead/SEV-001 - SEAD Evasion/Moose_Test_SEAD.lua index 7425af104e..11b1f3c302 100644 --- a/Functional/Sead/SEV-001 - SEAD Evasion/Moose_Test_SEAD.lua +++ b/Functional/Sead/SEV-001 - SEAD Evasion/Moose_Test_SEAD.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Ops/CSAR/CSAR-100 - Caucasus/Moose_dev_small.lua b/Ops/CSAR/CSAR-100 - Caucasus/Moose_dev_small.lua index 7425af104e..11b1f3c302 100644 --- a/Ops/CSAR/CSAR-100 - Caucasus/Moose_dev_small.lua +++ b/Ops/CSAR/CSAR-100 - Caucasus/Moose_dev_small.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Ops/CSAR/CSAR-100 - Nevada/Moose_dev_small.lua b/Ops/CSAR/CSAR-100 - Nevada/Moose_dev_small.lua index 7425af104e..11b1f3c302 100644 --- a/Ops/CSAR/CSAR-100 - Nevada/Moose_dev_small.lua +++ b/Ops/CSAR/CSAR-100 - Nevada/Moose_dev_small.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"}, diff --git a/Wrapper/Group/GRP-200 - Follow Group/Moose_Test_GROUP_TaskFollow.lua b/Wrapper/Group/GRP-200 - Follow Group/Moose_Test_GROUP_TaskFollow.lua index 7425af104e..11b1f3c302 100644 --- a/Wrapper/Group/GRP-200 - Follow Group/Moose_Test_GROUP_TaskFollow.lua +++ b/Wrapper/Group/GRP-200 - Follow Group/Moose_Test_GROUP_TaskFollow.lua @@ -1,4 +1,4 @@ -env.info('*** MOOSE GITHUB Commit Hash ID: 2024-01-27T15:28:46+01:00-bd5c1af335eccd97bbe7b2e84c9625a991da634f ***') +env.info('*** MOOSE GITHUB Commit Hash ID: 2024-02-04T13:13:06+01:00-4307ddcad379150951e4aa7a4d15aeba6146fa9b ***') if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end @@ -18977,7 +18977,7 @@ SpawnGroup:SetAIOnOff(self.AIOnOff) end self:T3(SpawnTemplate.name) if self.SpawnFunctionHook then -self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.1) +self.SpawnHookScheduler:Schedule(nil,self.SpawnFunctionHook,{self.SpawnGroups[self.SpawnIndex].Group,unpack(self.SpawnFunctionArguments)},0.3) end end self.SpawnGroups[self.SpawnIndex].Spawned=true @@ -26295,8 +26295,9 @@ end if n>0 then local Vec3={x=x/n,y=y/n,z=z/n} return Vec3 +else +return self:GetVec3() end -return nil end function GROUP:GetPointVec2() self:F2(self.GroupName) @@ -26317,10 +26318,15 @@ local Heading=self:GetHeading() coord.Heading=Heading return coord else +local coord=self:GetCoordinate() +if coord then +return coord +else BASE:E({"Cannot GetAverageCoordinate",Group=self,Alive=self:IsAlive()}) return nil end end +end function GROUP:GetCoordinate() local Units=self:GetUnits()or{} for _,_unit in pairs(Units)do @@ -52035,17 +52041,17 @@ MEDIUM="Medium", LONG="Long", } MANTIS.SamData={ -["Hawk"]={Range=44,Blindspot=0,Height=9,Type="Medium",Radar="Hawk"}, -["NASAMS"]={Range=14,Blindspot=0,Height=3,Type="Short",Radar="NSAMS"}, -["Patriot"]={Range=99,Blindspot=0,Height=9,Type="Long",Radar="Patriot"}, -["Rapier"]={Range=6,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, +["Hawk"]={Range=35,Blindspot=0,Height=12,Type="Medium",Radar="Hawk"}, +["NASAMS"]={Range=14,Blindspot=0,Height=7,Type="Short",Radar="NSAMS"}, +["Patriot"]={Range=99,Blindspot=0,Height=25,Type="Long",Radar="Patriot"}, +["Rapier"]={Range=10,Blindspot=0,Height=3,Type="Short",Radar="rapier"}, ["SA-2"]={Range=40,Blindspot=7,Height=25,Type="Medium",Radar="S_75M_Volhov"}, ["SA-3"]={Range=18,Blindspot=6,Height=18,Type="Short",Radar="5p73 s-125 ln"}, ["SA-5"]={Range=250,Blindspot=7,Height=40,Type="Long",Radar="5N62V"}, ["SA-6"]={Range=25,Blindspot=0,Height=8,Type="Medium",Radar="1S91"}, ["SA-10"]={Range=119,Blindspot=0,Height=18,Type="Long",Radar="S-300PS 4"}, ["SA-11"]={Range=35,Blindspot=0,Height=20,Type="Medium",Radar="SA-11"}, -["Roland"]={Range=8,Blindspot=0,Height=3,Type="Short",Radar="Roland"}, +["Roland"]={Range=5,Blindspot=0,Height=5,Type="Short",Radar="Roland"}, ["HQ-7"]={Range=12,Blindspot=0,Height=3,Type="Short",Radar="HQ-7"}, ["SA-9"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="Strela"}, ["SA-8"]={Range=10,Blindspot=0,Height=5,Type="Short",Radar="Osa 9A33"},