FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
This commit is contained in:
Applevangelist 2025-01-25 15:57:59 +01:00
commit baf3f9a9a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5641,7 +5641,7 @@ end
end end
if self.keeploadtable and TimeStamp ~= nil then if self.keeploadtable and TimeStamp ~= nil then
self:I("Inserting: "..cargo.CargoType) self:T2("Inserting: "..cargo.CargoType)
local cargotype = cargo.CargoType local cargotype = cargo.CargoType
table.insert(self.LoadedGroupsTable,{Group=self.DroppedTroops[self.TroopCounter], TimeStamp=TimeStamp, CargoType=cargotype}) table.insert(self.LoadedGroupsTable,{Group=self.DroppedTroops[self.TroopCounter], TimeStamp=TimeStamp, CargoType=cargotype})
end end
@ -5789,7 +5789,7 @@ end
end end
if self.keeploadtable and TimeStamp ~= nil then if self.keeploadtable and TimeStamp ~= nil then
self:I("Inserting: "..cargo.CargoType) self:T2("Inserting: "..cargo.CargoType)
local cargotype = cargo.CargoType local cargotype = cargo.CargoType
table.insert(self.LoadedGroupsTable,{Group=self.DroppedTroops[self.TroopCounter], TimeStamp=TimeStamp, CargoType=cargotype}) table.insert(self.LoadedGroupsTable,{Group=self.DroppedTroops[self.TroopCounter], TimeStamp=TimeStamp, CargoType=cargotype})
end end
@ -6449,7 +6449,7 @@ end
local StaticShape = dataset[13] local StaticShape = dataset[13]
n=n+1 n=n+1
local timestamp = tonumber(dataset[14]) or (timer.getTime()+n) local timestamp = tonumber(dataset[14]) or (timer.getTime()+n)
self:I("TimeStamp = "..timestamp) self:T2("TimeStamp = "..timestamp)
if type(groupname) == "string" and groupname ~= "STATIC" then if type(groupname) == "string" and groupname ~= "STATIC" then
cargotemplates = string.gsub(cargotemplates,"{","") cargotemplates = string.gsub(cargotemplates,"{","")
cargotemplates = string.gsub(cargotemplates,"}","") cargotemplates = string.gsub(cargotemplates,"}","")