Merge branch 'develop' into FF/OpsStuff

Added parameter to delay init group

Moose Development/Moose/Ops/ArmyGroup.lua

@@ -976,7 +976,8 @@ function ARMYGROUP:onafterSpawned(From, Event, To)
     -- Update route.
     if Nwp>1 and self.isMobile then
       self:T(self.lid..string.format("Got %d waypoints on spawn ==> Cruise in -1.0 sec!", Nwp))
-      self:__Cruise(-1, nil, self.option.Formation)
+      --self:__Cruise(-1, nil, self.option.Formation)
+      self:__Cruise(-1)
     else
       self:T(self.lid.."No waypoints on spawn ==> Full Stop!")
       self:FullStop()
@@ -1948,7 +1949,7 @@ function ARMYGROUP:onafterCruise(From, Event, To, Speed, Formation)
   self.dTwait=nil
   
   -- Debug info.
-  self:T(self.lid.."Cruise ==> Update route in 0.01 sec")
+  self:T(self.lid..string.format("Cruise ==> Update route in 0.01 sec (speed=%s, formation=%s)", tostring(Speed), tostring(Formation)))
 
   -- Update route.
   self:__UpdateRoute(-0.01, nil, nil, Speed, Formation)
@@ -2043,7 +2044,11 @@ end
 -- @param #ARMYGROUP self
 -- @param #table Template Template used to init the group. Default is `self.template`.
 -- @return #ARMYGROUP self
-function ARMYGROUP:_InitGroup(Template)
+function ARMYGROUP:_InitGroup(Template, Delay)
+
+  if Delay and Delay>0 then
+    self:ScheduleOnce(Delay, ARMYGROUP._InitGroup, self, Template, 0)
+  else
 
     -- First check if group was already initialized.
     if self.groupinitialized then
@@ -2051,6 +2056,8 @@ function ARMYGROUP:_InitGroup(Template)
       return
     end
     
+    self:I(self.lid.."FF Initializing Group")
+  
     -- Get template of group.
     local template=Template or self:_GetTemplate()
     
@@ -2103,10 +2110,11 @@ function ARMYGROUP:_InitGroup(Template)
     -- DCS group.
     local dcsgroup=Group.getByName(self.groupname)
     local size0=dcsgroup:getInitialSize()
+    local u=dcsgroup:getUnits()
     
     -- Quick check.
     if #units~=size0 then
-    self:T(self.lid..string.format("ERROR: Got #units=%d but group consists of %d units!", #units, size0))
+      self:T(self.lid..string.format("ERROR: Got #units=%d but group consists of %d units! u=%d", #units, size0, #u))
     end
     
     -- Add elemets.
@@ -2118,6 +2126,7 @@ function ARMYGROUP:_InitGroup(Template)
   
     -- Init done.
     self.groupinitialized=true
+  end
   
   return self
 end

Moose Development/Moose/Ops/OpsGroup.lua

@@ -1768,6 +1768,8 @@ function OPSGROUP:GetDCSUnit(UnitNumber)
   if DCSGroup then
     local unit=DCSGroup:getUnit(UnitNumber or 1)
     return unit
+  else
+    self:E(self.lid..string.format("ERROR: DCS group does not exist! Cannot get unit"))
   end
 
   return nil
@@ -3524,6 +3526,8 @@ function OPSGROUP:OnEventBirth(EventData)
       -- Debug info.
       self:T(self.lid..string.format("EVENT: Element %s born ==> spawned", unitname))
       
+      self:T2(self.lid..string.format("DCS unit=%s isExist=%s", tostring(EventData.IniDCSUnit:getName()), tostring(EventData.IniDCSUnit:isExist()) ))
+
       -- Set element to spawned state.
       self:ElementSpawned(element)
 

Moose Development/Moose/Wrapper/Group.lua

@@ -359,6 +359,8 @@ function GROUP:GetDCSObject()
 
   if DCSGroup then
     return DCSGroup
+  else
+    env.error("ERROR: Could not get DCS group object!")
   end
 
   return nil