Ticket #4078: all_ai_in_sp_v2.patch

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -92 +92 @@
             {"nick": "infyquest", "name": "Vijay Kiran Kamuju"},
             {"nick": "IronNerd", "name": "Matthew McMullan"},
             {"nick": "Itms", "name": "Nicolas Auvray"},
+            {"nick": "ixly"},
             {"nick": "Jaison", "name": "Marco tom Suden"},
             {"nick": "jammus", "name": "James Scott"},
             {"nick": "Jgwman"},

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -1584 +1584 @@
     let assignments = [];
     let aiAssignments = {};
     let noAssignment;
-    let assignedCount = 0;
+
     for (let guid of sortGUIDsByPlayerID())
     {
         let player = g_PlayerAssignments[guid].player;
@@ -1596 +1596 @@
 
         hostGuidList.push(guid);
         assignments[player] = hostNameList.length-1;
-
-        if (player != -1)
-            ++assignedCount;
     }
 
-    // Only enable start button if we have enough assigned players
-    if (g_IsController)
-        Engine.GetGUIObjectByName("startGame").enabled = assignedCount > 0;
-
     for (let ai of g_Settings.AIDescriptions)
     {
         // If the map uses a hidden AI then don't hide it
@@ -1683 +1676 @@
                     return;
 
                 let guid = hostGuidList[this.selected];
-                if (!guid)
+
+                if (!guid || guid.substr(0, 3) == "ai:")
                 {
+                    // Unassign any host from this player slot
                     if (g_IsNetworked)
-                        // Unassign any host from this player slot
                         Engine.AssignNetworkPlayer(playerID, "");
-                    // Remove AI from this player slot
-                    g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
+
+                    // If a human was removed from the slot, make sure they are not reassigned
+                    let changeTarget = this.list_data[selection];
+                    if (g_PlayerAssignments[changeTarget])
+                        g_PlayerAssignments[changeTarget].player = -1;
+
+                    // Set the AI, unless we are unassigning
+                    g_GameAttributes.settings.PlayerData[playerSlot].AI = guid ? guid.substr(3) : "";
                 }
-                else if (guid.substr(0, 3) == "ai:")
-                {
-                    if (g_IsNetworked)
-                        // Unassign any host from this player slot
-                        Engine.AssignNetworkPlayer(playerID, "");
-                    // Set the AI for this player slot
-                    g_GameAttributes.settings.PlayerData[playerSlot].AI = guid.substr(3);
-                }
                 else
                     swapPlayers(guid, playerSlot);
 

binaries/data/mods/public/gui/gamesetup/gamesetup.xml

@@ -256 +256 @@
                 style="StoneButton"
                 size="100%-164 100%-52 100%-24 100%-24"
                 tooltip_style="onscreenToolTip"
-                enabled="false"
+                enabled="true"
             >
                 <translatableAttribute id="caption">Start game!</translatableAttribute>
                 <translatableAttribute id="tooltip">Start a new game with the current settings.</translatableAttribute>