Optimizations

Moose Development/Moose/AI/AI_A2G_BAI.lua

@@ -40,20 +40,6 @@ function AI_A2G_BAI:New( AIGroup, EngageMinSpeed, EngageMaxSpeed )
   return self
 end
 
---- onafter event handler for Start event.
--- @param #AI_A2G_BAI self
--- @param Wrapper.Group#GROUP AIGroup The AI group managed by the FSM.
--- @param #string From The From State string.
--- @param #string Event The Event string.
--- @param #string To The To State string.
-function AI_A2G_BAI:onafterStart( AIGroup, From, Event, To )
-
-  self:GetParent( self ).onafterStart( self, AIGroup, From, Event, To )
-  AIGroup:HandleEvent( EVENTS.Takeoff, nil, self )
-
-end
-
-
 
 --- @param #AI_A2G_BAI self
 -- @param Wrapper.Group#GROUP DefenderGroup The GroupGroup managed by the FSM.
@@ -83,86 +69,64 @@ function AI_A2G_BAI:onafterEngage( DefenderGroup, From, Event, To, AttackSetUnit
       
       local TargetDistance = DefenderCoord:Get2DDistance( TargetCoord )
       
-      if TargetDistance >= 50000 then
+      local EngageRoute = {}
 
-        local EngageRoute = {}
+      local ToTargetSpeed = math.random( self.EngageMinSpeed, self.EngageMaxSpeed )
       
-        local ToTargetSpeed = math.random( self.EngageMinSpeed, self.EngageMaxSpeed )
+      --- Calculate the target route point.
       
-        --- Calculate the target route point.
+      local FromWP = DefenderCoord:WaypointAir( 
+        self.PatrolAltType, 
+        POINT_VEC3.RoutePointType.TurningPoint, 
+        POINT_VEC3.RoutePointAction.TurningPoint, 
+        ToTargetSpeed, 
+        true 
+      )
       
-        local FromWP = DefenderCoord:WaypointAir( 
-          self.PatrolAltType, 
-          POINT_VEC3.RoutePointType.TurningPoint, 
-          POINT_VEC3.RoutePointAction.TurningPoint, 
-          ToTargetSpeed, 
-          true 
-        )
+      EngageRoute[#EngageRoute+1] = FromWP
 
-        EngageRoute[#EngageRoute+1] = FromWP
+      local ToCoord = self.AttackSetUnit:GetFirst():GetCoordinate()
+      self:SetTargetDistance( ToCoord ) -- For RTB status check
       
-        local ToCoord = self.AttackSetUnit:GetFirst():GetCoordinate()
-        self:SetTargetDistance( ToCoord ) -- For RTB status check
+      local FromEngageAngle = ToCoord:GetAngleDegrees( ToCoord:GetDirectionVec3( DefenderCoord ) )
       
-        local FromEngageAngle = ToCoord:GetAngleDegrees( ToCoord:GetDirectionVec3( DefenderCoord ) )
+      --- Create a route point of type air.
+      local ToWP = ToCoord:Translate( 10000, FromEngageAngle ):WaypointAir( 
+        self.PatrolAltType, 
+        POINT_VEC3.RoutePointType.TurningPoint, 
+        POINT_VEC3.RoutePointAction.TurningPoint, 
+        ToTargetSpeed, 
+        true 
+      )
   
-        --- Create a route point of type air.
-        local ToWP = ToCoord:Translate( 50000, FromEngageAngle ):WaypointAir( 
-          self.PatrolAltType, 
-          POINT_VEC3.RoutePointType.TurningPoint, 
-          POINT_VEC3.RoutePointAction.TurningPoint, 
-          ToTargetSpeed, 
-          true 
-        )
+      self:F( { Angle = FromEngageAngle, ToTargetSpeed = ToTargetSpeed } )
+      self:F( { self.EngageMinSpeed, self.EngageMaxSpeed, ToTargetSpeed } )
       
-        self:F( { Angle = FromEngageAngle, ToTargetSpeed = ToTargetSpeed } )
-        self:F( { self.EngageMinSpeed, self.EngageMaxSpeed, ToTargetSpeed } )
+      EngageRoute[#EngageRoute+1] = ToWP
       
-        EngageRoute[#EngageRoute+1] = ToWP
+      local AttackTasks = {}
   
-        local AttackTasks = {}
-    
-        for AttackUnitID, AttackUnit in pairs( self.AttackSetUnit:GetSet() ) do
-          if AttackUnit:IsAlive() and AttackUnit:IsGround() then
-            self:T( { "Engage Unit evaluation:", AttackUnit:GetName(), AttackUnit:IsAlive(), AttackUnit:IsGround() } )
-            local HasRadar = AttackUnit:HasSEAD() 
-            if HasRadar then
-              self:T( { "Eliminating Unit:", AttackUnit:GetName() } )
-              AttackTasks[#AttackTasks+1] = DefenderGroup:TaskAttackUnit( AttackUnit )
-            end
-          end
+      for AttackUnitID, AttackUnit in pairs( self.AttackSetUnit:GetSet() ) do
+        if AttackUnit:IsAlive() and AttackUnit:IsGround() then
+          self:T( { "Engage Unit evaluation:", AttackUnit:GetName(), AttackUnit:IsAlive(), AttackUnit:IsGround() } )
+          self:T( { "Eliminating Unit:", AttackUnit:GetName() } )
+          AttackTasks[#AttackTasks+1] = DefenderGroup:TaskAttackUnit( AttackUnit )
         end
-          
-        if #AttackTasks == 0 then
-          self:E( DefenderGroupName .. ": No targets found -> Going RTB")
-          self:Return()
-          self:__RTB( 0.5 )
-        else
-          DefenderGroup:OptionROEOpenFire()
-          DefenderGroup:OptionROTEvadeFire()
-  
-          AttackTasks[#AttackTasks+1] = DefenderGroup:TaskFunction( "AI_A2G_ENGAGE.EngageRoute", self )
-          EngageRoute[#EngageRoute].task = DefenderGroup:TaskCombo( AttackTasks )
-        end
-        
-        DefenderGroup:Route( EngageRoute, 0 )
-      
-      else
-        local AttackTasks = {}
-        --local AttackUnit = self.AttackSetUnit:GetRandom() -- Wrapper.Unit#UNIT
-        for AttackUnitID, AttackUnit in pairs( self.AttackSetUnit:GetSet() ) do
-          if AttackUnit:IsAlive() and AttackUnit:IsGround() then
-            local HasRadar = AttackUnit:HasSEAD() 
-            if HasRadar then
-              self:T( { "Eliminating Unit:", AttackUnit:GetName(), AttackUnit:IsAlive(), AttackUnit:IsGround() } )
-              AttackTasks[#AttackTasks+1] = DefenderGroup:TaskAttackUnit( AttackUnit )
-            end
-          end
-        end
-        AttackTasks[#AttackTasks+1] = DefenderGroup:TaskFunction( "AI_A2G_ENGAGE.EngageRoute", self )
-        local DefenderTask = DefenderGroup:TaskCombo( AttackTasks )
-        DefenderGroup:SetTask( DefenderTask, 0 )
       end
+        
+      if #AttackTasks == 0 then
+        self:E( DefenderGroupName .. ": No targets found -> Going RTB")
+        self:Return()
+        self:__RTB( 0.5 )
+      else
+        DefenderGroup:OptionROEOpenFire()
+        DefenderGroup:OptionROTEvadeFire()
+
+        AttackTasks[#AttackTasks+1] = DefenderGroup:TaskFunction( "AI_A2G_ENGAGE.EngageRoute", self )
+        EngageRoute[#EngageRoute].task = DefenderGroup:TaskCombo( AttackTasks )
+      end
+      
+      DefenderGroup:Route( EngageRoute, 0.5 )
     end
   else
     self:E( DefenderGroupName .. ": No targets found -> Going RTB")

Moose Development/Moose/AI/AI_A2G_CAS.lua

@@ -40,20 +40,6 @@ function AI_A2G_CAS:New( AIGroup, EngageMinSpeed, EngageMaxSpeed )
   return self
 end
 
---- onafter event handler for Start event.
--- @param #AI_A2G_CAS self
--- @param Wrapper.Group#GROUP AIGroup The AI group managed by the FSM.
--- @param #string From The From State string.
--- @param #string Event The Event string.
--- @param #string To The To State string.
-function AI_A2G_CAS:onafterStart( AIGroup, From, Event, To )
-
-  self:GetParent( self ).onafterStart( self, AIGroup, From, Event, To )
-  AIGroup:HandleEvent( EVENTS.Takeoff, nil, self )
-
-end
-
-
 
 --- @param #AI_A2G_CAS self
 -- @param Wrapper.Group#GROUP DefenderGroup The GroupGroup managed by the FSM.
@@ -83,86 +69,63 @@ function AI_A2G_CAS:onafterEngage( DefenderGroup, From, Event, To, AttackSetUnit
       
       local TargetDistance = DefenderCoord:Get2DDistance( TargetCoord )
       
-      if TargetDistance >= 50000 then
+      local EngageRoute = {}
 
-        local EngageRoute = {}
+      local ToTargetSpeed = math.random( self.EngageMinSpeed, self.EngageMaxSpeed )
       
-        local ToTargetSpeed = math.random( self.EngageMinSpeed, self.EngageMaxSpeed )
+      --- Calculate the target route point.
       
-        --- Calculate the target route point.
+      local FromWP = DefenderCoord:WaypointAir( 
+        self.PatrolAltType, 
+        POINT_VEC3.RoutePointType.TurningPoint, 
+        POINT_VEC3.RoutePointAction.TurningPoint, 
+        ToTargetSpeed, 
+        true 
+      )
       
-        local FromWP = DefenderCoord:WaypointAir( 
-          self.PatrolAltType, 
-          POINT_VEC3.RoutePointType.TurningPoint, 
-          POINT_VEC3.RoutePointAction.TurningPoint, 
-          ToTargetSpeed, 
-          true 
-        )
+      EngageRoute[#EngageRoute+1] = FromWP
 
-        EngageRoute[#EngageRoute+1] = FromWP
+      local ToCoord = self.AttackSetUnit:GetFirst():GetCoordinate()
+      self:SetTargetDistance( ToCoord ) -- For RTB status check
       
-        local ToCoord = self.AttackSetUnit:GetFirst():GetCoordinate()
-        self:SetTargetDistance( ToCoord ) -- For RTB status check
+      local FromEngageAngle = ToCoord:GetAngleDegrees( ToCoord:GetDirectionVec3( DefenderCoord ) )
       
-        local FromEngageAngle = ToCoord:GetAngleDegrees( ToCoord:GetDirectionVec3( DefenderCoord ) )
+      --- Create a route point of type air.
+      local ToWP = ToCoord:Translate( 10000, FromEngageAngle ):WaypointAir( 
+        self.PatrolAltType, 
+        POINT_VEC3.RoutePointType.TurningPoint, 
+        POINT_VEC3.RoutePointAction.TurningPoint, 
+        ToTargetSpeed, 
+        true 
+      )
   
-        --- Create a route point of type air.
-        local ToWP = ToCoord:Translate( 50000, FromEngageAngle ):WaypointAir( 
-          self.PatrolAltType, 
-          POINT_VEC3.RoutePointType.TurningPoint, 
-          POINT_VEC3.RoutePointAction.TurningPoint, 
-          ToTargetSpeed, 
-          true 
-        )
+      self:F( { Angle = FromEngageAngle, ToTargetSpeed = ToTargetSpeed } )
+      self:F( { self.EngageMinSpeed, self.EngageMaxSpeed, ToTargetSpeed } )
       
-        self:F( { Angle = FromEngageAngle, ToTargetSpeed = ToTargetSpeed } )
-        self:F( { self.EngageMinSpeed, self.EngageMaxSpeed, ToTargetSpeed } )
+      EngageRoute[#EngageRoute+1] = ToWP
       
-        EngageRoute[#EngageRoute+1] = ToWP
+      local AttackTasks = {}
   
-        local AttackTasks = {}
-    
-        for AttackUnitID, AttackUnit in pairs( self.AttackSetUnit:GetSet() ) do
-          if AttackUnit:IsAlive() and AttackUnit:IsGround() then
-            self:T( { "Engage Unit evaluation:", AttackUnit:GetName(), AttackUnit:IsAlive(), AttackUnit:IsGround() } )
-            local HasRadar = AttackUnit:HasSEAD() 
-            if HasRadar then
-              self:T( { "Eliminating Unit:", AttackUnit:GetName() } )
-              AttackTasks[#AttackTasks+1] = DefenderGroup:TaskAttackUnit( AttackUnit )
-            end
-          end
+      for AttackUnitID, AttackUnit in pairs( self.AttackSetUnit:GetSet() ) do
+        if AttackUnit:IsAlive() and AttackUnit:IsGround() then
+          self:T( { "Eliminating Unit:", AttackUnit:GetName() } )
+          AttackTasks[#AttackTasks+1] = DefenderGroup:TaskAttackUnit( AttackUnit )
         end
-          
-        if #AttackTasks == 0 then
-          self:E( DefenderGroupName .. ": No targets found -> Going RTB")
-          self:Return()
-          self:__RTB( 0.5 )
-        else
-          DefenderGroup:OptionROEOpenFire()
-          DefenderGroup:OptionROTEvadeFire()
-  
-          AttackTasks[#AttackTasks+1] = DefenderGroup:TaskFunction( "AI_A2G_ENGAGE.EngageRoute", self )
-          EngageRoute[#EngageRoute].task = DefenderGroup:TaskCombo( AttackTasks )
-        end
-        
-        DefenderGroup:Route( EngageRoute, 0 )
-      
-      else
-        local AttackTasks = {}
-        --local AttackUnit = self.AttackSetUnit:GetRandom() -- Wrapper.Unit#UNIT
-        for AttackUnitID, AttackUnit in pairs( self.AttackSetUnit:GetSet() ) do
-          if AttackUnit:IsAlive() and AttackUnit:IsGround() then
-            local HasRadar = AttackUnit:HasSEAD() 
-            if HasRadar then
-              self:T( { "Eliminating Unit:", AttackUnit:GetName(), AttackUnit:IsAlive(), AttackUnit:IsGround() } )
-              AttackTasks[#AttackTasks+1] = DefenderGroup:TaskAttackUnit( AttackUnit )
-            end
-          end
-        end
-        AttackTasks[#AttackTasks+1] = DefenderGroup:TaskFunction( "AI_A2G_ENGAGE.EngageRoute", self )
-        local DefenderTask = DefenderGroup:TaskCombo( AttackTasks )
-        DefenderGroup:SetTask( DefenderTask, 0 )
       end
+        
+      if #AttackTasks == 0 then
+        self:E( DefenderGroupName .. ": No targets found -> Going RTB")
+        self:Return()
+        self:__RTB( 0.5 )
+      else
+        DefenderGroup:OptionROEOpenFire()
+        DefenderGroup:OptionROTEvadeFire()
+
+        AttackTasks[#AttackTasks+1] = DefenderGroup:TaskFunction( "AI_A2G_ENGAGE.EngageRoute", self )
+        EngageRoute[#EngageRoute].task = DefenderGroup:TaskCombo( AttackTasks )
+      end
+      
+      DefenderGroup:Route( EngageRoute, 0.5 )
     end
   else
     self:E( DefenderGroupName .. ": No targets found -> Going RTB")

Moose Development/Moose/AI/AI_A2G_Dispatcher.lua

@@ -3175,7 +3175,7 @@ do -- AI_A2G_DISPATCHER
                     if Dispatcher:GetSquadronLanding( Squadron.Name ) == AI_A2G_DISPATCHER.Landing.NearAirbase then
                       Dispatcher:RemoveDefenderFromSquadron( Squadron, Defender )
                       Defender:Destroy()
-                      self:ParkDefender( Squadron, Defender )
+                      Dispatcher:ParkDefender( Squadron, Defender )
                     end
                   end
                 end  -- if DefenderGCI then
@@ -3311,6 +3311,9 @@ do -- AI_A2G_DISPATCHER
     for DefenderGroup, DefenderTask in pairs( self:GetDefenderTasks() ) do
       local DefenderGroup = DefenderGroup -- Wrapper.Group#GROUP
       local DefenderTaskFsm = self:GetDefenderTaskFsm( DefenderGroup )
+      if DefenderTaskFsm:Is( "LostControl" ) then
+        self:ClearDefenderTask( DefenderGroup )
+      end
       if not DefenderGroup:IsAlive() then
         self:F( { Defender = DefenderGroup:GetName(), DefenderState = DefenderTaskFsm:GetState() } )
         if not DefenderTaskFsm:Is( "Started" ) then

Moose Development/Moose/AI/AI_Air.lua

@@ -425,7 +425,6 @@ function AI_AIR:onafterStatus()
     
     if not self:Is( "Holding" ) and not self:Is( "Returning" ) then
       local DistanceFromHomeBase = self.HomeAirbase:GetCoordinate():Get2DDistance( self.Controllable:GetCoordinate() )
-      self:F({DistanceFromHomeBase=DistanceFromHomeBase})
       
       if DistanceFromHomeBase > self.DisengageRadius then
         self:E( self.Controllable:GetName() .. " is too far from home base, RTB!" )
@@ -444,9 +443,13 @@ function AI_AIR:onafterStatus()
     
 
     if not self:Is( "Fuel" ) and not self:Is( "Home" ) then
+      
       local Fuel = self.Controllable:GetFuelMin()
-      self:F({Fuel=Fuel, FuelThresholdPercentage=self.FuelThresholdPercentage})
+      
+      -- If the fuel in the controllable is below the treshold percentage,
+      -- then send for refuel in case of a tanker, otherwise RTB.
       if Fuel < self.FuelThresholdPercentage then
+      
         if self.TankerName then
           self:E( self.Controllable:GetName() .. " is out of fuel: " .. Fuel .. " ... Refuelling at Tanker!" )
           self:Refuel()
@@ -468,7 +471,10 @@ function AI_AIR:onafterStatus()
     -- TODO: Check GROUP damage function.
     local Damage = self.Controllable:GetLife()
     local InitialLife = self.Controllable:GetLife0()
-    self:F( { Damage = Damage, InitialLife = InitialLife, DamageThreshold = self.PatrolDamageThreshold } )
+    
+    -- If the group is damaged, then RTB.
+    -- Note that a group can consist of more units, so if one unit is damaged of a group, the mission may continue.
+    -- The damaged unit will RTB due to DCS logic, and the others will continue to engage.
     if ( Damage / InitialLife ) < self.PatrolDamageThreshold then
       self:E( self.Controllable:GetName() .. " is damaged: " .. Damage .. " ... RTB!" )
       self:Damaged()
@@ -489,6 +495,7 @@ function AI_AIR:onafterStatus()
             self:Damaged()
           else  
             self:E( self.Controllable:GetName() .. " control lost! " )
+            
             self:LostControl()
           end
         else

Moose Development/Moose/Wrapper/Group.lua

@@ -934,7 +934,7 @@ end
 -- @return #number The fuel state of the unit with the least amount of fuel
 -- @return #Unit reference to #Unit object for further processing
 function GROUP:GetFuelMin()
-  self:F(self.ControllableName)
+  self:F3(self.ControllableName)
 
   if not self:GetDCSObject() then
     BASE:E( { "Cannot GetFuel", Group = self, Alive = self:IsAlive() } )

Moose Development/Moose/Wrapper/Unit.lua

@@ -555,7 +555,7 @@ end
 -- @return #number The relative amount of fuel (from 0.0 to 1.0).
 -- @return #nil The DCS Unit is not existing or alive.  
 function UNIT:GetFuel()
-  self:F( self.UnitName )
+  self:F3( self.UnitName )
 
   local DCSUnit = self:GetDCSObject()
   
@@ -571,7 +571,7 @@ end
 -- @param #UNIT self
 -- @return #list<Wrapper.Unit#UNIT> A list of one @{Wrapper.Unit}.
 function UNIT:GetUnits()
-  self:F2( { self.UnitName } )
+  self:F3( { self.UnitName } )
   local DCSUnit = self:GetDCSObject()
 
   local Units = {}