Ticket #3804: gamesetup.js.patch

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

@@ -1590 +1590 @@
 
         // 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')
+        {
+            let playerCiv = g_GameAttributes.settings.PlayerData[playerID - 1].Civ;
+            let newPlayerCiv = g_GameAttributes.settings.PlayerData[newSlot].Civ;
+            g_GameAttributes.settings.PlayerData[playerID - 1].Civ = newPlayerCiv;
+            g_GameAttributes.settings.PlayerData[newSlot].Civ = playerCiv;
+
+            if (!g_IsInGuiUpdate)
+                updateGameAttributes();
+        }
     }
 
     if (g_IsNetworked)