Merge remote-tracking branch 'origin/master' into branch

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",

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

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

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'

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 }