From baa1dcbf8fa35f96cc7fe46c61e85e68196bcfc7 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 15 Feb 2023 23:06:34 +0100 Subject: [PATCH] OPSGROUP - mission nothing is cancelled if transport is due --- Moose Development/Moose/Ops/OpsGroup.lua | 7 ++++++- Moose Development/Moose/Wrapper/Positionable.lua | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 34b81397d..19b62b238 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -7906,9 +7906,14 @@ function OPSGROUP:_CheckCargoTransport() self.cargoTransport=nil self.cargoTZC=nil 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. - 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() if self.cargoTransport and not self:IsActive() then self:Activate() diff --git a/Moose Development/Moose/Wrapper/Positionable.lua b/Moose Development/Moose/Wrapper/Positionable.lua index 72f9a9fce..fc917bef5 100644 --- a/Moose Development/Moose/Wrapper/Positionable.lua +++ b/Moose Development/Moose/Wrapper/Positionable.lua @@ -1696,6 +1696,7 @@ do -- Cargo ["tt_DSHK"] = 6, ["HL_KORD"] = 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.