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

Merge pull request #841 from FlightControl-Master/FF-Servant

Browse Source 
Range Radio Menu Hotfix
This commit is contained in:
Frank 2018-03-22 19:54:49 +01:00 committed by GitHub
commit 95eb88e67e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Moose Development/Moose/Functional/Range.lua
View File

@ -78,7 +78,7 @@
-- @field #number illuminationmaxalt Maximum altitude AGL in meters at which illumination bombs are fired. Default is 1000 m. -- @field #number illuminationmaxalt Maximum altitude AGL in meters at which illumination bombs are fired. Default is 1000 m.
-- @field #number scorebombdistance Distance from closest target up to which bomb hits are counted. Default 1000 m. -- @field #number scorebombdistance Distance from closest target up to which bomb hits are counted. Default 1000 m.
-- @field #number TdelaySmoke Time delay in seconds between impact of bomb and starting the smoke. Default 3 seconds. -- @field #number TdelaySmoke Time delay in seconds between impact of bomb and starting the smoke. Default 3 seconds.
-- @field #boolean eventmoose If true, events are handled by MOOSE. If false, events are handled directly by DCS eventhandler. Default true. -- @field #boolean eventmoose If true, events are handled by MOOSE. If false, events are handled directly by DCS eventhandler. Default true.
-- @extends Core.Base#BASE -- @extends Core.Base#BASE
---# RANGE class, extends @{Base#BASE} ---# RANGE class, extends @{Base#BASE}
@ -217,6 +217,10 @@ RANGE={
eventmoose=true, eventmoose=true,
} }
--- Main radio menu.
-- @field #table MenuF10
RANGE.MenuF10={}
--- Some ID to identify who we are in output of the DCS.log file. --- Some ID to identify who we are in output of the DCS.log file.
-- @field #string id -- @field #string id
RANGE.id="RANGE | " RANGE.id="RANGE | "
@ -715,21 +719,26 @@ end
function RANGE:OnEventHit(EventData) function RANGE:OnEventHit(EventData)
--function RANGE:_OnHit(EventData) --function RANGE:_OnHit(EventData)
self:F({eventhit = EventData}) self:F({eventhit = EventData})
-- Player info
local _unitName = EventData.IniUnitName
local _unit, _playername = self:_GetPlayerUnitAndName(_unitName)
local _unitID = _unit:GetID()
-- Target
local target = EventData.TgtUnit
local targetname = EventData.TgtUnitName
-- Debug info. -- Debug info.
self:T3(RANGE.id.."HIT: Ini unit = "..tostring(EventData.IniUnitName)) self:T3(RANGE.id.."HIT: Ini unit = "..tostring(EventData.IniUnitName))
self:T3(RANGE.id.."HIT: Ini group = "..tostring(EventData.IniGroupName)) self:T3(RANGE.id.."HIT: Ini group = "..tostring(EventData.IniGroupName))
self:T3(RANGE.id.."HIT: Tgt target = "..tostring(EventData.TgtUnitName)) self:T3(RANGE.id.."HIT: Tgt target = "..tostring(EventData.TgtUnitName))
-- Player info
local _unitName = EventData.IniUnitName
local _unit, _playername = self:_GetPlayerUnitAndName(_unitName)
if _unit==nil or _playername==nil then
return
end
-- Unit ID
local _unitID = _unit:GetID()
-- Target
local target = EventData.TgtUnit
local targetname = EventData.TgtUnitName
-- Current strafe target of player. -- Current strafe target of player.
local _currentTarget = self.strafeStatus[_unitID] local _currentTarget = self.strafeStatus[_unitID]
@ -1485,8 +1494,10 @@ function RANGE:_AddF10Commands(_unitName)
self.MenuAddedTo[_gid] = true self.MenuAddedTo[_gid] = true
-- Main F10 menu: F10/On the Range -- Main F10 menu: F10/On the Range
local _rootPath = missionCommands.addSubMenuForGroup(_gid, "On the Range") if RANGE.MenuF10[_gid] == nil then
local _rangePath = missionCommands.addSubMenuForGroup(_gid, self.rangename, _rootPath) RANGE.MenuF10[_gid]=missionCommands.addSubMenuForGroup(_gid, "On the Range")
end
local _rangePath = missionCommands.addSubMenuForGroup(_gid, self.rangename, RANGE.MenuF10[_gid])
local _statsPath = missionCommands.addSubMenuForGroup(_gid, "Statistics", _rangePath) local _statsPath = missionCommands.addSubMenuForGroup(_gid, "Statistics", _rangePath)
local _markPath = missionCommands.addSubMenuForGroup(_gid, "Mark Targets", _rangePath) local _markPath = missionCommands.addSubMenuForGroup(_gid, "Mark Targets", _rangePath)
local _settingsPath = missionCommands.addSubMenuForGroup(_gid, "My Settings", _rangePath) local _settingsPath = missionCommands.addSubMenuForGroup(_gid, "My Settings", _rangePath)