From 421005a3b6ed4a4eeebbfb1a2605e57bc6f019e8 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 30 Apr 2021 11:53:57 +0200 Subject: [PATCH] event backfixed --- Moose Development/Moose/Core/Event.lua | 6 ++++-- Moose Development/Moose/Ops/FlightGroup.lua | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua index 07ddcfdf1..9b5251f46 100644 --- a/Moose Development/Moose/Core/Event.lua +++ b/Moose Development/Moose/Core/Event.lua @@ -1114,9 +1114,10 @@ function EVENT:onEvent( Event ) Event.TgtTypeName = Event.TgtDCSUnit:getTypeName() end + env.info("FF I am here first") if Event.TgtObjectCategory == Object.Category.STATIC then + env.info("FF I am here") BASE:T({Event = Event}) - --[[ Event.TgtDCSUnit = Event.target Event.TgtDCSUnitName = Event.TgtDCSUnit:getName() Event.TgtUnitName = Event.TgtDCSUnitName @@ -1124,8 +1125,8 @@ function EVENT:onEvent( Event ) Event.TgtCoalition = Event.TgtDCSUnit:getCoalition() Event.TgtCategory = Event.TgtDCSUnit:getDesc().category Event.TgtTypeName = Event.TgtDCSUnit:getTypeName() - --]] -- Same as for Event Initiator above 2.7 issue + --[[ Event.TgtDCSUnit = Event.target local ID=Event.initiator.id_ Event.TgtDCSUnitName = string.format("Ejected Pilot ID %s", tostring(ID)) @@ -1134,6 +1135,7 @@ function EVENT:onEvent( Event ) Event.TgtCoalition = Event.IniCoalition Event.TgtCategory = Event.IniCategory Event.TgtTypeName = "Ejected Pilot" + ]] end if Event.TgtObjectCategory == Object.Category.SCENERY then diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua index ff0f49aa4..c4b916448 100644 --- a/Moose Development/Moose/Ops/FlightGroup.lua +++ b/Moose Development/Moose/Ops/FlightGroup.lua @@ -56,6 +56,7 @@ -- @field #number callsignName Callsign name. -- @field #number callsignNumber Callsign number. -- @field #boolean despawnAfterLanding If true, group is despawned after landed at an airbase. +-- @field #number RTBRecallCount Number that counts RTB calls. -- -- @extends Ops.OpsGroup#OPSGROUP @@ -145,6 +146,7 @@ FLIGHTGROUP = { Twaiting = nil, menu = nil, isHelo = nil, + RTBRecallCount = 0, }