Merge pull request #6 from FlightControl-Master/master

Merge latest FlightControl-Master changes

Moose Development/Moose/AI/AI_CAP.lua

@@ -374,7 +374,7 @@ function AI_CAP_ZONE:onafterDetected( Controllable, From, Event, To )
   
     local Engage = false
   
-    for DetectedUnitID, DetectedUnit in pairs( self.DetectedUnits ) do
+    for DetectedUnit, Detected in pairs( self.DetectedUnits ) do
     
       local DetectedUnit = DetectedUnit -- Wrapper.Unit#UNIT
       self:T( DetectedUnit )
@@ -450,7 +450,7 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
 
     local AttackTasks = {}
 
-    for DetectedUnitID, DetectedUnit in pairs( self.DetectedUnits ) do
+    for DetectedUnit, Detected in pairs( self.DetectedUnits ) do
       local DetectedUnit = DetectedUnit -- Wrapper.Unit#UNIT
       self:T( { DetectedUnit, DetectedUnit:IsAlive(), DetectedUnit:IsAir() } )
       if DetectedUnit:IsAlive() and DetectedUnit:IsAir() then

Moose Development/Moose/AI/AI_Patrol.lua

@@ -405,9 +405,9 @@ function AI_PATROL_ZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltit
 
   self:AddTransition( "*", "Reset", "Patrolling" ) -- FSM_CONTROLLABLE Transition for type #AI_PATROL_ZONE.
   
-  self:AddTransition( "*", "Eject", "Ejected" )
+  self:AddTransition( "*", "Eject", "*" )
   self:AddTransition( "*", "Crash", "Crashed" )
-  self:AddTransition( "*", "PilotDead", "PilotDead" )
+  self:AddTransition( "*", "PilotDead", "*" )
   
   return self
 end
@@ -865,7 +865,10 @@ end
 function AI_PATROL_ZONE:OnCrash( EventData )
 
   if self.Controllable:IsAlive() and EventData.IniDCSGroupName == self.Controllable:GetName() then
-    self:__Crash( 1, EventData )
+    self:E( self.Controllable:GetUnits() )
+    if #self.Controllable:GetUnits() == 1 then
+      self:__Crash( 1, EventData )
+    end
   end
 end
 

Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua

@@ -1,5 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-env.info( 'Moose Generation Timestamp: 20170207_2151' ) 
+env.info( 'Moose Generation Timestamp: 20170208_1506' ) 
 local base = _G
 
 Include = {}
@@ -25364,9 +25364,9 @@ function AI_PATROL_ZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltit
 
   self:AddTransition( "*", "Reset", "Patrolling" ) -- FSM_CONTROLLABLE Transition for type #AI_PATROL_ZONE.
   
-  self:AddTransition( "*", "Eject", "Ejected" )
+  self:AddTransition( "*", "Eject", "*" )
   self:AddTransition( "*", "Crash", "Crashed" )
-  self:AddTransition( "*", "PilotDead", "PilotDead" )
+  self:AddTransition( "*", "PilotDead", "*" )
   
   return self
 end
@@ -25824,7 +25824,10 @@ end
 function AI_PATROL_ZONE:OnCrash( EventData )
 
   if self.Controllable:IsAlive() and EventData.IniDCSGroupName == self.Controllable:GetName() then
-    self:__Crash( 1, EventData )
+    self:E( self.Controllable:GetUnits() )
+    if #self.Controllable:GetUnits() == 1 then
+      self:__Crash( 1, EventData )
+    end
   end
 end
 
@@ -26793,7 +26796,7 @@ function AI_CAP_ZONE:onafterDetected( Controllable, From, Event, To )
   
     local Engage = false
   
-    for DetectedUnitID, DetectedUnit in pairs( self.DetectedUnits ) do
+    for DetectedUnit, Detected in pairs( self.DetectedUnits ) do
     
       local DetectedUnit = DetectedUnit -- Wrapper.Unit#UNIT
       self:T( DetectedUnit )
@@ -26869,7 +26872,7 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
 
     local AttackTasks = {}
 
-    for DetectedUnitID, DetectedUnit in pairs( self.DetectedUnits ) do
+    for DetectedUnit, Detected in pairs( self.DetectedUnits ) do
       local DetectedUnit = DetectedUnit -- Wrapper.Unit#UNIT
       self:T( { DetectedUnit, DetectedUnit:IsAlive(), DetectedUnit:IsAir() } )
       if DetectedUnit:IsAlive() and DetectedUnit:IsAir() then

Moose Mission Setup/Moose.lua

@@ -1,5 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-env.info( 'Moose Generation Timestamp: 20170207_2151' ) 
+env.info( 'Moose Generation Timestamp: 20170208_1506' ) 
 local base = _G
 
 Include = {}
@@ -25364,9 +25364,9 @@ function AI_PATROL_ZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltit
 
   self:AddTransition( "*", "Reset", "Patrolling" ) -- FSM_CONTROLLABLE Transition for type #AI_PATROL_ZONE.
   
-  self:AddTransition( "*", "Eject", "Ejected" )
+  self:AddTransition( "*", "Eject", "*" )
   self:AddTransition( "*", "Crash", "Crashed" )
-  self:AddTransition( "*", "PilotDead", "PilotDead" )
+  self:AddTransition( "*", "PilotDead", "*" )
   
   return self
 end
@@ -25824,7 +25824,10 @@ end
 function AI_PATROL_ZONE:OnCrash( EventData )
 
   if self.Controllable:IsAlive() and EventData.IniDCSGroupName == self.Controllable:GetName() then
-    self:__Crash( 1, EventData )
+    self:E( self.Controllable:GetUnits() )
+    if #self.Controllable:GetUnits() == 1 then
+      self:__Crash( 1, EventData )
+    end
   end
 end
 
@@ -26793,7 +26796,7 @@ function AI_CAP_ZONE:onafterDetected( Controllable, From, Event, To )
   
     local Engage = false
   
-    for DetectedUnitID, DetectedUnit in pairs( self.DetectedUnits ) do
+    for DetectedUnit, Detected in pairs( self.DetectedUnits ) do
     
       local DetectedUnit = DetectedUnit -- Wrapper.Unit#UNIT
       self:T( DetectedUnit )
@@ -26869,7 +26872,7 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
 
     local AttackTasks = {}
 
-    for DetectedUnitID, DetectedUnit in pairs( self.DetectedUnits ) do
+    for DetectedUnit, Detected in pairs( self.DetectedUnits ) do
       local DetectedUnit = DetectedUnit -- Wrapper.Unit#UNIT
       self:T( { DetectedUnit, DetectedUnit:IsAlive(), DetectedUnit:IsAir() } )
       if DetectedUnit:IsAlive() and DetectedUnit:IsAir() then