Ticket #3804: gamesetup.js.3.patch

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

@@ -873 +873 @@
 function savePersistMatchSettings()
 {
     let attributes = Engine.ConfigDB_GetValue("user", "persistmatchsettings") == "true" ? g_GameAttributes : {};
+
+    // Fill players with default AIs
+    for (let i = 0; i < attributes.settings.PlayerData.length; ++i)
+        if (!attributes.settings.PlayerData[i].AI)
+            attributes.settings.PlayerData[i].AI = g_DefaultPlayerData[i].AI;
+
     Engine.WriteJSONFile(g_IsNetworked ? g_MatchSettings_MP : g_MatchSettings_SP, attributes);
 }
 
@@ -1570 +1576 @@
     // Player slots are indexed from 0 as Gaia is omitted.
     let newPlayerID = newSlot + 1;
     let playerID = g_PlayerAssignments[guid].player;
+    let outdatedAttributes = false;
 
     // Attempt to swap the player or AI occupying the target slot,
     // if any, into the slot this player is currently in.
@@ -1590 +1597 @@
 
         // Transfer the AI from the target slot to the current slot.
         g_GameAttributes.settings.PlayerData[playerID - 1].AI = g_GameAttributes.settings.PlayerData[newSlot].AI;
+
+        // Swap civilizations only if they aren't fixed
+        if (g_GameAttributes.mapType != "scenario")
+        {
+            [g_GameAttributes.settings.PlayerData[playerID - 1].Civ, g_GameAttributes.settings.PlayerData[newSlot].Civ] = 
+                [g_GameAttributes.settings.PlayerData[newSlot].Civ, g_GameAttributes.settings.PlayerData[playerID - 1].Civ];
+
+            if (!g_IsInGuiUpdate)
+                outdatedAttributes = true;
+        }
     }
 
     if (g_IsNetworked)
@@ -1599 +1616 @@
 
     // Remove AI from this player slot
     g_GameAttributes.settings.PlayerData[newSlot].AI = "";
+
+    if (outdatedAttributes)
+        updateGameAttributes();
 }
 
 function submitChatInput()