From d9d545845024c281897b7ac9ce130b2224fca0d1 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 23 May 2023 01:28:52 +0200 Subject: [PATCH] OPS **AUFTRAG** - New type `FAC` **OPSZONE** - Improved drawzone on capture --- Moose Development/Moose/Ops/Auftrag.lua | 11 +++++++---- Moose Development/Moose/Ops/OpsZone.lua | 13 +++++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index 09ee24a8a..4c6dd2d20 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -642,7 +642,7 @@ AUFTRAG.Category={ --- AUFTRAG class version. -- @field #string version -AUFTRAG.version="1.1.0" +AUFTRAG.version="1.2.0" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -1459,9 +1459,9 @@ function AUFTRAG:NewCASENHANCED(CasZone, Altitude, Speed, RangeMax, NoEngageZone return mission end ---- **[AIR]** Create a FAC mission. Group(s) will go to the zone and patrol it randomly and act as FAC for detected units. +--- **[AIR, GROUND]** Create a FAC mission. Group(s) will go to the zone and patrol it randomly and act as FAC for detected units. -- @param #AUFTRAG self --- @param Core.Zone#ZONE CasZone The CAS zone. +-- @param Core.Zone#ZONE FacZone The FAC zone (or name of zone) where to patrol. -- @param #number Speed Speed in knots. -- @param #number Altitude Altitude in feet. Only for airborne units. Default 2000 feet ASL. -- @param #number Frequency Frequency in MHz. @@ -1479,6 +1479,9 @@ function AUFTRAG:NewFAC(FacZone, Speed, Altitude, Frequency, Modulation) mission:_TargetFromObject(FacZone) mission.missionTask=mission:GetMissionTaskforMissionType(AUFTRAG.Type.FAC) + + mission.facFreq=Frequency or 133 + mission.facModu=Modulation or radio.modulation.AM mission.optionROE=ENUMS.ROE.ReturnFire mission.optionROT=ENUMS.ROT.EvadeFire @@ -1488,7 +1491,7 @@ function AUFTRAG:NewFAC(FacZone, Speed, Altitude, Frequency, Modulation) mission.missionSpeed=Speed and UTILS.KnotsToKmph(Speed) or nil mission.missionAltitude=Altitude and UTILS.FeetToMeters(Altitude) or nil - mission.categories={AUFTRAG.Category.AIRCRAFT} + mission.categories={AUFTRAG.Category.AIRCRAFT, AUFTRAG.Category.GROUND} mission.DCStask=mission:GetDCSMissionTask() diff --git a/Moose Development/Moose/Ops/OpsZone.lua b/Moose Development/Moose/Ops/OpsZone.lua index dd0d942dd..d7b134adf 100644 --- a/Moose Development/Moose/Ops/OpsZone.lua +++ b/Moose Development/Moose/Ops/OpsZone.lua @@ -95,7 +95,7 @@ OPSZONE.ZoneType={ --- OPSZONE class version. -- @field #string version -OPSZONE.version="0.5.0" +OPSZONE.version="0.6.0" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- ToDo list @@ -127,7 +127,7 @@ OPSZONE.version="0.5.0" -- function OPSZONE:New(Zone, CoalitionOwner) - -- Inherit everything from LEGION class. + -- Inherit everything from FSM class. local self=BASE:Inherit(self, FSM:New()) -- #OPSZONE -- Check if zone name instead of ZONE object was passed. @@ -817,6 +817,15 @@ function OPSZONE:onafterCaptured(From, Event, To, NewOwnerCoalition) -- Set owners. self.ownerPrevious=self.ownerCurrent self.ownerCurrent=NewOwnerCoalition + + if self.drawZone then + + self.zone:UndrawZone() + + local color=self:_GetZoneColor() + + self.zone:DrawZone(nil, color, 1.0, color, 0.5) + end for _,_chief in pairs(self.chiefs) do local chief=_chief --Ops.Chief#CHIEF