Merge remote-tracking branch 'origin/master' into develop

Moose Development/Moose/Core/Database.lua

@@ -1147,10 +1147,13 @@ end
 -- @param #string GroupName Group name.
 -- @return #table Group template table.
 function DATABASE:GetGroupTemplate( GroupName )
-  local GroupTemplate = self.Templates.Groups[GroupName].Template
+  local GroupTemplate=nil
+  if self.Templates.Groups[GroupName] then
+    GroupTemplate = self.Templates.Groups[GroupName].Template
     GroupTemplate.SpawnCoalitionID = self.Templates.Groups[GroupName].CoalitionID
     GroupTemplate.SpawnCategoryID = self.Templates.Groups[GroupName].CategoryID
     GroupTemplate.SpawnCountryID = self.Templates.Groups[GroupName].CountryID
+  end
   return GroupTemplate
 end
 

Moose Development/Moose/Core/Point.lua

@@ -2748,6 +2748,9 @@ do -- COORDINATE
       local sunrise=UTILS.GetSunRiseAndSet(DayOfYear, Latitude, Longitude, true, Tdiff)
       local sunset=UTILS.GetSunRiseAndSet(DayOfYear, Latitude, Longitude, false, Tdiff)
       
+      if sunrise == "N/R" then return false end
+      if sunrise == "N/S" then return true end
+      
       local time=UTILS.ClockToSeconds(clock)
 
       -- Check if time is between sunrise and sunset.

Moose Development/Moose/Ops/Airboss.lua

@@ -14366,11 +14366,15 @@ function AIRBOSS:_GetOnboardNumbers( group, playeronly )
   -- Debug text.
   local text = string.format( "Onboard numbers of group %s:", groupname )
 
+  local template=group:GetTemplate()
+
+  local numbers = {}
+  if template then
+
     -- Units of template group.
-  local units = group:GetTemplate().units
+    local units = template.units
 
     -- Get numbers.
-  local numbers = {}
     for _, unit in pairs( units ) do
 
       -- Onboard number and unit name.
@@ -14393,6 +14397,25 @@ function AIRBOSS:_GetOnboardNumbers( group, playeronly )
     -- Debug info.
     self:T2( self.lid .. text )
 
+  else
+
+    if playeronly then
+      return 101
+    else
+
+      local units=group:GetUnits()
+
+      for i,_unit in pairs(units) do
+        local name=_unit:GetName()
+
+        numbers[name]=100+i
+
+      end
+
+    end
+
+  end
+
   return numbers
 end
 

Moose Development/Moose/Wrapper/Group.lua

@@ -1778,10 +1778,14 @@ end
 
 --- Returns the group template from the global _DATABASE object (an instance of @{Core.Database#DATABASE}).
 -- @param #GROUP self
--- @return #table
+-- @return #table Template table.
 function GROUP:GetTemplate()
   local GroupName = self:GetName()
-  return UTILS.DeepCopy( _DATABASE:GetGroupTemplate( GroupName ) )
+  local template=_DATABASE:GetGroupTemplate( GroupName )
+  if template then
+    return UTILS.DeepCopy( template )
+  end
+  return nil
 end
 
 --- Returns the group template route.points[] (the waypoints) from the global _DATABASE object (an instance of @{Core.Database#DATABASE}).