mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -1485,6 +1485,17 @@ function CHIEF:AddGciCapZone(Zone, Altitude, Speed, Heading, Leg)
|
|||||||
return zone
|
return zone
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- Remove a GCI CAP
|
||||||
|
-- @param #CHIEF self
|
||||||
|
-- @param Core.Zone#ZONE Zone Zone, where the flight orbits.
|
||||||
|
function CHIEF:RemoveGciCapZone(Zone)
|
||||||
|
|
||||||
|
-- Hand over to commander.
|
||||||
|
local zone=self.commander:RemoveGciCapZone(Zone)
|
||||||
|
|
||||||
|
return zone
|
||||||
|
end
|
||||||
|
|
||||||
--- Add an AWACS zone.
|
--- Add an AWACS zone.
|
||||||
-- @param #CHIEF self
|
-- @param #CHIEF self
|
||||||
-- @param Core.Zone#ZONE Zone Zone.
|
-- @param Core.Zone#ZONE Zone Zone.
|
||||||
|
|||||||
@@ -710,6 +710,26 @@ function COMMANDER:AddGciCapZone(Zone, Altitude, Speed, Heading, Leg)
|
|||||||
return patrolzone
|
return patrolzone
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- Remove a GCI CAP.
|
||||||
|
-- @param #COMMANDER self
|
||||||
|
-- @param Core.Zone#ZONE Zone Zone, where the flight orbits.
|
||||||
|
function COMMANDER:RemoveGciCapZone(Zone)
|
||||||
|
|
||||||
|
local patrolzone={} --Ops.AirWing#AIRWING.PatrolZone
|
||||||
|
|
||||||
|
patrolzone.zone=Zone
|
||||||
|
for i,_patrolzone in pairs(self.gcicapZones) do
|
||||||
|
if _patrolzone.zone == patrolzone.zone then
|
||||||
|
if _patrolzone.mission and _patrolzone.mission:IsNotOver() then
|
||||||
|
_patrolzone.mission:Cancel()
|
||||||
|
end
|
||||||
|
table.remove(self.gcicapZones, i)
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return patrolzone
|
||||||
|
end
|
||||||
|
|
||||||
--- Add an AWACS zone.
|
--- Add an AWACS zone.
|
||||||
-- @param #COMMANDER self
|
-- @param #COMMANDER self
|
||||||
-- @param Core.Zone#ZONE Zone Zone.
|
-- @param Core.Zone#ZONE Zone Zone.
|
||||||
|
|||||||
Reference in New Issue
Block a user