From bfeaa961f659c9f4cb14c501a1eb458bc9cbb7bb Mon Sep 17 00:00:00 2001 From: svenvandevelde Date: Fri, 6 May 2016 14:21:24 +0200 Subject: [PATCH] Updates for Anapa. Fixed a bug in SPAWN (small bug) --- Moose/Database.lua | 6 ++++++ Moose/Group.lua | 2 +- Moose/Spawn.lua | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Moose/Database.lua b/Moose/Database.lua index de4082c06..631bd665b 100644 --- a/Moose/Database.lua +++ b/Moose/Database.lua @@ -345,6 +345,12 @@ function DATABASE:_RegisterGroup( GroupTemplate ) self.Groups[GroupTemplateName] = {} self.Groups[GroupTemplateName].Status = nil end + + -- Delete the spans from the route, it is not needed and takes memory. + if GroupTemplate.route and GroupTemplate.route.spans then + GroupTemplate.route.spans = nil + end + self.Groups[GroupTemplateName].GroupName = GroupTemplateName self.Groups[GroupTemplateName].Template = GroupTemplate self.Groups[GroupTemplateName].groupId = GroupTemplate.groupId diff --git a/Moose/Group.lua b/Moose/Group.lua index c7f9faa4b..4e845ada7 100644 --- a/Moose/Group.lua +++ b/Moose/Group.lua @@ -601,7 +601,7 @@ end -- @param #number Speed The speed flying when holding the position. -- @return #GROUP self function GROUP:TaskOrbitCircleAtVec2( Point, Altitude, Speed ) - self:F( { self.GroupName, Point, Altitude, Speed } ) + self:F( { self.GroupName, Point, Altitude, Speed } ) -- pattern = enum AI.Task.OribtPattern, -- point = Vec2, diff --git a/Moose/Spawn.lua b/Moose/Spawn.lua index 253d08868..91a5af746 100644 --- a/Moose/Spawn.lua +++ b/Moose/Spawn.lua @@ -589,6 +589,9 @@ function SPAWN:SpawnFromUnit( HostUnit, OuterRadius, InnerRadius, SpawnIndex ) if SpawnTemplate then local UnitPoint = HostUnit:GetPointVec2() + + self:T( { "Current point of ", self.SpawnTemplatePrefix, UnitPoint } ) + --for PointID, Point in pairs( SpawnTemplate.route.points ) do --Point.x = UnitPoint.x --Point.y = UnitPoint.y @@ -596,9 +599,6 @@ function SPAWN:SpawnFromUnit( HostUnit, OuterRadius, InnerRadius, SpawnIndex ) --Point.alt_type = nil --end - SpawnTemplate.route.points = nil - SpawnTemplate.route.points = {} - SpawnTemplate.route.points[1] = {} SpawnTemplate.route.points[1].x = UnitPoint.x SpawnTemplate.route.points[1].y = UnitPoint.y @@ -1056,6 +1056,7 @@ function SPAWN:_RandomizeTemplate( SpawnIndex ) self.SpawnGroups[SpawnIndex].SpawnTemplate.route = routines.utils.deepCopy( self.SpawnTemplate.route ) self.SpawnGroups[SpawnIndex].SpawnTemplate.x = self.SpawnTemplate.x self.SpawnGroups[SpawnIndex].SpawnTemplate.y = self.SpawnTemplate.y + self.SpawnGroups[SpawnIndex].SpawnTemplate.start_time = self.SpawnTemplate.start_time for UnitID = 1, #self.SpawnGroups[SpawnIndex].SpawnTemplate.units do self.SpawnGroups[SpawnIndex].SpawnTemplate.units[UnitID].heading = self.SpawnTemplate.units[1].heading end