From 8ce371f89885efdb9df1da56bb6e46c846be07e2 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 7 Jun 2023 09:03:01 +0200 Subject: [PATCH] WAREHOUSE - Runway destroyed event only triggered if it was operational --- Moose Development/Moose/Functional/Warehouse.lua | 8 +++++++- Moose Development/Moose/Ops/OpsGroup.lua | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 93239b913..f420a770e 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -6671,7 +6671,13 @@ function WAREHOUSE:_OnEventCrashOrDead(EventData) self:Destroyed() end if self.airbase and self.airbasename and self.airbasename==EventData.IniUnitName then - self:RunwayDestroyed() + if self:IsRunwayOperational() then + -- Trigger RunwayDestroyed event (only if it is not destroyed already) + self:RunwayDestroyed() + else + -- Reset the time stamp. + self.runwaydestroyed=timer.getAbsTime() + end end end diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 5b49bf0e4..79648d741 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -12090,6 +12090,8 @@ end -- @return #OPSGROUP self function OPSGROUP:SetDefaultCallsign(CallsignName, CallsignNumber) + self:T(self.lid..string.format("Setting Default callsing %s-%s", tostring(CallsignName), tostring(CallsignNumber))) + self.callsignDefault={} --#OPSGROUP.Callsign self.callsignDefault.NumberSquad=CallsignName self.callsignDefault.NumberGroup=CallsignNumber or 1