weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-19 13:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2463 from FlightControl-Master/master

Browse Source 
Merge from master
This commit is contained in:
Thomas
2025-12-06 11:50:12 +01:00
committed by GitHub
parent 07a3095392 04f7bb7cc7
commit da8856c907
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Core/Set.lua
-1
View File
@@ -89,7 +89,6 @@ do -- SET_BASE
Index = {}, Index = {},
Database = nil, Database = nil,
CallScheduler = nil, CallScheduler = nil,
Filter = {},
FilterCoalitionNumbers = { FilterCoalitionNumbers = {
[coalition.side.RED+1] = "red", [coalition.side.RED+1] = "red",
[coalition.side.BLUE+1] = "blue", [coalition.side.BLUE+1] = "blue",
Moose Development/Moose/Functional/Shorad.lua
+1
View File
@@ -684,6 +684,7 @@ do
local ShootingWeapon = EventData.Weapon -- Identify the weapon fired local ShootingWeapon = EventData.Weapon -- Identify the weapon fired
local ShootingWeaponName = EventData.WeaponName -- return weapon type local ShootingWeaponName = EventData.WeaponName -- return weapon type
-- get firing coalition -- get firing coalition
if not EventData.IniGroup then return self end
local weaponcoalition = EventData.IniGroup:GetCoalition() local weaponcoalition = EventData.IniGroup:GetCoalition()
-- get detection probability -- get detection probability
if self:_CheckCoalition(weaponcoalition) then --avoid overhead on friendly fire if self:_CheckCoalition(weaponcoalition) then --avoid overhead on friendly fire
Moose Development/Moose/Ops/CTLD.lua
+2 -2
View File
@@ -7297,10 +7297,10 @@ end
local type = cargo.CargoType local type = cargo.CargoType
local gname = cargo.Name local gname = cargo.Name
local gcargo = self:_FindCratesCargoObject(gname) or self:_FindTroopsCargoObject(gname) 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 (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 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 if (type == CTLD_CARGO.Enum.TROOPS or type == CTLD_CARGO.Enum.ENGINEERS) then
Troopstable[gname].Inhelo = Troopstable[gname].Inhelo + 1 Troopstable[gname].Inhelo = Troopstable[gname].Inhelo + 1
end end
Moose Development/Moose/Wrapper/Scenery.lua
+1 -1
View File
@@ -75,7 +75,7 @@ function SCENERY:Register( SceneryName, SceneryObject, SceneryZone )
self.Vector = (self.Vec3 and VECTOR) and VECTOR:NewFromVec(self.Vec3) or nil self.Vector = (self.Vec3 and VECTOR) and VECTOR:NewFromVec(self.Vec3) or nil
end end
if SceneryObject then if SceneryObject and SceneryObject.getPoint then
local vec3 = SceneryObject:getPoint() local vec3 = SceneryObject:getPoint()
self.Vec3 = { x = vec3.x, y = vec3.y, z = vec3.z } self.Vec3 = { x = vec3.x, y = vec3.y, z = vec3.z }
self.Vec2 = { x = vec3.x, y = vec3.z } self.Vec2 = { x = vec3.x, y = vec3.z }