NAVYGROUP

Improved dead/stop

Moose Development/Moose/Ops/NavyGroup.lua

@@ -314,12 +314,15 @@ end
 -- Status
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
---- Update status.
+---- Update status.
 -- @param #NAVYGROUP self
 function NAVYGROUP:onbeforeStatus(From, Event, To)
 
-  if self:IsDead() or self:IsStopped() or self:IsAlive()==nil then
+  if self:IsDead() then  
-    self:I(self.lid..string.format("Onbefore Status ==> false"))
+    self:I(self.lid..string.format("Onbefore Status DEAD ==> false"))
+    return false   
+  elseif self:IsStopped() then
+    self:I(self.lid..string.format("Onbefore Status STOPPED ==> false"))
     return false
   end
 
@@ -342,38 +345,47 @@ function NAVYGROUP:onafterStatus(From, Event, To)
     self:_CheckDetectedUnits()
   end
   
+  if self:IsAlive() and not self:IsDead() then
 
-  -- Current heading and position of the carrier.
+    -- Current heading and position of the carrier.
-  local hdg=self:GetHeading()
+    local hdg=self:GetHeading()
-  local pos=self:GetCoordinate()
+    local pos=self:GetCoordinate()
-  local speed=self.group:GetVelocityKNOTS()
+    local speed=self.group:GetVelocityKNOTS()
     
-  -- Check if group started or stopped turning.
+    -- Check if group started or stopped turning.
-  self:_CheckTurning()
+    self:_CheckTurning()
     
-  -- Check water is ahead.
+    -- Check water is ahead.
-  local collision=self:_CheckCollisionCoord(pos:Translate(self.collisiondist or 5000, hdg))
+    local collision=self:_CheckCollisionCoord(pos:Translate(self.collisiondist or 5000, hdg))
     
-  self:_CheckTurnsIntoWind()
+    self:_CheckTurnsIntoWind()
   
-  if self.intowind then
+    if self.intowind then
     
-    if timer.getAbsTime()>=self.intowind.Tstop then
+      if timer.getAbsTime()>=self.intowind.Tstop then
       
-      self:TurnIntoWindOver()
+        self:TurnIntoWindOver()
+        
+      end
     
     end
   
-  end
+    -- Get number of tasks and missions.
-
+    local nTaskTot, nTaskSched, nTaskWP=self:CountRemainingTasks()
-  -- Get number of tasks and missions.
+    local nMissions=self:CountRemainingMissison()
-  local nTaskTot, nTaskSched, nTaskWP=self:CountRemainingTasks()
-  local nMissions=self:CountRemainingMissison()
   
     -- Info text.
-  local text=string.format("State %s: Wp=%d/%d Speed=%.1f Heading=%03d intowind=%s turning=%s collision=%s Tasks=%d Missions=%d", 
+    local text=string.format("State %s: Wp=%d/%d Speed=%.1f Heading=%03d intowind=%s turning=%s collision=%s Tasks=%d Missions=%d", 
-  fsmstate, self.currentwp, #self.waypoints, speed, hdg, tostring(self:IsSteamingIntoWind()), tostring(self:IsTurning()), tostring(collision), nTaskTot, nMissions)
+    fsmstate, self.currentwp, #self.waypoints, speed, hdg, tostring(self:IsSteamingIntoWind()), tostring(self:IsTurning()), tostring(collision), nTaskTot, nMissions)
-  self:I(self.lid..text)
+    self:I(self.lid..text)
+    
+  else
+
+    -- Info text.
+    local text=string.format("State %s: Alive=%s", fsmstate, tostring(self:IsAlive()))
+    self:I(self.lid..text)
+  
+  end
 
 
   ---
@@ -434,10 +446,7 @@ function NAVYGROUP:onafterStatus(From, Event, To)
 
 
 
-  -- Next check in ~30 seconds.
+  self:__Status(-10)
-  if not self:IsStopped() then
-    self:__Status(-10)
-  end
 end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -458,6 +467,19 @@ function NAVYGROUP:onafterElementSpawned(From, Event, To, Element)
 
 end
 
+--- On after "ElementDead" event.
+-- @param #NAVYGROUP self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+-- @param #NAVYGROUP.Element Element The group element.
+function NAVYGROUP:onafterElementDead(From, Event, To, Element)
+  self:T(self.lid..string.format("Element dead %s.", Element.name))
+
+  -- Set element status.
+  self:_UpdateStatus(Element, OPSGROUP.ElementStatus.DEAD)
+end
+
 --- On after "Spawned" event.
 -- @param #NAVYGROUP self
 -- @param #string From From state.
@@ -756,6 +778,54 @@ function NAVYGROUP:onafterSurface(From, Event, To)
 
 end
 
+--- On after "Dead" event.
+-- @param #NAVYGROUP self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function NAVYGROUP:onafterDead(From, Event, To)
+  self:I(self.lid..string.format("Group dead!"))
+
+  -- Delete waypoints so they are re-initialized at the next spawn.
+  self.waypoints=nil
+  self.groupinitialized=false
+
+  -- Cancel all mission.
+  for _,_mission in pairs(self.missionqueue) do
+    local mission=_mission --Ops.Auftrag#AUFTRAG
+
+    self:MissionCancel(mission)
+    mission:GroupDead(self)
+
+  end
+
+  -- Stop
+  self:Stop()
+end
+
+--- On after Start event. Starts the NAVYGROUP FSM and event handlers.
+-- @param #NAVYGROUP self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+function NAVYGROUP:onafterStop(From, Event, To)
+
+  -- Check if group is still alive.
+  if self:IsAlive() then
+    -- Destroy group. No event is generated.
+    self.group:Destroy(false)
+  end
+
+  -- Handle events:
+  self:UnHandleEvent(EVENTS.Birth)
+  self:UnHandleEvent(EVENTS.Dead)
+  self:UnHandleEvent(EVENTS.RemoveUnit)
+
+  self.CallScheduler:Clear()
+
+  self:I(self.lid.."STOPPED! Unhandled events, cleared scheduler and removed from database.")
+end
+
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Events DCS
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -796,6 +866,54 @@ function NAVYGROUP:OnEventBirth(EventData)
 
 end
 
+--- Flightgroup event function handling the crash of a unit.
+-- @param #NAVYGROUP self
+-- @param Core.Event#EVENTDATA EventData Event data.
+function NAVYGROUP:OnEventDead(EventData)
+
+  -- Check that this is the right group.
+  if EventData and EventData.IniGroup and EventData.IniUnit and EventData.IniGroupName and EventData.IniGroupName==self.groupname then
+    self:T(self.lid..string.format("EVENT: Unit %s dead!", EventData.IniUnitName))
+    
+    local unit=EventData.IniUnit
+    local group=EventData.IniGroup
+    local unitname=EventData.IniUnitName
+
+    -- Get element.
+    local element=self:GetElementByName(unitname)
+
+    if element then
+      self:I(self.lid..string.format("EVENT: Element %s dead ==> dead", element.name))
+      self:ElementDead(element)
+    end
+    
+  end
+
+end
+
+--- Flightgroup event function handling the crash of a unit.
+-- @param #NAVYGROUP self
+-- @param Core.Event#EVENTDATA EventData Event data.
+function NAVYGROUP:OnEventRemoveUnit(EventData)
+
+  -- Check that this is the right group.
+  if EventData and EventData.IniGroup and EventData.IniUnit and EventData.IniGroupName and EventData.IniGroupName==self.groupname then
+    local unit=EventData.IniUnit
+    local group=EventData.IniGroup
+    local unitname=EventData.IniUnitName
+
+    -- Get element.
+    local element=self:GetElementByName(unitname)
+
+    if element then
+      self:I(self.lid..string.format("EVENT: Element %s removed ==> dead", element.name))
+      self:ElementDead(element)
+    end
+
+  end
+
+end
+
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Routing
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -935,6 +1053,7 @@ function NAVYGROUP:_InitGroup()
     element.name=unit:GetName()
     element.typename=unit:GetTypeName()
     element.status=OPSGROUP.ElementStatus.INUTERO
+    element.unit=unit
     table.insert(self.elements, element)
     
     self:GetAmmoUnit(unit, false)
@@ -1046,40 +1165,46 @@ end
 -- @param #NAVYGROUP self
 function NAVYGROUP:_CheckTurning()
 
-  -- Current orientation of carrier.
+  local unit=self.group:GetUnit(1)
-  local vNew=self.group:GetUnit(1):GetOrientationX()
   
-  -- Last orientation from 30 seconds ago.
+  if unit and unit:IsAlive() then
-  local vLast=self.Corientlast or vNew
 
-  -- We only need the X-Z plane.
+    -- Current orientation of carrier.
-  vNew.y=0 ; vLast.y=0
+    local vNew=unit:GetOrientationX()
   
-  -- Angle between current heading and last time we checked ~30 seconds ago.
+    -- Last orientation from 30 seconds ago.
-  local deltaLast=math.deg(math.acos(UTILS.VecDot(vNew,vLast)/UTILS.VecNorm(vNew)/UTILS.VecNorm(vLast)))
+    local vLast=self.Corientlast or vNew
   
-  -- Last orientation becomes new orientation
+    -- We only need the X-Z plane.
-  self.Corientlast=vNew
+    vNew.y=0 ; vLast.y=0
   
-  -- Carrier is turning when its heading changed by at least two degrees since last check.
+    -- Angle between current heading and last time we checked ~30 seconds ago.
-  local turning=math.abs(deltaLast)>=2
+    local deltaLast=math.deg(math.acos(UTILS.VecDot(vNew,vLast)/UTILS.VecNorm(vNew)/UTILS.VecNorm(vLast)))
   
-  -- Check if turning stopped.
+    -- Last orientation becomes new orientation
-  if self.turning and not turning then
+    self.Corientlast=vNew
   
-    -- Carrier was turning but is not any more.
+    -- Carrier is turning when its heading changed by at least two degrees since last check.
-    self:TurningStopped()
+    local turning=math.abs(deltaLast)>=2
   
-  elseif turning and not self.turning then
+    -- Check if turning stopped.
+    if self.turning and not turning then
   
-    -- Carrier was not turning but is now.
+      -- Carrier was turning but is not any more.
-    self:TurningStarted()    
+      self:TurningStopped()
+      
+    elseif turning and not self.turning then
+  
+      -- Carrier was not turning but is now.
+      self:TurningStarted()    
+  
+    end
+  
+    -- Update turning.
+    self.turning=turning
     
   end
   
-  -- Update turning.
-  self.turning=turning
-  
 end
 
 --- Check if group is done, i.e.

Moose Development/Moose/Wrapper/Group.lua

@@ -1039,11 +1039,16 @@ function GROUP:GetHeading()
   local GroupSize = self:GetSize()
   local HeadingAccumulator = 0
   
+  local n=0
   if GroupSize then
     for i = 1, GroupSize do
-      HeadingAccumulator = HeadingAccumulator + self:GetUnit(i):GetHeading()
+      local unit=self:GetUnit(i)
+      if unit and unit:IsAlive() then
+        HeadingAccumulator = HeadingAccumulator + unit:GetHeading()
+        n=n+1
+      end
     end
-    return math.floor(HeadingAccumulator / GroupSize)
+    return math.floor(HeadingAccumulator / n)
   end
   
   BASE:E( { "Cannot GetHeading", Group = self, Alive = self:IsAlive() } )