Merge branch 'develop' into FF/Ops

Moose Development/Moose/Core/Database.lua

@@ -577,13 +577,19 @@ do -- Zones and Pathlines
             -- For a rectangular polygon drawing, we have the width (y) and height (x).
             local w=objectData.width
             local h=objectData.height
+            local rotation = UTILS.ToRadian(objectData.angle or 0)
 
-            -- Create points from center using with and height (width for y and height for x is a bit confusing, but this is how ED implemented it).
-            local points={}
-            points[1]={x=vec2.x-h/2, y=vec2.y+w/2} --Upper left
-            points[2]={x=vec2.x+h/2, y=vec2.y+w/2} --Upper right
-            points[3]={x=vec2.x+h/2, y=vec2.y-w/2} --Lower right
-            points[4]={x=vec2.x-h/2, y=vec2.y-w/2} --Lower left
+            local sinRot = math.sin(rotation)
+            local cosRot = math.cos(rotation)
+            local dx = h / 2
+            local dy = w / 2
+
+            local points = {
+                { x = -dx * cosRot - (-dy * sinRot) + vec2.x, y = -dx * sinRot + (-dy * cosRot) + vec2.y },
+                { x = dx * cosRot - (-dy * sinRot) + vec2.x, y = dx * sinRot + (-dy * cosRot) + vec2.y },
+                { x = dx * cosRot - (dy * sinRot) + vec2.x, y = dx * sinRot + (dy * cosRot) + vec2.y },
+                { x = -dx * cosRot - (dy * sinRot) + vec2.x, y = -dx * sinRot + (dy * cosRot) + vec2.y },
+            }
 
             --local coord=COORDINATE:NewFromVec2(vec2):MarkToAll("MapX, MapY")
 

Moose Development/Moose/Core/Set.lua

@@ -7865,6 +7865,28 @@ do -- SET_OPSGROUP
     return self
   end
 
+  --- Iterate the SET_OPSGROUP and count how many GROUPs and UNITs are alive.
+  -- @param #SET_GROUP self
+  -- @return #number The number of GROUPs alive.
+  -- @return #number The number of UNITs alive.
+  function SET_OPSGROUP:CountAlive()
+    local CountG = 0
+    local CountU = 0
+
+    local Set = self:GetSet()
+
+    for GroupID, GroupData in pairs( Set ) do -- For each GROUP in SET_GROUP
+      if GroupData and GroupData:IsAlive() then
+        CountG = CountG + 1
+        -- Count Units.
+        CountU = CountU + GroupData:GetGroup():CountAliveUnits()
+      end
+
+    end
+
+    return CountG, CountU
+  end
+
   --- Finds an OPSGROUP based on the group name.
   -- @param #SET_OPSGROUP self
   -- @param #string GroupName Name of the group.

Moose Development/Moose/Core/SpawnStatic.lua

@@ -633,16 +633,15 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
   
   if self.StaticCopyFrom ~= nil then
     mystatic.StaticCopyFrom = self.StaticCopyFrom
-    if not _DATABASE.Templates.Statics[Template.name] then
-      local TemplateGroup={}
-      TemplateGroup.units={}
-      TemplateGroup.units[1]=Template
-      TemplateGroup.x=Template.x
-      TemplateGroup.y=Template.y
-      TemplateGroup.name=Template.name
-      _DATABASE:_RegisterStaticTemplate( TemplateGroup, self.CoalitionID, self.CategoryID, CountryID )
-    end
   end
+
+  local TemplateGroup={}
+  TemplateGroup.units={}
+  TemplateGroup.units[1]=Template
+  TemplateGroup.x=Template.x
+  TemplateGroup.y=Template.y
+  TemplateGroup.name=Template.name
+  _DATABASE:_RegisterStaticTemplate( TemplateGroup, self.CoalitionID, self.CategoryID, CountryID )
   
   return mystatic
 end

Moose Development/Moose/Core/Zone.lua

@@ -1934,6 +1934,21 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset)
   return self
 end
 
+--- Updates the current location from a @{Wrapper.Group}.
+-- @param #ZONE_UNIT self
+-- @param Wrapper.Group#GROUP Group (optional) Update from this Unit, if nil, update from the UNIT this zone is based on.
+-- @return self
+function ZONE_UNIT:UpdateFromUnit(Unit)
+  if Unit and Unit:IsAlive() then
+    local vec2 = Unit:GetVec2()
+    self.LastVec2 = vec2
+  elseif self.ZoneUNIT and self.ZoneUNIT:IsAlive() then
+    local ZoneVec2 = self.ZoneUNIT:GetVec2()
+    self.LastVec2 = ZoneVec2
+  end
+  return self
+end
+
 
 --- Returns the current location of the @{Wrapper.Unit#UNIT}.
 -- @param #ZONE_UNIT self
@@ -2071,6 +2086,22 @@ function ZONE_GROUP:GetVec2()
   return ZoneVec2
 end
 
+--- Updates the current location from a @{Wrapper.Group}.
+-- @param #ZONE_GROUP self
+-- @param Wrapper.Group#GROUP Group (optional) Update from this Group, if nil, update from the GROUP this zone is based on.
+-- @return self
+function ZONE_GROUP:UpdateFromGroup(Group)
+  if Group and Group:IsAlive() then
+    local vec2 = Group:GetVec2()
+    self.Vec2 = vec2
+  elseif self._.ZoneGROUP and self._.ZoneGROUP:IsAlive() then
+    local ZoneVec2 = self._.ZoneGROUP:GetVec2()
+    self.Vec2 = ZoneVec2
+    self._.ZoneVec2Cache = ZoneVec2
+  end
+  return self
+end
+
 --- Returns a random location within the zone of the @{Wrapper.Group}.
 -- @param #ZONE_GROUP self
 -- @return DCS#Vec2 The random location of the zone based on the @{Wrapper.Group} location.