weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

event backfixed

Browse Source
This commit is contained in:
Frank 2021-04-30 11:53:57 +02:00
parent 990f748e42
commit 421005a3b6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/Core/Event.lua
View File

@ -1114,9 +1114,10 @@ function EVENT:onEvent( Event )
Event.TgtTypeName = Event.TgtDCSUnit:getTypeName() Event.TgtTypeName = Event.TgtDCSUnit:getTypeName()
end end
env.info("FF I am here first")
if Event.TgtObjectCategory == Object.Category.STATIC then if Event.TgtObjectCategory == Object.Category.STATIC then
env.info("FF I am here")
BASE:T({Event = Event}) BASE:T({Event = Event})
--[[
Event.TgtDCSUnit = Event.target Event.TgtDCSUnit = Event.target
Event.TgtDCSUnitName = Event.TgtDCSUnit:getName() Event.TgtDCSUnitName = Event.TgtDCSUnit:getName()
Event.TgtUnitName = Event.TgtDCSUnitName Event.TgtUnitName = Event.TgtDCSUnitName
@ -1124,8 +1125,8 @@ function EVENT:onEvent( Event )
Event.TgtCoalition = Event.TgtDCSUnit:getCoalition() Event.TgtCoalition = Event.TgtDCSUnit:getCoalition()
Event.TgtCategory = Event.TgtDCSUnit:getDesc().category Event.TgtCategory = Event.TgtDCSUnit:getDesc().category
Event.TgtTypeName = Event.TgtDCSUnit:getTypeName() Event.TgtTypeName = Event.TgtDCSUnit:getTypeName()
--]]
-- Same as for Event Initiator above 2.7 issue -- Same as for Event Initiator above 2.7 issue
--[[
Event.TgtDCSUnit = Event.target Event.TgtDCSUnit = Event.target
local ID=Event.initiator.id_ local ID=Event.initiator.id_
Event.TgtDCSUnitName = string.format("Ejected Pilot ID %s", tostring(ID)) Event.TgtDCSUnitName = string.format("Ejected Pilot ID %s", tostring(ID))
@ -1134,6 +1135,7 @@ function EVENT:onEvent( Event )
Event.TgtCoalition = Event.IniCoalition Event.TgtCoalition = Event.IniCoalition
Event.TgtCategory = Event.IniCategory Event.TgtCategory = Event.IniCategory
Event.TgtTypeName = "Ejected Pilot" Event.TgtTypeName = "Ejected Pilot"
]]
end end
if Event.TgtObjectCategory == Object.Category.SCENERY then if Event.TgtObjectCategory == Object.Category.SCENERY then

2
Moose Development/Moose/Ops/FlightGroup.lua
View File

@ -56,6 +56,7 @@
-- @field #number callsignName Callsign name. -- @field #number callsignName Callsign name.
-- @field #number callsignNumber Callsign number. -- @field #number callsignNumber Callsign number.
-- @field #boolean despawnAfterLanding If true, group is despawned after landed at an airbase. -- @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 -- @extends Ops.OpsGroup#OPSGROUP
@ -145,6 +146,7 @@ FLIGHTGROUP = {
Twaiting = nil, Twaiting = nil,
menu = nil, menu = nil,
isHelo = nil, isHelo = nil,
RTBRecallCount = 0,
} }