From f005cdbc7143f42d3b080ea93347794f3b208343 Mon Sep 17 00:00:00 2001 From: Shafik Date: Tue, 2 Dec 2025 11:27:57 +0200 Subject: [PATCH 1/5] [ADDED] C-130J loadouts enums and other missing weapons. --- Moose Development/Moose/Utilities/Enums.lua | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Moose Development/Moose/Utilities/Enums.lua b/Moose Development/Moose/Utilities/Enums.lua index 0cd3f0218..d2245001c 100644 --- a/Moose Development/Moose/Utilities/Enums.lua +++ b/Moose Development/Moose/Utilities/Enums.lua @@ -1773,6 +1773,30 @@ ENUMS.Storage.weapons.adapters.lau105 = 'weapons.adapters.lau-105' ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_WHITE = 'weapons.containers.{US_M10_SMOKE_TANK_WHITE}' ENUMS.Storage.weapons.bombs.Mk_82 = 'weapons.bombs.Mk_82' ENUMS.Storage.weapons.adapters.BRU42_LS_SUU25 = 'weapons.adapters.BRU-42_LS_(SUU-25)' +ENUMS.Storage.weapons.missiles.Aster_30_Blk_1 = 'weapons.missiles.Aster 30 Blk 1' +ENUMS.Storage.weapons.missiles.Aster_30_Blk_1NT = 'weapons.missiles.Aster 30 Blk 1NT' +ENUMS.Storage.weapons.missiles.Aster_30_Blk_2 = 'weapons.missiles.Aster 30 Blk 2' +ENUMS.Storage.weapons.missiles.SA9M83M = 'weapons.missiles.SA9M83M' +ENUMS.Storage.weapons.gunmounts.C130_M4_Rifle = 'weapons.gunmounts.C130_M4_Rifle' +ENUMS.Storage.weapons.gunmounts.C130_M18_Sidearm_ = 'weapons.gunmounts.{C130-M18-Sidearm}' +ENUMS.Storage.weapons.gunmounts.C130_Cargo_Bay_M4 = 'weapons.gunmounts.{C130-Cargo-Bay-M4}' +ENUMS.Storage.weapons.gunmounts.C130_M18_Sidearm = 'weapons.gunmounts.C130_M18_Sidearm' +ENUMS.Storage.weapons.droptanks.C130J_Ext_Tank_R = 'weapons.droptanks.C130J_Ext_Tank_R' +ENUMS.Storage.weapons.droptanks.C130J_Ext_Tank_L = 'weapons.droptanks.C130J_Ext_Tank_L' +ENUMS.Storage.weapons.missiles.SAHQ2 = 'weapons.missiles.SAHQ2' +ENUMS.Storage.weapons.missiles.Strela_2 = 'weapons.missiles.Strela-2' +ENUMS.Storage.weapons.missiles.Strela_2M = 'weapons.missiles.Strela-2M' +ENUMS.Storage.weapons.missiles.Strela_3 = 'weapons.missiles.Strela-3' +ENUMS.Storage.weapons.missiles.SA9M83 = 'weapons.missiles.SA9M83' +ENUMS.Storage.weapons.missiles.SAV601P = 'weapons.missiles.SAV601P' +ENUMS.Storage.weapons.missiles.SA2V759 = 'weapons.missiles.SA2V759' +ENUMS.Storage.weapons.missiles.SA9M317 = 'weapons.missiles.SA9M317' +ENUMS.Storage.weapons.missiles.SA9M82M = 'weapons.missiles.SA9M82M' +ENUMS.Storage.weapons.missiles.SA9M82 = 'weapons.missiles.SA9M82' +ENUMS.Storage.weapons.missiles.Igla_S = 'weapons.missiles.Igla_S' +ENUMS.Storage.weapons.gunmounts.AKAN_NO_TRC = 'weapons.gunmounts.{AKAN_NO_TRC}' +ENUMS.Storage.weapons.gunmounts.AKAN = 'weapons.gunmounts.{AKAN}' +ENUMS.Storage.weapons.shells.M882_9x19 = 'weapons.shells.9x19_m882' -- UH-60L Mod ENUMS.Storage.weapons.gunmounts.UH60LGAU19 = 'weapons.gunmounts.UH-60L GAU-19' From e873b097cfbaafc9f1cff8190cb8ef8653402380 Mon Sep 17 00:00:00 2001 From: leka1986 <83298840+leka1986@users.noreply.github.com> Date: Sat, 6 Dec 2025 10:10:18 +0100 Subject: [PATCH 2/5] Convert cargo type to string for logging Concatenate local 'type' Nil value --- Moose Development/Moose/Ops/CTLD.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index 122ce7ab8..43df08964 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -7297,10 +7297,10 @@ end local type = cargo.CargoType local gname = cargo.Name local gcargo = self:_FindCratesCargoObject(gname) or self:_FindTroopsCargoObject(gname) - self:T("Looking at " .. gname .. " in the helo - type = " .. type) + self:T("Looking at " .. gname .. " in the helo - type = "..tostring(type)) if (type == CTLD_CARGO.Enum.TROOPS or type == CTLD_CARGO.Enum.ENGINEERS or type == CTLD_CARGO.Enum.VEHICLE or type == CTLD_CARGO.Enum.FOB) then if gcargo and gcargo:GetStock0() > 0 then - self:T("Adding " .. gname .. " in the helo - type = " .. type) + self:T("Adding " .. gname .. " in the helo - type = "..tostring(type)) if (type == CTLD_CARGO.Enum.TROOPS or type == CTLD_CARGO.Enum.ENGINEERS) then Troopstable[gname].Inhelo = Troopstable[gname].Inhelo + 1 end From 31a537748e7b55882ab9b8b1effab94a94e70d6f Mon Sep 17 00:00:00 2001 From: leka1986 <83298840+leka1986@users.noreply.github.com> Date: Sat, 6 Dec 2025 10:13:37 +0100 Subject: [PATCH 3/5] Add check for IniGroup in HandleEventShot Added a check for IniGroup in HandleEventShot to prevent processing if it's not present. Error in 2 instances, attempt to index field IniGroup ( a nil value ) --- Moose Development/Moose/Functional/Shorad.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Functional/Shorad.lua b/Moose Development/Moose/Functional/Shorad.lua index 526ff062f..bc5156943 100644 --- a/Moose Development/Moose/Functional/Shorad.lua +++ b/Moose Development/Moose/Functional/Shorad.lua @@ -684,6 +684,7 @@ do local ShootingWeapon = EventData.Weapon -- Identify the weapon fired local ShootingWeaponName = EventData.WeaponName -- return weapon type -- get firing coalition + if not EventData.IniGroup then return self end local weaponcoalition = EventData.IniGroup:GetCoalition() -- get detection probability if self:_CheckCoalition(weaponcoalition) then --avoid overhead on friendly fire From d77b2655b1c9d7cdcff1cc86f7a3af5f7159c590 Mon Sep 17 00:00:00 2001 From: leka1986 <83298840+leka1986@users.noreply.github.com> Date: Sat, 6 Dec 2025 10:16:15 +0100 Subject: [PATCH 4/5] Update Scenery.lua attempt to call method getPoint (a nil value) --- Moose Development/Moose/Wrapper/Scenery.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Scenery.lua b/Moose Development/Moose/Wrapper/Scenery.lua index d7e367e92..ea1f8f8f0 100644 --- a/Moose Development/Moose/Wrapper/Scenery.lua +++ b/Moose Development/Moose/Wrapper/Scenery.lua @@ -75,7 +75,7 @@ function SCENERY:Register( SceneryName, SceneryObject, SceneryZone ) self.Vector = (self.Vec3 and VECTOR) and VECTOR:NewFromVec(self.Vec3) or nil end - if SceneryObject then + if SceneryObject and SceneryObject.getPoint then local vec3 = SceneryObject:getPoint() self.Vec3 = { x = vec3.x, y = vec3.y, z = vec3.z } self.Vec2 = { x = vec3.x, y = vec3.z } From 83464090d6ecf54b1f060fd5fbc57831b4fbd4b8 Mon Sep 17 00:00:00 2001 From: leka1986 <83298840+leka1986@users.noreply.github.com> Date: Sat, 6 Dec 2025 10:20:03 +0100 Subject: [PATCH 5/5] Update Set.lua removed duplicate Filter = {}, --- Moose Development/Moose/Core/Set.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 191d62287..27ec6c0e0 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -89,7 +89,6 @@ do -- SET_BASE Index = {}, Database = nil, CallScheduler = nil, - Filter = {}, FilterCoalitionNumbers = { [coalition.side.RED+1] = "red", [coalition.side.BLUE+1] = "blue",