Merge branch 'develop' into FF/Ops

Moose Development/Moose/Ops/AirWing.lua

@@ -1239,6 +1239,26 @@ function AIRWING:GetTankerForFlight(flightgroup)
   return nil
 end
 
+--- Add the ability to call back an Ops.Awacs#AWACS object with an FSM call "FlightOnMission(FlightGroup, Mission)".
+-- @param #AIRWING self
+-- @param Ops.Awacs#AWACS ConnectecdAwacs
+-- @return #AIRWING self
+function AIRWING:SetUsingOpsAwacs(ConnectecdAwacs)
+  self:I(self.lid .. "Added AWACS Object: "..ConnectecdAwacs:GetName() or "unknown")
+  self.UseConnectedOpsAwacs = true
+  self.ConnectedOpsAwacs = ConnectecdAwacs
+  return self
+end
+
+--- Remove the ability to call back an Ops.Awacs#AWACS object with an FSM call "FlightOnMission(FlightGroup, Mission)".
+-- @param #AIRWING self
+-- @return #AIRWING self
+function AIRWING:RemoveUsingOpsAwacs()
+  self:I(self.lid .. "Reomve AWACS Object: "..self.ConnectedOpsAwacs:GetName() or "unknown")
+  self.UseConnectedOpsAwacs = false
+  return self
+end
+
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- FSM Events
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -1248,11 +1268,14 @@ end
 -- @param #string From From state.
 -- @param #string Event Event.
 -- @param #string To To state.
--- @param Ops.FlightGroup#FLIGHTGROUP ArmyGroup Ops army group on mission.
+-- @param Ops.FlightGroup#FLIGHTGROUP FlightGroup Ops flight group on mission.
 -- @param Ops.Auftrag#AUFTRAG Mission The requested mission.
 function AIRWING:onafterFlightOnMission(From, Event, To, FlightGroup, Mission)
   -- Debug info.
-  self:T(self.lid..string.format("Group %s on %s mission %s", FlightGroup:GetName(), Mission:GetType(), Mission:GetName()))  
+  self:T(self.lid..string.format("Group %s on %s mission %s", FlightGroup:GetName(), Mission:GetType(), Mission:GetName()))
+  if self.UseConnectedOpsAwacs and self.ConnectedOpsAwacs then
+    self.ConnectedOpsAwacs:__FlightOnMission(2,FlightGroup,Mission)
+  end  
 end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Ops/Auftrag.lua

@@ -2031,15 +2031,16 @@ function AUFTRAG:NewNOTHING()
 
   --mission:_TargetFromObject(Coordinate)
 
-  mission.optionROE=ENUMS.ROE.ReturnFire
-  mission.optionAlarm=ENUMS.AlarmState.Auto
+  mission.optionROE=ENUMS.ROE.WeaponHold
+  mission.optionAlarm=ENUMS.AlarmState.Green
 
   mission.missionFraction=1.0
 
   mission.categories={AUFTRAG.Category.ALL}
 
   mission.DCStask=mission:GetDCSMissionTask()
-
+  mission.DCStask.params.adinfinitum=true
+    
   return mission
 end
 
@@ -5403,8 +5404,25 @@ function AUFTRAG:GetDCSMissionTask(TaskControllable)
     DCStask.params=param
 
     table.insert(DCStasks, DCStask)
+ 
+   elseif self.type==AUFTRAG.Type.NOTHING then
 
-    elseif self.type==AUFTRAG.Type.HOVER then
+    ---------------------
+    -- NOTHING Mission --
+    ---------------------
+
+    local DCStask={}
+
+    DCStask.id=AUFTRAG.SpecialTask.NOTHING
+
+    -- We create a "fake" DCS task and pass the parameters to the OPSGROUP.
+    local param={}
+
+    DCStask.params=param
+
+    table.insert(DCStasks, DCStask)   
+
+  elseif self.type==AUFTRAG.Type.HOVER then
 
     ---------------------
     -- HOVER Mission --

Moose Development/Moose/Ops/OpsGroup.lua

@@ -1956,7 +1956,7 @@ function OPSGROUP:RadioTransmission(Text, Delay, SayCallsign)
       end
 
       -- Debug info.
-      self:I(self.lid..string.format("Radio transmission on %.3f MHz %s: %s", freq, UTILS.GetModulationName(modu), Text))
+      self:T(self.lid..string.format("Radio transmission on %.3f MHz %s: %s", freq, UTILS.GetModulationName(modu), Text))
 
       self.msrs:PlayText(Text)
     end