weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Applevangelist 2025-01-26 13:54:59 +01:00
commit a47fa3f9fc
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Moose Development/Moose/Ops/CTLD.lua
View File

@ -2428,6 +2428,7 @@ end
-- landed or hovering over load zone? -- landed or hovering over load zone?
local grounded = not self:IsUnitInAir(Unit) local grounded = not self:IsUnitInAir(Unit)
local hoverload = self:CanHoverLoad(Unit) local hoverload = self:CanHoverLoad(Unit)
local hassecondaries = false
if not grounded and not hoverload then if not grounded and not hoverload then
self:_SendMessage("You need to land or hover in position to load!", 10, false, Group) self:_SendMessage("You need to land or hover in position to load!", 10, false, Group)
@ -2542,7 +2543,7 @@ end
end end
end end
-- clean up: -- clean up:
local hassecondaries = false hassecondaries = false
if type(Cargotype.Templates) == "table" and Cargotype.Templates[2] then if type(Cargotype.Templates) == "table" and Cargotype.Templates[2] then
for _,_key in pairs (Cargotype.Templates) do for _,_key in pairs (Cargotype.Templates) do
table.insert(secondarygroups,_key) table.insert(secondarygroups,_key)
@ -5502,6 +5503,33 @@ end
return self return self
end end
--- (User) Get a generic #CTLD_CARGO entry from a group name, works for Troops and Vehicles, FOB, i.e. everything that is spawned as a GROUP object.
-- @param #CTLD self
-- @param #string GroupName The name to use for the search
-- @return #CTLD_CARGO The cargo object or nil if not found
function CTLD:GetGenericCargoObjectFromGroupName(GroupName)
local Cargotype = nil
for k,v in pairs(self.Cargo_Troops) do
local comparison = ""
if type(v.Templates) == "string" then comparison = v.Templates else comparison = v.Templates[1] end
if comparison == GroupName then
Cargotype = v
break
end
end
if not Cargotype then
for k,v in pairs(self.Cargo_Crates) do
local comparison = ""
if type(v.Templates) == "string" then comparison = v.Templates else comparison = v.Templates[1] end
if comparison == GroupName then
Cargotype = v
break
end
end
end
return Cargotype
end
--- (Internal) Check on engineering teams --- (Internal) Check on engineering teams
-- @param #CTLD self -- @param #CTLD self
-- @return #CTLD self -- @return #CTLD self
@ -5682,7 +5710,7 @@ end
return self return self
end end
--- (User) Pre-populate vehicles in the field. --- (User) Pre-populate vehicles in the field.
-- @param #CTLD self -- @param #CTLD self
-- @param Core.Zone#ZONE Zone The zone where to drop the troops. -- @param Core.Zone#ZONE Zone The zone where to drop the troops.
-- @param Ops.CTLD#CTLD_CARGO Cargo The #CTLD_CARGO object to spawn. -- @param Ops.CTLD#CTLD_CARGO Cargo The #CTLD_CARGO object to spawn.