FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

CSAR updates to messaging. Detect if far approach note exceeds 8km for smoke/flare request

Browse Source
This commit is contained in:
Applevangelist
2021-07-23 11:19:53 +02:00
parent 49397df90b
commit 61481e6e9a
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Moose Development/Moose/Ops/CSAR.lua
View File

@@ -1010,6 +1010,8 @@ function CSAR:_CheckWoundedGroupStatus(heliname,woundedgroupname)
end end
elseif _distance >= self.approachdist_near and _distance < self.approachdist_far then elseif _distance >= self.approachdist_near and _distance < self.approachdist_far then
self.heliVisibleMessage[_lookupKeyHeli] = nil self.heliVisibleMessage[_lookupKeyHeli] = nil
self.heliCloseMessage[_lookupKeyHeli] = nil
self.landedStatus[_lookupKeyHeli] = nil
--reschedule as units aren\'t dead yet , schedule for a bit slower though as we\'re far away --reschedule as units aren\'t dead yet , schedule for a bit slower though as we\'re far away
_downedpilot.timestamp = timer.getAbsTime() _downedpilot.timestamp = timer.getAbsTime()
self:__Approach(-10,heliname,woundedgroupname) self:__Approach(-10,heliname,woundedgroupname)
@@ -1520,8 +1522,9 @@ function CSAR:_SignalFlare(_unitName)
end end
local _closest = self:_GetClosestDownedPilot(_heli) local _closest = self:_GetClosestDownedPilot(_heli)
local smokedist = 8000
if _closest ~= nil and _closest.pilot ~= nil and _closest.distance < 8000.0 then if self.approachdist_far > smokedist then smokedist = self.approachdist_far end
if _closest ~= nil and _closest.pilot ~= nil and _closest.distance < smokedist then
local _clockDir = self:_GetClockDirection(_heli, _closest.pilot) local _clockDir = self:_GetClockDirection(_heli, _closest.pilot)
local _distance = 0 local _distance = 0
@@ -1536,11 +1539,13 @@ function CSAR:_SignalFlare(_unitName)
local _coord = _closest.pilot:GetCoordinate() local _coord = _closest.pilot:GetCoordinate()
_coord:FlareRed(_clockDir) _coord:FlareRed(_clockDir)
else else
local disttext = "4.3nm" local _distance = smokedist
if _SETTINGS:IsMetric() then if _SETTINGS:IsImperial() then
disttext = "8km" _distance = string.format("%.1fnm",UTILS.MetersToNM(smokedist))
else
_distance = string.format("%.1fkm",smokedist/1000)
end end
self:_DisplayMessageToSAR(_heli, string.format("No Pilots within %s",disttext), self.messageTime) self:_DisplayMessageToSAR(_heli, string.format("No Pilots within %s",_distance), self.messageTime)
end end
return self return self
end end
@@ -1572,8 +1577,10 @@ function CSAR:_Reqsmoke( _unitName )
if _heli == nil then if _heli == nil then
return return
end end
local smokedist = 8000
if smokedist < self.approachdist_far then smokedist = self.approachdist_far end
local _closest = self:_GetClosestDownedPilot(_heli) local _closest = self:_GetClosestDownedPilot(_heli)
if _closest ~= nil and _closest.pilot ~= nil and _closest.distance < 8000.0 then if _closest ~= nil and _closest.pilot ~= nil and _closest.distance < smokedist then
local _clockDir = self:_GetClockDirection(_heli, _closest.pilot) local _clockDir = self:_GetClockDirection(_heli, _closest.pilot)
local _distance = 0 local _distance = 0
if _SETTINGS:IsImperial() then if _SETTINGS:IsImperial() then
@@ -1587,11 +1594,13 @@ function CSAR:_Reqsmoke( _unitName )
local color = self.smokecolor local color = self.smokecolor
_coord:Smoke(color) _coord:Smoke(color)
else else
local disttext = "4.3nm" local _distance = 0
if _SETTINGS:IsMetric() then if _SETTINGS:IsImperial() then
disttext = "8km" _distance = string.format("%.1fnm",UTILS.MetersToNM(smokedist))
else
_distance = string.format("%.1fkm",smokedist/1000)
end end
self:_DisplayMessageToSAR(_heli, string.format("No Pilots within %s",disttext), self.messageTime) self:_DisplayMessageToSAR(_heli, string.format("No Pilots within %s",_distance), self.messageTime)
end end
return self return self
end end

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

@@ -1,4 +1,4 @@
--- **Ops** -- Combat Troops & Logistics Deployment. --- **Ops** -- Combat Troops & Logistics Department.
-- --
-- === -- ===
-- --