startPosType=2 so multiple teams can be used with generated maps (and actually properly load all teams)

Author: gajop

scen_edit/command/project/reload_into_project_command.lua

@@ -41,6 +41,7 @@ function ReloadIntoProjectCommand:execute()
     scriptObj.modOptions._sb_game_version = nil
     scriptObj.players = scriptObj.players or {}
     scriptObj.ais = scriptObj.ais or {}
+    scriptObj.startPosType = 2
 
     table.echo(scriptObj)
     scriptTxt = StartScript.GenerateScriptTxt(scriptObj)

scen_edit/command/project/save_project_info_command.lua

@@ -61,7 +61,7 @@ function SaveCommand.GenerateScript()
     -- we ignore SB's teamIDs and make sure they make a no-gap array
     local teamIDCount = 1
     for _, team in pairs(SB.model.teamManager:getAllTeams()) do
-        if not team.gaia and #players + #ais < 2 then
+        if not team.gaia then
             local t = {
                 -- TeamID = team.id, ID is implicit as index-1
                 teamLeader = 0,
@@ -121,6 +121,7 @@ function SaveCommand.GenerateScript()
         ais = ais,
         teams = teams,
         allyTeams = allyTeams,
+        startPosType = 2,
     }
     return StartScript.GenerateScriptTxt(script)
 end
@@ -156,6 +157,10 @@ local function MapInfoSave(name, path)
 end
 
 function SaveProjectInfoCommand:execute()
+    if #SB.project.mutators == 0 then
+        SB.project.mutators = { SB.project.name .. " 1.0" }
+    end
+
     local projectDir = self.path
     local projectName = self.name
 

scen_edit/model/project.lua

@@ -41,7 +41,7 @@ function Project:Save(name)
     assert(self.path ~= nil, "Project path is not specified")
     assert(self.name ~= nil, "Project name is not specified")
     if isNewProject then
-        SB.project:CreateProjectStructure(self.path)
+        self:GenerateNewProjectInfo(self.name)
     end
 
     Log.Notice("Saving project: " .. self.path .. " ...")
@@ -70,6 +70,7 @@ function Project:GenerateNewProjectInfo(name)
     self.path = nil
     self:__MaybeSetNameCommand(name)
 
+    SB.project.mutators = { SB.project.name .. " 1.0" }
     SB.project:CreateProjectStructure(self.path)
     Log.Notice("Saving project info: " .. self.path .. " ...")
     local cmd = SaveProjectInfoCommand(self.name, self.path, true)

scen_edit/view/dialog/new_project_dialog.lua

@@ -93,7 +93,6 @@ function NewProjectDialog:ConfirmDialog()
         return
     end
 
-    SB.project.mutators = { projectName .. " 1.0" }
     if self.fields["mapName"].value == "SB_Blank_Map" then
         if self.fields["sizeX"].value % 2 ~= 0 then
             SB.HintControls(self.fields["sizeX"].components)