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

OPSGROUP

Browse Source 
- mission nothing is cancelled if transport is due
This commit is contained in:
Frank 2023-02-15 23:06:34 +01:00
parent dc0a2bccd6
commit baa1dcbf8f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Moose Development/Moose/Ops/OpsGroup.lua
View File

@ -7906,9 +7906,14 @@ function OPSGROUP:_CheckCargoTransport()
self.cargoTransport=nil self.cargoTransport=nil
self.cargoTZC=nil self.cargoTZC=nil
end end
local mission=self:GetMissionCurrent()
if mission and mission.type==AUFTRAG.Type.NOTHING then
self:MissionCancel(mission)
end
-- Check if there is anything in the queue. -- Check if there is anything in the queue.
if not self.cargoTransport and not self:IsOnMission() then if not self.cargoTransport and not self:IsOnMission() then --(mission==nil or (mission and mission.type==AUFTRAG.Type.NOTHING)) then --not self:IsOnMission() then
self.cargoTransport=self:_GetNextCargoTransport() self.cargoTransport=self:_GetNextCargoTransport()
if self.cargoTransport and not self:IsActive() then if self.cargoTransport and not self:IsActive() then
self:Activate() self:Activate()

1
Moose Development/Moose/Wrapper/Positionable.lua
View File

@ -1696,6 +1696,7 @@ do -- Cargo
["tt_DSHK"] = 6, ["tt_DSHK"] = 6,
["HL_KORD"] = 6, ["HL_KORD"] = 6,
["HL_DSHK"] = 6, ["HL_DSHK"] = 6,
["CCKW_353"] = 16, --GMC CCKW 2½-ton 6×6 truck, estimating 16 soldiers
} }
-- Assuming that each passenger weighs 95 kg on average. -- Assuming that each passenger weighs 95 kg on average.