Merge

Moose Development/Moose/Ops/Airboss.lua

@@ -5996,7 +5996,7 @@ function AIRBOSS:_ScanCarrierZone()
         local awacs2marshal  = isawacs  and self.awacs:IsReturning()  and self.awacs.airbase:GetName()==self.airbase:GetName()  and knownflight.flag==-100 and self.awacs.recovery==true
 
         -- Put flight into Marshal.
-        local putintomarshal=closein>UTILS.NMToMeters(5) and knownflight.flag==-100 and iscarriersquad and istanker==false and isawacs==false
+        local putintomarshal=closein>UTILS.NMToMeters(5) and knownflight.flag==-100 and iscarriersquad and (not istanker) and (not isawacs)
 
         -- Send AI flight to marshal stack if group closes in more than 5 and has initial flag value.
         if putintomarshal or tanker2marshal or awacs2marshal then
@@ -12760,7 +12760,7 @@ function AIRBOSS:_Debrief(playerData)
   table.insert(self.playerscores[playerData.name], mygrade)
 
   -- Trigger grading event.
-  self:LSOGrade(playerdata, mygrade)
+  self:LSOGrade(playerData, mygrade)
 
   -- LSO grade: (OK) 3.0 PT - LURIM
   local text=string.format("%s %.1f PT - %s", grade, Points, analysis)

Moose Development/Moose/Ops/RecoveryTanker.lua

@@ -418,6 +418,13 @@ function RECOVERYTANKER:New(carrierunit, tankergroupname)
   -- @param #RECOVERYTANKER self
   -- @param #number delay Delay in seconds.
 
+  --- On after "Start" event function. Called when FSM is started.
+  -- @function [parent=#RECOVERYTANKER] OnAfterStart
+  -- @param #RECOVERYTANKER self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+
 
   --- Triggers the FSM event "RefuelStart" when the tanker starts refueling another aircraft.
   -- @function [parent=#RECOVERYTANKER] RefuelStart

Moose Development/Moose/Ops/RescueHelo.lua

@@ -346,6 +346,12 @@ function RESCUEHELO:New(carrierunit, helogroupname)
   -- @param #RESCUEHELO self
   -- @param #number delay Delay in seconds.
 
+  --- On after "Start" event function. Called when FSM is started.
+  -- @function [parent=#RESCUEHELO] OnAfterStart
+  -- @param #RECOVERYTANKER self
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
 
   --- Triggers the FSM event "Rescue" that sends the helo on a rescue mission to a specifc coordinate.
   -- @function [parent=#RESCUEHELO] Rescue