Merge branch 'develop' into FF/Develop

This commit is contained in:
Frank
2019-04-12 17:57:15 +02:00
6 changed files with 1831 additions and 106 deletions

View File

@@ -70,11 +70,12 @@ function REPORT:Add( Text )
return self
end
--- Add a new line to a REPORT.
--- Add a new line to a REPORT, but indented. A separator character can be specified to separate the reported lines visually.
-- @param #REPORT self
-- @param #string Text
-- @param #string Text The report text.
-- @param #string Separator (optional) The start of each report line can begin with an optional separator character. This can be a "-", or "#", or "*". You're free to choose what you find the best.
-- @return #REPORT
function REPORT:AddIndent( Text, Separator ) --R2.1
function REPORT:AddIndent( Text, Separator )
self.Report[#self.Report+1] = ( ( Separator and Separator .. string.rep( " ", self.Indent - 1 ) ) or string.rep(" ", self.Indent ) ) .. Text:gsub("\n","\n"..string.rep( " ", self.Indent ) )
return self
end

View File

@@ -2203,7 +2203,7 @@ end
-- -- Do actions with the GroupPlane object.
-- end
function SPAWN:GetLastAliveGroup()
self:F( { self.SpawnTemplatePrefixself.SpawnAliasPrefix } )
self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
self.SpawnIndex = self:_GetLastIndex()
for SpawnIndex = self.SpawnIndex, 1, -1 do