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

Merge pull request #2469 from FlightControl-Master/master

Browse Source 
Merge from master
This commit is contained in:
Thomas
2025-12-15 17:41:37 +01:00
committed by GitHub
parent ef5c7e5972 976f92e5b1
commit 4c841fd1d2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/CTLD.lua
+4 -1
View File
@@ -140,6 +140,9 @@ CTLD_CARGO = {
self.DontShowInMenu = DontShowInMenu or false self.DontShowInMenu = DontShowInMenu or false
self.ResourceMap = nil self.ResourceMap = nil
self.StaticType = "container_cargo" -- "container_cargo" self.StaticType = "container_cargo" -- "container_cargo"
if self:IsStatic() then
self.StaticType = self.Templates
end
self.StaticShape = nil self.StaticShape = nil
self.TypeNames = nil self.TypeNames = nil
self.StaticCategory = "Cargos" self.StaticCategory = "Cargos"
@@ -7760,7 +7763,7 @@ end
for _, _cgo in pairs(loadedcargo) do for _, _cgo in pairs(loadedcargo) do
local cargo = _cgo local cargo = _cgo
local type = cargo.CargoType local type = cargo.CargoType
local gname = cargo.Name local gname = cargo:GetName()
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 = "..tostring(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