From e4e31b554eba7288def4cbebfa37727606e150c9 Mon Sep 17 00:00:00 2001 From: Ben Birch Date: Sun, 22 Aug 2021 12:53:55 +1000 Subject: [PATCH] CTLD: fix FOB units overwriting last instance, Unit Cargo Mass not working on first load --- Moose Development/Moose/Ops/CTLD.lua | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index 63d7985b5..56e52dd3f 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -1418,11 +1418,11 @@ function CTLD:_LoadCratesNearby(Group, Unit) crate:GetPositionable():Destroy() crate.Positionable = nil self:_SendMessage(string.format("Crate ID %d for %s loaded!",crate:GetID(),crate:GetName()), 10, false, Group) - self:_UpdateUnitCargoMass(Unit) self:__CratesPickedUp(1, Group, Unit, crate) end end self.Loaded_Cargo[unitname] = loaded + self:_UpdateUnitCargoMass(Unit) -- clean up real world crates local existingcrates = self.Spawned_Cargo -- #table local newexcrates = {} @@ -1893,17 +1893,16 @@ function CTLD:_BuildObjectFromCrates(Group,Unit,Build,Repair,RepairLocation) end for _,_template in pairs(temptable) do self.TroopCounter = self.TroopCounter + 1 - if canmove then local alias = string.format("%s-%d", _template, math.random(1,100000)) - self.DroppedTroops[self.TroopCounter] = SPAWN:NewWithAlias(_template,alias) - :InitRandomizeUnits(true,20,2) - :InitDelayOff() - :SpawnFromVec2(randomcoord) + if canmove then + self.DroppedTroops[self.TroopCounter] = SPAWN:NewWithAlias(_template,alias) + :InitRandomizeUnits(true,20,2) + :InitDelayOff() + :SpawnFromVec2(randomcoord) else -- don't random position of e.g. SAM units build as FOB self.DroppedTroops[self.TroopCounter] = SPAWN:NewWithAlias(_template,alias) - --:InitRandomizeUnits(true,20,2) - :InitDelayOff() - :SpawnFromVec2(randomcoord) + :InitDelayOff() + :SpawnFromVec2(randomcoord) end if self.movetroopstowpzone and canmove then self:_MoveGroupToZone(self.DroppedTroops[self.TroopCounter])