weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-16 07:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ops

Browse Source
This commit is contained in:
Frank
2020-04-05 01:37:36 +02:00
parent 61d3035c76
commit 7465fd065f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/Auftrag.lua
+1 -1
View File
@@ -1021,7 +1021,7 @@ end
-- @param #AUFTRAG self -- @param #AUFTRAG self
-- @param #string roe Mission ROT. -- @param #string roe Mission ROT.
-- @return #AUFTRAG self -- @return #AUFTRAG self
function AUFTRAG:SetROE(rot) function AUFTRAG:SetROT(rot)
self.optionROT=rot self.optionROT=rot
Moose Development/Moose/Ops/Squadron.lua
+13 -3
View File
@@ -521,13 +521,16 @@ function SQUADRON:CanMission(Mission)
if cando then if cando then
-- Distance to target.
local TargetDistance=Mission:GetTargetDistance(self.airwing:GetCoordinate()) local TargetDistance=Mission:GetTargetDistance(self.airwing:GetCoordinate())
for _,_asset in pairs(self.assets) do for _,_asset in pairs(self.assets) do
local asset=_asset --Ops.AirWing#AIRWING.SquadronAsset local asset=_asset --Ops.AirWing#AIRWING.SquadronAsset
local engagerange=Mission.engageMaxDistance and math.min(self.engageRange, Mission.engageMaxDistance) or self.engageRange
-- Set range is valid. Mission engage distance can overrule the squad engage range. -- Set range is valid. Mission engage distance can overrule the squad engage range.
if TargetDistance<=self.engageRange or (Mission.engageMaxDistance and TargetDistance<=Mission.engageMaxDistance) then if TargetDistance<=engagerange then
-- Check if asset is currently on a mission (STARTED or QUEUED). -- Check if asset is currently on a mission (STARTED or QUEUED).
if self.airwing:IsAssetOnMission(asset) then if self.airwing:IsAssetOnMission(asset) then
@@ -596,12 +599,19 @@ function SQUADRON:CanMission(Mission)
end end
else
self:I(self.lid..string.format("INFO: Squad is not in range. Target dist=%d > %d NM max engage Range", UTILS.MetersToNM(TargetDistance), UTILS.MetersToNM(engagerange)))
end end
end
end end -- loop over assets
else
self:I(self.lid..string.format("INFO: Squad cannot do mission type %s", Mission.type))
end -- if cando mission type
-- Check if required assets are present. -- Check if required assets are present.
if Mission.nassets and Mission.nassets > #assets then if Mission.nassets and Mission.nassets > #assets then
self:I(self.lid.."Not enough assets available")
cando=false cando=false
end end