mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge branch 'develop' into FF/Ops
This commit is contained in:
Frank
@@ -12123,16 +12123,18 @@ function AIRBOSS:_LSOgrade( playerData )
|
||||
local GIC, nIC = self:_Flightdata2Text( playerData, AIRBOSS.GroovePos.IC )
|
||||
local GAR, nAR = self:_Flightdata2Text( playerData, AIRBOSS.GroovePos.AR )
|
||||
|
||||
-- VTOL approach, which is graded differently (currently only Harrier).
|
||||
local vtol=playerData.actype==AIRBOSS.AircraftCarrier.AV8B
|
||||
|
||||
-- Put everything together.
|
||||
local G = GXX .. " " .. GIM .. " " .. " " .. GIC .. " " .. GAR
|
||||
|
||||
-- Count number of minor, normal and major deviations.
|
||||
-- Count number of minor/small nS, normal nN and major/large deviations nL.
|
||||
local N=nXX+nIM+nIC+nAR
|
||||
local Nv=nXX+nIM
|
||||
local nL=count(G, '_')/2
|
||||
local nS=count(G, '%(')
|
||||
local nN=N-nS-nL
|
||||
local nNv=Nv-nS-nL
|
||||
|
||||
|
||||
-- Groove time 15-18.99 sec for a unicorn. Or 60-65 for V/STOL unicorn.
|
||||
local Tgroove=playerData.Tgroove
|
||||
@@ -12148,34 +12150,64 @@ function AIRBOSS:_LSOgrade( playerData )
|
||||
G = "Unicorn"
|
||||
else
|
||||
|
||||
-- Add AV-8B Harrier devation allowances due to lower groundspeed and 3x conventional groove time, this allows to maintain LSO tolerances while respecting the deviations are not unsafe.--Pene testing
|
||||
-- Large devaitions still result in a No Grade, A Unicorn still requires a clean pass with no deviation.
|
||||
if nL > 1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
|
||||
-- Larger deviations ==> "No grade" 2.0 points.
|
||||
grade="--"
|
||||
points=2.0
|
||||
elseif nNv >= 1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
|
||||
-- Only average deviations ==> "Fair Pass" Pass with average deviations and corrections.
|
||||
grade="(OK)"
|
||||
points=3.0
|
||||
elseif nNv < 1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
|
||||
-- Only minor average deviations ==> "OK" Pass with minor deviations and corrections. (test nNv<=1 and)
|
||||
grade="OK"
|
||||
points=4.0
|
||||
elseif nL > 0 then
|
||||
-- Larger deviations ==> "No grade" 2.0 points.
|
||||
grade="--"
|
||||
points=2.0
|
||||
elseif nN> 0 then
|
||||
-- No larger but average deviations ==> "Fair Pass" Pass with average deviations and corrections.
|
||||
grade="(OK)"
|
||||
points=3.0
|
||||
else
|
||||
-- Only minor corrections
|
||||
grade="OK"
|
||||
points=4.0
|
||||
end
|
||||
if vtol then
|
||||
|
||||
-- Add AV-8B Harrier devation allowances due to lower groundspeed and 3x conventional groove time, this allows to maintain LSO tolerances while respecting the deviations are not unsafe.--Pene testing
|
||||
-- Large devaitions still result in a No Grade, A Unicorn still requires a clean pass with no deviation.
|
||||
|
||||
-- Normal laning part at the beginning
|
||||
local Gb = GXX .. " " .. GIM
|
||||
|
||||
-- Number of deviations that occurred at the the beginning of the landing (XX or IM). These are graded like in non-VTOL landings, i.e. on deviations is
|
||||
local N=nXX+nIM
|
||||
local nL=count(Gb, '_')/2
|
||||
local nS=count(Gb, '%(')
|
||||
local nN=N-nS-nL
|
||||
|
||||
|
||||
-- VTOL part of the landing
|
||||
local Gv = GIC .. " " .. GAR
|
||||
|
||||
-- Number of deviations that occurred at the the end (VTOL part) of the landing (IC or AR).
|
||||
local Nv=nIC+nAR
|
||||
local nLv=count(Gv, '_')/2
|
||||
local nSv=count(Gv, '%(')
|
||||
local nNv=Nv-nSv-nLv
|
||||
|
||||
if nL>0 or nLv>1 then
|
||||
-- Larger deviations at XX or IM or at least one larger deviation IC or AR==> "No grade" 2.0 points.
|
||||
-- In other words, we allow one larger deviation at IC+AR
|
||||
grade="--"
|
||||
points=2.0
|
||||
elseif nN>0 or nNv>1 or nLv==1 then
|
||||
-- Average deviations at XX+IM or more than one normal deviation IC or AR ==> "Fair Pass" Pass with average deviations and corrections.
|
||||
grade="(OK)"
|
||||
points=3.0
|
||||
else
|
||||
-- Only minor corrections
|
||||
grade="OK"
|
||||
points=4.0
|
||||
end
|
||||
|
||||
else
|
||||
|
||||
-- This is a normal (non-VTOL) landing.
|
||||
|
||||
if nL > 0 then
|
||||
-- Larger deviations ==> "No grade" 2.0 points.
|
||||
grade="--"
|
||||
points=2.0
|
||||
elseif nN> 0 then
|
||||
-- No larger but average/normal deviations ==> "Fair Pass" Pass with average deviations and corrections.
|
||||
grade="(OK)"
|
||||
points=3.0
|
||||
else
|
||||
-- Only minor corrections ==> "Okay pass" 4.0 points.
|
||||
grade="OK"
|
||||
points=4.0
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
-- Replace" )"( and "__"
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
-- @field #table NassetsLegMax Number of required warehouse assets for each assigned legion.
|
||||
-- @field #table requestID The ID of the queued warehouse request. Necessary to cancel the request if the mission was cancelled before the request is processed.
|
||||
-- @field #table payloads User specified airwing payloads for this mission. Only these will be considered for the job!
|
||||
-- @field Ops.AirWing#AIRWING.PatrolData patroldata Patrol data.
|
||||
-- @field Ops.Airwing#AIRWING.PatrolData patroldata Patrol data.
|
||||
--
|
||||
-- @field #table specialLegions User specified legions assigned for this mission. Only these will be considered for the job!
|
||||
-- @field #table specialCohorts User specified cohorts assigned for this mission. Only these will be considered for the job!
|
||||
@@ -338,7 +338,7 @@
|
||||
--
|
||||
-- ## Legion Level
|
||||
--
|
||||
-- Adding an AUFTRAG to an airwing is done via the @{Ops.AirWing#AIRWING.AddMission} function. See AIRWING docs for further details.
|
||||
-- Adding an AUFTRAG to an airwing is done via the @{Ops.Airwing#AIRWING.AddMission} function. See AIRWING docs for further details.
|
||||
-- Similarly, an AUFTRAG can be added to a brigade via the @{Ops.Brigade#BRIGADE.AddMission} function.
|
||||
--
|
||||
-- ## Commander Level
|
||||
@@ -3734,7 +3734,7 @@ end
|
||||
|
||||
--- Add a required payload for this mission. Only these payloads will be used for this mission. If they are not available, the mission cannot start. Only available for use with an AIRWING.
|
||||
-- @param #AUFTRAG self
|
||||
-- @param Ops.AirWing#AIRWING.Payload Payload Required payload.
|
||||
-- @param Ops.Airwing#AIRWING.Payload Payload Required payload.
|
||||
-- @return #AUFTRAG self
|
||||
function AUFTRAG:AddRequiredPayload(Payload)
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ do
|
||||
-- @field #number Frequency
|
||||
-- @field #number Modulation
|
||||
-- @field Wrapper.Airbase#AIRBASE Airbase
|
||||
-- @field Ops.AirWing#AIRWING AirWing
|
||||
-- @field Ops.Airwing#AIRWING AirWing
|
||||
-- @field #number AwacsAngels
|
||||
-- @field Core.Zone#ZONE OrbitZone
|
||||
-- @field #number CallSign
|
||||
@@ -159,10 +159,10 @@ do
|
||||
--
|
||||
-- ## 3 Airwing(s)
|
||||
--
|
||||
-- The AWACS plane, the optional escort planes, and the AI CAP planes work based on the @{Ops.AirWing} class. Read and understand the manual for this class in
|
||||
-- The AWACS plane, the optional escort planes, and the AI CAP planes work based on the @{Ops.Airwing} class. Read and understand the manual for this class in
|
||||
-- order to set everything up correctly. You will at least need one Squadron containing the AWACS plane itself.
|
||||
--
|
||||
-- Set up the AirWing
|
||||
-- Set up the Airwing
|
||||
--
|
||||
-- local AwacsAW = AIRWING:New("AirForce WH-1","AirForce One")
|
||||
-- AwacsAW:SetMarker(false)
|
||||
@@ -226,7 +226,7 @@ do
|
||||
--
|
||||
-- ## 5 Set up AWACS
|
||||
--
|
||||
-- -- Set up AWACS called "AWACS North". It will use the AwacsAW AirWing set up above and be of the "blue" coalition. Homebase is Kutaisi.
|
||||
-- -- Set up AWACS called "AWACS North". It will use the AwacsAW Airwing set up above and be of the "blue" coalition. Homebase is Kutaisi.
|
||||
-- -- The AWACS Orbit Zone is a round zone set in the mission editor named "Awacs Orbit", the FEZ is a Polygon-Zone called "Rock" we have also
|
||||
-- -- set up in the mission editor with a late activated helo named "Rock#ZONE_POLYGON". Note this also sets the BullsEye to be referenced as "Rock".
|
||||
-- -- The CAP station zone is called "Fremont". We will be on 255 AM.
|
||||
@@ -248,7 +248,7 @@ do
|
||||
--
|
||||
-- ### 5.1 Alternative - Set up as GCI (no AWACS plane needed) Theater Air Control System (TACS)
|
||||
--
|
||||
-- -- Set up as TACS called "GCI Senaki". It will use the AwacsAW AirWing set up above and be of the "blue" coalition. Homebase is Senaki.
|
||||
-- -- Set up as TACS called "GCI Senaki". It will use the AwacsAW Airwing set up above and be of the "blue" coalition. Homebase is Senaki.
|
||||
-- -- No need to set the AWACS Orbit Zone; the FEZ is still a Polygon-Zone called "Rock" we have also
|
||||
-- -- set up in the mission editor with a late activated helo named "Rock#ZONE_POLYGON". Note this also sets the BullsEye to be referenced as "Rock".
|
||||
-- -- The CAP station zone is called "Fremont". We will be on 255 AM. Note the Orbit Zone is given as *nil* in the `New()`-Statement
|
||||
@@ -852,8 +852,8 @@ AWACS.Messages = {
|
||||
--- Contact Data
|
||||
-- @type AWACS.ManagedContact
|
||||
-- @field #number CID
|
||||
-- @field Ops.Intelligence#INTEL.Contact Contact
|
||||
-- @field Ops.Intelligence#INTEL.Cluster Cluster
|
||||
-- @field Ops.Intel#INTEL.Contact Contact
|
||||
-- @field Ops.Intel#INTEL.Cluster Cluster
|
||||
-- @field #string IFF -- ID'ed or not (yet)
|
||||
-- @field Ops.Target#TARGET Target
|
||||
-- @field #number LinkedTask --> TID
|
||||
@@ -902,8 +902,8 @@ AWACS.TaskStatus = {
|
||||
-- @field #AWACS.TaskStatus Status
|
||||
-- @field #AWACS.TaskDescription ToDo
|
||||
-- @field #string ScreenText Long descrition
|
||||
-- @field Ops.Intelligence#INTEL.Contact Contact
|
||||
-- @field Ops.Intelligence#INTEL.Cluster Cluster
|
||||
-- @field Ops.Intel#INTEL.Contact Contact
|
||||
-- @field Ops.Intel#INTEL.Cluster Cluster
|
||||
-- @field #number CurrentAuftrag
|
||||
-- @field #number RequestedTimestamp
|
||||
|
||||
@@ -956,7 +956,7 @@ AWACS.TaskStatus = {
|
||||
-- DONE - Shift Change, Change on asset RTB or dead or mission done (done for AWACS and Escorts)
|
||||
-- DONE - TripWire - WIP - Threat (35nm), Meld (45nm, on mission), Merged (<3nm)
|
||||
--
|
||||
-- DONE - Escorts via AirWing not staying on
|
||||
-- DONE - Escorts via Airwing not staying on
|
||||
-- DONE - Borders for INTEL. Optional, i.e. land based defense within borders
|
||||
-- DONE - Use AO as Anchor of Bulls, AO as default
|
||||
-- DONE - SRS TTS output
|
||||
@@ -984,7 +984,7 @@ AWACS.TaskStatus = {
|
||||
--- Set up a new AI AWACS.
|
||||
-- @param #AWACS self
|
||||
-- @param #string Name Name of this AWACS for the radio menu.
|
||||
-- @param #string AirWing The core Ops.AirWing#AIRWING managing the AWACS, Escort and (optionally) AI CAP planes for us.
|
||||
-- @param #string AirWing The core Ops.Airwing#AIRWING managing the AWACS, Escort and (optionally) AI CAP planes for us.
|
||||
-- @param #number Coalition Coalition, e.g. coalition.side.BLUE. Can also be passed as "blue", "red" or "neutral".
|
||||
-- @param #string AirbaseName Name of the home airbase.
|
||||
-- @param #string AwacsOrbit Name of the round, mission editor created zone where this AWACS orbits.
|
||||
@@ -1024,7 +1024,7 @@ function AWACS:New(Name,AirWing,Coalition,AirbaseName,AwacsOrbit,OpsZone,Station
|
||||
|
||||
-- base setup
|
||||
self.Name = Name -- #string
|
||||
self.AirWing = AirWing -- Ops.AirWing#AIRWING object
|
||||
self.AirWing = AirWing -- Ops.Airwing#AIRWING object
|
||||
|
||||
AirWing:SetUsingOpsAwacs(self)
|
||||
|
||||
@@ -1032,7 +1032,7 @@ function AWACS:New(Name,AirWing,Coalition,AirbaseName,AwacsOrbit,OpsZone,Station
|
||||
self.CAPAirwings:Push(AirWing,1)
|
||||
|
||||
self.AwacsFG = nil
|
||||
--self.AwacsPayload = PayLoad -- Ops.AirWing#AIRWING.Payload
|
||||
--self.AwacsPayload = PayLoad -- Ops.Airwing#AIRWING.Payload
|
||||
--self.ModernEra = true -- use of EPLRS
|
||||
self.RadarBlur = 15 -- +/-15% detection precision i.e. 85-115 reported group size
|
||||
if type(OpsZone) == "string" then
|
||||
@@ -2463,7 +2463,7 @@ function AWACS:_UpdateContactFromCluster(CID)
|
||||
|
||||
local function GetFirstAliveContact(table)
|
||||
for _,_contact in pairs (table) do
|
||||
local contact = _contact -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = _contact -- Ops.Intel#INTEL.Contact
|
||||
if contact and contact.group and contact.group:IsAlive() then
|
||||
return contact
|
||||
end
|
||||
@@ -4260,7 +4260,7 @@ function AWACS:_StartIntel(awacs)
|
||||
|
||||
intel:__Start(5)
|
||||
|
||||
self.intel = intel -- Ops.Intelligence#INTEL
|
||||
self.intel = intel -- Ops.Intel#INTEL
|
||||
return self
|
||||
end
|
||||
|
||||
@@ -4420,8 +4420,8 @@ end
|
||||
-- @param #table Object Object for Ops.Target#TARGET assignment
|
||||
-- @param #AWACS.TaskStatus TaskStatus Status of this task
|
||||
-- @param Ops.Auftrag#AUFTRAG Auftrag The Auftrag for this task if any
|
||||
-- @param Ops.Intelligence#INTEL.Cluster Cluster Intel Cluster for this task
|
||||
-- @param Ops.Intelligence#INTEL.Contact Contact Intel Contact for this task
|
||||
-- @param Ops.Intel#INTEL.Cluster Cluster Intel Cluster for this task
|
||||
-- @param Ops.Intel#INTEL.Contact Contact Intel Contact for this task
|
||||
-- @return #number TID Task ID created
|
||||
function AWACS:_CreateTaskForGroup(GroupID,Description,ScreenText,Object,TaskStatus,Auftrag,Cluster,Contact)
|
||||
self:T(self.lid.."_CreateTaskForGroup "..GroupID .." Description: "..Description)
|
||||
@@ -4978,7 +4978,7 @@ end
|
||||
|
||||
--- [User] Add another AirWing for AI CAP Flights under management
|
||||
-- @param #AWACS self
|
||||
-- @param Ops.AirWing#AIRWING AirWing The AirWing to (also) obtain CAP flights from
|
||||
-- @param Ops.Airwing#AIRWING AirWing The AirWing to (also) obtain CAP flights from
|
||||
-- @param Core.Zone#ZONE_RADIUS Zone (optional) This AirWing has it's own station zone, AI CAP will be send there
|
||||
-- @return #AWACS self
|
||||
function AWACS:AddCAPAirWing(AirWing,Zone)
|
||||
@@ -5063,7 +5063,7 @@ function AWACS:_AnnounceContact(Contact,IsNew,Group,IsBogeyDope,Tag,IsPopup,Repo
|
||||
end
|
||||
|
||||
local cluster = Contact.Cluster
|
||||
local intel = self.intel -- Ops.Intelligence#INTEL
|
||||
local intel = self.intel -- Ops.Intel#INTEL
|
||||
|
||||
local size = self.intel:ClusterCountUnits(cluster)
|
||||
local threatsize, threatsizetext = self:_GetBlurredSize(size)
|
||||
@@ -5465,7 +5465,7 @@ function AWACS:_TACRangeCall(GID,Contact)
|
||||
if not Contact then return self end
|
||||
local pilotcallsign = self:_GetCallSign(nil,GID)
|
||||
local managedgroup = self.ManagedGrps[GID] -- #AWACS.ManagedGroup
|
||||
local contact = Contact.Contact -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = Contact.Contact -- Ops.Intel#INTEL.Contact
|
||||
local contacttag = Contact.TargetGroupNaming
|
||||
if contact and not Contact.TACCallDone then
|
||||
local position = contact.position -- Core.Point#COORDINATE
|
||||
@@ -5494,7 +5494,7 @@ function AWACS:_MeldRangeCall(GID,Contact)
|
||||
local pilotcallsign = self:_GetCallSign(nil,GID)
|
||||
local managedgroup = self.ManagedGrps[GID] -- #AWACS.ManagedGroup
|
||||
local flightpos = managedgroup.Group:GetCoordinate()
|
||||
local contact = Contact.Contact -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = Contact.Contact -- Ops.Intel#INTEL.Contact
|
||||
local contacttag = Contact.TargetGroupNaming
|
||||
if contact and not Contact.MeldCallDone then
|
||||
local position = contact.position -- Core.Point#COORDINATE
|
||||
@@ -5524,7 +5524,7 @@ function AWACS:_ThreatRangeCall(GID,Contact)
|
||||
local pilotcallsign = self:_GetCallSign(nil,GID)
|
||||
local managedgroup = self.ManagedGrps[GID] -- #AWACS.ManagedGroup
|
||||
local flightpos = managedgroup.Group:GetCoordinate() or managedgroup.LastKnownPosition
|
||||
local contact = Contact.Contact -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = Contact.Contact -- Ops.Intel#INTEL.Contact
|
||||
local contacttag = Contact.TargetGroupNaming
|
||||
if contact then
|
||||
local position = contact.position or contact.group:GetCoordinate() -- Core.Point#COORDINATE
|
||||
@@ -5832,7 +5832,7 @@ function AWACS:onafterStart(From, Event, To)
|
||||
|
||||
if not self.GCI then
|
||||
-- set up the AWACS and let it orbit
|
||||
local AwacsAW = self.AirWing -- Ops.AirWing#AIRWING
|
||||
local AwacsAW = self.AirWing -- Ops.Airwing#AIRWING
|
||||
local mission = AUFTRAG:NewORBIT_RACETRACK(self.OrbitZone:GetCoordinate(),self.AwacsAngels*1000,self.Speed,self.Heading,self.Leg)
|
||||
local timeonstation = (self.AwacsTimeOnStation + self.ShiftChangeTime) * 3600
|
||||
mission:SetTime(nil,timeonstation)
|
||||
@@ -6426,7 +6426,7 @@ end
|
||||
-- @param #string From
|
||||
-- @param #string Event
|
||||
-- @param #string To
|
||||
-- @param Ops.Intelligence#INTEL.Cluster Cluster
|
||||
-- @param Ops.Intel#INTEL.Cluster Cluster
|
||||
-- @return #AWACS self
|
||||
function AWACS:onafterNewCluster(From,Event,To,Cluster)
|
||||
self:T({From, Event, To, Cluster.index})
|
||||
@@ -6438,7 +6438,7 @@ function AWACS:onafterNewCluster(From,Event,To,Cluster)
|
||||
|
||||
local function GetFirstAliveContact(table)
|
||||
for _,_contact in pairs (table) do
|
||||
local contact = _contact -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = _contact -- Ops.Intel#INTEL.Contact
|
||||
if contact and contact.group and contact.group:IsAlive() then
|
||||
return contact, contact.group
|
||||
end
|
||||
@@ -6446,7 +6446,7 @@ function AWACS:onafterNewCluster(From,Event,To,Cluster)
|
||||
return nil
|
||||
end
|
||||
|
||||
local Contact, Group = GetFirstAliveContact(ContactTable) -- Ops.Intelligence#INTEL.Contact
|
||||
local Contact, Group = GetFirstAliveContact(ContactTable) -- Ops.Intel#INTEL.Contact
|
||||
|
||||
if not Contact then return self end
|
||||
|
||||
@@ -6457,7 +6457,7 @@ function AWACS:onafterNewCluster(From,Event,To,Cluster)
|
||||
local targetset = SET_GROUP:New()
|
||||
-- SET for TARGET
|
||||
for _,_grp in pairs(ContactTable) do
|
||||
local grp = _grp -- Ops.Intelligence#INTEL.Contact
|
||||
local grp = _grp -- Ops.Intel#INTEL.Contact
|
||||
targetset:AddGroup(grp.group, true)
|
||||
end
|
||||
local managedcontact = {} -- #AWACS.ManagedContact
|
||||
@@ -6519,7 +6519,7 @@ end
|
||||
-- @param #string From
|
||||
-- @param #string Event
|
||||
-- @param #string To
|
||||
-- @param Ops.Intelligence#INTEL.Contact Contact
|
||||
-- @param Ops.Intel#INTEL.Contact Contact
|
||||
-- @return #AWACS self
|
||||
function AWACS:onafterNewContact(From,Event,To,Contact)
|
||||
self:T({From, Event, To, Contact})
|
||||
@@ -6548,7 +6548,7 @@ end
|
||||
-- @param #string From
|
||||
-- @param #string Event
|
||||
-- @param #string To
|
||||
-- @param Ops.Intelligence#INTEL.Contact Contact
|
||||
-- @param Ops.Intel#INTEL.Contact Contact
|
||||
-- @return #AWACS self
|
||||
function AWACS:onafterLostContact(From,Event,To,Contact)
|
||||
self:T({From, Event, To, Contact})
|
||||
@@ -6560,7 +6560,7 @@ end
|
||||
-- @param #string From
|
||||
-- @param #string Event
|
||||
-- @param #string To
|
||||
-- @param Ops.Intelligence#INTEL.Cluster Cluster
|
||||
-- @param Ops.Intel#INTEL.Cluster Cluster
|
||||
-- @param Ops.Auftrag#AUFTRAG Mission
|
||||
-- @return #AWACS self
|
||||
function AWACS:onafterLostCluster(From,Event,To,Cluster,Mission)
|
||||
@@ -6761,7 +6761,7 @@ function AWACS:onafterAwacsShiftChange(From,Event,To)
|
||||
self.AwacsTimeStamp = timer.getTime()
|
||||
|
||||
-- set up the AWACS and let it orbit
|
||||
local AwacsAW = self.AirWing -- Ops.AirWing#AIRWING
|
||||
local AwacsAW = self.AirWing -- Ops.Airwing#AIRWING
|
||||
local mission = AUFTRAG:NewORBIT_RACETRACK(self.OrbitZone:GetCoordinate(),self.AwacsAngels*1000,self.Speed,self.Heading,self.Leg)
|
||||
self.CatchAllMissions[#self.CatchAllMissions+1] = mission
|
||||
local timeonstation = (self.AwacsTimeOnStation + self.ShiftChangeTime) * 3600
|
||||
|
||||
@@ -702,7 +702,7 @@ function EASYGCICAP:_SetTankerPatrolPoints()
|
||||
self:T(self.lid.."_SetTankerPatrolPoints")
|
||||
for _,_data in pairs(self.ManagedTK) do
|
||||
local data = _data --#EASYGCICAP.CapPoint
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
local Coordinate = data.Coordinate
|
||||
local Altitude = data.Altitude
|
||||
local Speed = data.Speed
|
||||
@@ -721,7 +721,7 @@ function EASYGCICAP:_SetAwacsPatrolPoints()
|
||||
self:T(self.lid.."_SetAwacsPatrolPoints")
|
||||
for _,_data in pairs(self.ManagedEWR) do
|
||||
local data = _data --#EASYGCICAP.CapPoint
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
local Coordinate = data.Coordinate
|
||||
local Altitude = data.Altitude
|
||||
local Speed = data.Speed
|
||||
@@ -740,7 +740,7 @@ function EASYGCICAP:_SetCAPPatrolPoints()
|
||||
self:T(self.lid.."_SetCAPPatrolPoints")
|
||||
for _,_data in pairs(self.ManagedCP) do
|
||||
local data = _data --#EASYGCICAP.CapPoint
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
local Coordinate = data.Coordinate
|
||||
local Altitude = data.Altitude
|
||||
local Speed = data.Speed
|
||||
@@ -759,7 +759,7 @@ function EASYGCICAP:_SetReconPatrolPoints()
|
||||
self:T(self.lid.."_SetReconPatrolPoints")
|
||||
for _,_data in pairs(self.ManagedREC) do
|
||||
local data = _data --#EASYGCICAP.CapPoint
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local Wing = self.wings[data.AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
local Coordinate = data.Coordinate
|
||||
local Altitude = data.Altitude
|
||||
local Speed = data.Speed
|
||||
@@ -947,7 +947,7 @@ function EASYGCICAP:_AddSquadron(TemplateName, SquadName, AirbaseName, AirFrames
|
||||
Squadron_One:SetSkill(Skill or AI.Skill.AVERAGE)
|
||||
Squadron_One:SetMissionRange(self.missionrange)
|
||||
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
|
||||
wing:AddSquadron(Squadron_One)
|
||||
wing:NewPayload(TemplateName,-1,{AUFTRAG.Type.CAP, AUFTRAG.Type.GCICAP, AUFTRAG.Type.INTERCEPT, AUFTRAG.Type.PATROLRACETRACK, AUFTRAG.Type.ALERT5},75)
|
||||
@@ -978,7 +978,7 @@ function EASYGCICAP:_AddReconSquadron(TemplateName, SquadName, AirbaseName, AirF
|
||||
Squadron_One:SetSkill(Skill or AI.Skill.AVERAGE)
|
||||
Squadron_One:SetMissionRange(self.missionrange)
|
||||
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
|
||||
wing:AddSquadron(Squadron_One)
|
||||
wing:NewPayload(TemplateName,-1,{AUFTRAG.Type.RECON},75)
|
||||
@@ -1014,7 +1014,7 @@ function EASYGCICAP:_AddTankerSquadron(TemplateName, SquadName, AirbaseName, Air
|
||||
Squadron_One:SetRadio(Frequency,Modulation)
|
||||
Squadron_One:AddTacanChannel(TACAN,TACAN)
|
||||
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
|
||||
wing:AddSquadron(Squadron_One)
|
||||
wing:NewPayload(TemplateName,-1,{AUFTRAG.Type.TANKER},75)
|
||||
@@ -1047,7 +1047,7 @@ function EASYGCICAP:_AddAWACSSquadron(TemplateName, SquadName, AirbaseName, AirF
|
||||
Squadron_One:SetSkill(Skill or AI.Skill.AVERAGE)
|
||||
Squadron_One:SetMissionRange(self.missionrange)
|
||||
Squadron_One:SetRadio(Frequency,Modulation)
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.AirWing#AIRWING
|
||||
local wing = self.wings[AirbaseName][1] -- Ops.Airwing#AIRWING
|
||||
|
||||
wing:AddSquadron(Squadron_One)
|
||||
wing:NewPayload(TemplateName,-1,{AUFTRAG.Type.AWACS},75)
|
||||
@@ -1126,7 +1126,7 @@ end
|
||||
|
||||
--- Add a zone to the rejected zones set.
|
||||
-- @param #EASYGCICAP self
|
||||
-- @param Ops.Intelligence#INTEL.Cluster Cluster
|
||||
-- @param Ops.Intel#INTEL.Cluster Cluster
|
||||
-- @return #EASYGCICAP self
|
||||
function EASYGCICAP:_AssignIntercept(Cluster)
|
||||
-- Here, we'll decide if we need to launch an intercepting flight, and from where
|
||||
@@ -1151,7 +1151,7 @@ function EASYGCICAP:_AssignIntercept(Cluster)
|
||||
local position = self.Intel:CalcClusterFuturePosition(Cluster,300)
|
||||
-- calculate closest zone
|
||||
local bestdistance = 2000*1000 -- 2000km
|
||||
local targetairwing = nil -- Ops.AirWing#AIRWING
|
||||
local targetairwing = nil -- Ops.Airwing#AIRWING
|
||||
local targetawname = "" -- #string
|
||||
local clustersize = self.Intel:ClusterCountUnits(Cluster) or 1
|
||||
local wingsize = math.abs(overhead * (clustersize+1))
|
||||
@@ -1164,7 +1164,7 @@ function EASYGCICAP:_AssignIntercept(Cluster)
|
||||
if (retrymission) and (wingsize >= 1) then
|
||||
MESSAGE:New(string.format("**** %s Interceptors need wingsize %d", UTILS.GetCoalitionName(self.coalition), wingsize),15,"CAPGCI"):ToAllIf(self.debug):ToLog()
|
||||
for _,_data in pairs (wings) do
|
||||
local airwing = _data[1] -- Ops.AirWing#AIRWING
|
||||
local airwing = _data[1] -- Ops.Airwing#AIRWING
|
||||
local zone = _data[2] -- Core.Zone#ZONE
|
||||
local zonecoord = zone:GetCoordinate()
|
||||
local name = _data[3] -- #string
|
||||
@@ -1177,7 +1177,7 @@ function EASYGCICAP:_AssignIntercept(Cluster)
|
||||
end
|
||||
end
|
||||
for _,_data in pairs (ctlpts) do
|
||||
--local airwing = _data[1] -- Ops.AirWing#AIRWING
|
||||
--local airwing = _data[1] -- Ops.Airwing#AIRWING
|
||||
--local zone = _data[2] -- Core.Zone#ZONE
|
||||
--local zonecoord = zone:GetCoordinate()
|
||||
--local name = _data[3] -- #string
|
||||
@@ -1191,7 +1191,7 @@ function EASYGCICAP:_AssignIntercept(Cluster)
|
||||
local airframes = airwing:CountAssets(true)
|
||||
if distance < bestdistance and airframes >= wingsize then
|
||||
bestdistance = distance
|
||||
targetairwing = airwing -- Ops.AirWing#AIRWING
|
||||
targetairwing = airwing -- Ops.Airwing#AIRWING
|
||||
targetawname = name
|
||||
end
|
||||
end
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
-- @field #boolean fuelcritical Fuel critical switch.
|
||||
-- @field #number fuelcriticalthresh Critical fuel threshold in percent.
|
||||
-- @field #boolean fuelcriticalrtb RTB on critical fuel switch.
|
||||
-- @field Ops.FlightControl#FLIGHTCONTROL flightcontrol The flightcontrol handling this group.
|
||||
-- @field OPS.FlightControl#FLIGHTCONTROL flightcontrol The flightcontrol handling this group.
|
||||
-- @field Ops.Airboss#AIRBOSS airboss The airboss handling this group.
|
||||
-- @field Core.UserFlag#USERFLAG flaghold Flag for holding.
|
||||
-- @field #number Tholding Abs. mission time stamp when the group reached the holding point.
|
||||
@@ -54,7 +54,7 @@
|
||||
-- @field #boolean despawnAfterLanding If `true`, group is despawned after landed at an airbase.
|
||||
-- @field #boolean despawnAfterHolding If `true`, group is despawned after reaching the holding point.
|
||||
-- @field #number RTBRecallCount Number that counts RTB calls.
|
||||
-- @field Ops.FlightControl#FLIGHTCONTROL.HoldingStack stack Holding stack.
|
||||
-- @field OPS.FlightControl#FLIGHTCONTROL.HoldingStack stack Holding stack.
|
||||
-- @field #boolean isReadyTO Flight is ready for takeoff. This is for FLIGHTCONTROL.
|
||||
-- @field #boolean prohibitAB Disallow (true) or allow (false) AI to use the afterburner.
|
||||
-- @field #boolean jettisonEmptyTanks Allow (true) or disallow (false) AI to jettison empty fuel tanks.
|
||||
@@ -695,7 +695,7 @@ end
|
||||
|
||||
--- Get airwing the flight group belongs to.
|
||||
-- @param #FLIGHTGROUP self
|
||||
-- @return Ops.AirWing#AIRWING The AIRWING object (if any).
|
||||
-- @return Ops.Airwing#AIRWING The AIRWING object (if any).
|
||||
function FLIGHTGROUP:GetAirwing()
|
||||
return self.legion
|
||||
end
|
||||
@@ -793,7 +793,7 @@ end
|
||||
|
||||
--- Set the FLIGHTCONTROL controlling this flight group.
|
||||
-- @param #FLIGHTGROUP self
|
||||
-- @param Ops.FlightControl#FLIGHTCONTROL flightcontrol The FLIGHTCONTROL object.
|
||||
-- @param OPS.FlightControl#FLIGHTCONTROL flightcontrol The FLIGHTCONTROL object.
|
||||
-- @return #FLIGHTGROUP self
|
||||
function FLIGHTGROUP:SetFlightControl(flightcontrol)
|
||||
|
||||
@@ -822,7 +822,7 @@ end
|
||||
|
||||
--- Get the FLIGHTCONTROL controlling this flight group.
|
||||
-- @param #FLIGHTGROUP self
|
||||
-- @return Ops.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.
|
||||
-- @return OPS.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.
|
||||
function FLIGHTGROUP:GetFlightControl()
|
||||
return self.flightcontrol
|
||||
end
|
||||
@@ -4871,7 +4871,7 @@ function FLIGHTGROUP:_UpdateMenu(delay)
|
||||
-- Get all FLIGHTCONTROLS
|
||||
local fc={}
|
||||
for airbasename,_flightcontrol in pairs(_DATABASE.FLIGHTCONTROLS) do
|
||||
local flightcontrol=_flightcontrol --Ops.FlightControl#FLIGHTCONTROL
|
||||
local flightcontrol=_flightcontrol --OPS.FlightControl#FLIGHTCONTROL
|
||||
|
||||
-- Get coord of airbase.
|
||||
local coord=flightcontrol:GetCoordinate()
|
||||
|
||||
@@ -2272,7 +2272,7 @@ function INTEL:GetHighestThreatContact(Cluster)
|
||||
|
||||
for _,_contact in pairs(Cluster.Contacts) do
|
||||
|
||||
local contact=_contact --Ops.Intelligence#INTEL.Contact
|
||||
local contact=_contact --Ops.Intel#INTEL.Contact
|
||||
|
||||
if contact.threatlevel>threatlevel then
|
||||
threatlevel=contact.threatlevel
|
||||
@@ -2312,8 +2312,8 @@ end
|
||||
-- @field #string alias Alias name for logging.
|
||||
-- @field #number cachetime Number of seconds to keep an object.
|
||||
-- @field #number interval Number of seconds between collection runs.
|
||||
-- @field #table contacts Table of Ops.Intelligence#INTEL.Contact contacts.
|
||||
-- @field #table clusters Table of Ops.Intelligence#INTEL.Cluster clusters.
|
||||
-- @field #table contacts Table of Ops.Intel#INTEL.Contact contacts.
|
||||
-- @field #table clusters Table of Ops.Intel#INTEL.Cluster clusters.
|
||||
-- @field #table contactcoords Table of contacts' Core.Point#COORDINATE objects.
|
||||
-- @extends Core.Fsm#FSM
|
||||
|
||||
@@ -2337,7 +2337,7 @@ INTEL_DLINK.version = "0.0.1"
|
||||
|
||||
--- Function to instantiate a new object
|
||||
-- @param #INTEL_DLINK self
|
||||
-- @param #table Intels Table of Ops.Intelligence#INTEL objects.
|
||||
-- @param #table Intels Table of Ops.Intel#INTEL objects.
|
||||
-- @param #string Alias (optional) Name of this instance. Default "SPECTRE"
|
||||
-- @param #number Interval (optional) When to query #INTEL objects for detected items (default 20 seconds).
|
||||
-- @param #number Cachetime (optional) How long to cache detected items (default 300 seconds).
|
||||
@@ -2449,7 +2449,7 @@ end
|
||||
|
||||
--- Function to add an #INTEL object to the aggregator
|
||||
-- @param #INTEL_DLINK self
|
||||
-- @param Ops.Intelligence#INTEL Intel the #INTEL object to add
|
||||
-- @param Ops.Intel#INTEL Intel the #INTEL object to add
|
||||
-- @return #INTEL_DLINK self
|
||||
function INTEL_DLINK:AddIntel(Intel)
|
||||
self:T(self.lid .. "AddIntel")
|
||||
|
||||
@@ -3946,7 +3946,7 @@ function PLAYERTASKCONTROLLER:SetupIntel(RecceName)
|
||||
|
||||
local function NewCluster(Cluster)
|
||||
if not self.usecluster then return self end
|
||||
local cluster = Cluster -- Ops.Intelligence#INTEL.Cluster
|
||||
local cluster = Cluster -- Ops.Intel#INTEL.Cluster
|
||||
local type = cluster.ctype
|
||||
self:T({type,self.Type})
|
||||
if (type == INTEL.Ctype.AIRCRAFT and self.Type == PLAYERTASKCONTROLLER.Type.A2A) or (type == INTEL.Ctype.NAVAL and (self.Type == PLAYERTASKCONTROLLER.Type.A2S or self.Type == PLAYERTASKCONTROLLER.Type.A2GS)) then
|
||||
@@ -3954,7 +3954,7 @@ function PLAYERTASKCONTROLLER:SetupIntel(RecceName)
|
||||
local contacts = cluster.Contacts -- #table of GROUP
|
||||
local targetset = SET_GROUP:New()
|
||||
for _,_object in pairs(contacts) do
|
||||
local contact = _object -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = _object -- Ops.Intel#INTEL.Contact
|
||||
self:T("Adding group: "..contact.groupname)
|
||||
targetset:AddGroup(contact.group,true)
|
||||
end
|
||||
@@ -3966,14 +3966,14 @@ function PLAYERTASKCONTROLLER:SetupIntel(RecceName)
|
||||
if type == INTEL.Ctype.GROUND then
|
||||
targetset = SET_GROUP:New()
|
||||
for _,_object in pairs(contacts) do
|
||||
local contact = _object -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = _object -- Ops.Intel#INTEL.Contact
|
||||
self:T("Adding group: "..contact.groupname)
|
||||
targetset:AddGroup(contact.group,true)
|
||||
end
|
||||
elseif type == INTEL.Ctype.STRUCTURE then
|
||||
targetset = SET_STATIC:New()
|
||||
for _,_object in pairs(contacts) do
|
||||
local contact = _object -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = _object -- Ops.Intel#INTEL.Contact
|
||||
self:T("Adding static: "..contact.groupname)
|
||||
targetset:AddStatic(contact.group)
|
||||
end
|
||||
@@ -3986,7 +3986,7 @@ function PLAYERTASKCONTROLLER:SetupIntel(RecceName)
|
||||
|
||||
local function NewContact(Contact)
|
||||
if self.usecluster then return self end
|
||||
local contact = Contact -- Ops.Intelligence#INTEL.Contact
|
||||
local contact = Contact -- Ops.Intel#INTEL.Contact
|
||||
local type = contact.ctype
|
||||
self:T({type,self.Type})
|
||||
if (type == INTEL.Ctype.AIRCRAFT and self.Type == PLAYERTASKCONTROLLER.Type.A2A) or (type == INTEL.Ctype.NAVAL and (self.Type == PLAYERTASKCONTROLLER.Type.A2S or self.Type == PLAYERTASKCONTROLLER.Type.A2GS)) then
|
||||
|
||||
@@ -243,7 +243,7 @@ end
|
||||
|
||||
--- Set airwing.
|
||||
-- @param #SQUADRON self
|
||||
-- @param Ops.AirWing#AIRWING Airwing The airwing.
|
||||
-- @param Ops.Airwing#AIRWING Airwing The airwing.
|
||||
-- @return #SQUADRON self
|
||||
function SQUADRON:SetAirwing(Airwing)
|
||||
self.legion=Airwing
|
||||
@@ -252,7 +252,7 @@ end
|
||||
|
||||
--- Get airwing.
|
||||
-- @param #SQUADRON self
|
||||
-- @return Ops.AirWing#AIRWING The airwing.
|
||||
-- @return Ops.Airwing#AIRWING The airwing.
|
||||
function SQUADRON:GetAirwing(Airwing)
|
||||
return self.legion
|
||||
end
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
-- @field #number prio Priority.
|
||||
-- @field #number importance Importance.
|
||||
-- @field Ops.Auftrag#AUFTRAG mission Mission attached to this target.
|
||||
-- @field Ops.Intelligence#INTEL.Contact contact Contact attached to this target.
|
||||
-- @field Ops.Intel#INTEL.Contact contact Contact attached to this target.
|
||||
-- @field #boolean isDestroyed If true, target objects were destroyed.
|
||||
-- @field #table resources Resource list.
|
||||
-- @field #table conditionStart Start condition functions.
|
||||
|
||||
Reference in New Issue
Block a user