Ticket #3970: lastmanstanding_v2.patch

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

@@ -353 +353 @@
         "optionExploreMap",
         "optionDisableTreasures",
         "optionLockTeams",
+        "optionLastManStanding",
         "optionCheats",
         "optionRating",
         "hideMoreOptions"
@@ -508 +509 @@
         "ExploreMap": "exploreMap",
         "DisableTreasures": "disableTreasures",
         "LockTeams": "lockTeams",
+        "LastManStanding" : "lastManStanding",
         "CheatsEnabled": "enableCheats"
     };
 
@@ -525 +527 @@
         Engine.GetGUIObjectByName("lockTeams").enabled = !this.checked;
         updateGameAttributes();
     };
+    Engine.GetGUIObjectByName("lockTeams").onPress = function() {
+        g_GameAttributes.settings.LockTeams = this.checked;
+        g_GameAttributes.settings.LastManStanding = !this.checked;
+        hideControl("lastManStanding", "lastManStandingText", !g_GameAttributes.settings.LockTeams);
+        updateGameAttributes();
+    };
 }
 
 /**
@@ -1173 +1181 @@
 
     if (g_GameAttributes.mapType == "scenario")
         delete g_GameAttributes.settings.WonderDuration;
+        delete g_GameAttributes.settings.LastManStanding;
 
     if (mapSettings.PlayerData)
         sanitizePlayerData(mapSettings.PlayerData);
@@ -1371 +1380 @@
     setGUIBoolean("exploreMap", "exploreMapText", !!mapSettings.ExploreMap);
     setGUIBoolean("revealMap", "revealMapText", !!mapSettings.RevealMap);
     setGUIBoolean("lockTeams", "lockTeamsText", !!mapSettings.LockTeams);
+    setGUIBoolean("lastManStanding", "lastManStandingText", !!mapSettings.LastManStanding);
     setGUIBoolean("enableRating", "enableRatingText", !!mapSettings.RatingEnabled);
 
     Engine.GetGUIObjectByName("optionWonderDuration").hidden =
@@ -1381 +1391 @@
 
     Engine.GetGUIObjectByName("enableCheats").enabled = !mapSettings.RatingEnabled;
     Engine.GetGUIObjectByName("lockTeams").enabled = !mapSettings.RatingEnabled;
+    Engine.GetGUIObjectByName("lastManStandingText").hidden = mapSettings.LockTeams;
 
     // Mapsize completely hidden for non-random maps
     let isRandom = g_GameAttributes.mapType == "random";
@@ -1389 +1400 @@
     Engine.GetGUIObjectByName("mapSizeText").hidden = !isRandom || g_IsController;
     hideControl("numPlayers", "numPlayersText", isRandom && g_IsController);
 
-    let notScenario = g_GameAttributes.mapType != "scenario" && g_IsController ;
+    let notScenario = g_GameAttributes.mapType != "scenario" && g_IsController;
 
     for (let ctrl of ["victoryCondition", "wonderDuration", "populationCap",
                       "startingResources", "ceasefire", "revealMap",
                       "exploreMap", "disableTreasures", "lockTeams"])
         hideControl(ctrl, ctrl + "Text", notScenario);
+    hideControl("lastManStanding", "lastManStandingText", !mapSettings.LockTeams && notScenario);
 
     Engine.GetGUIObjectByName("civResetButton").hidden = !notScenario;
 

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

@@ -385 +385 @@
                         <translatableAttribute id="tooltip">Toggle locked teams.</translatableAttribute>
                     </object>
                 </object>
+                
+                <object name="optionLastManStanding" size="14 338 94% 366">
+                    <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
+                        <translatableAttribute id="caption">Last Man Standing:</translatableAttribute>
+                    </object>
+                    <object name="lastManStandingText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
+                    <object name="lastManStanding" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
+                        <translatableAttribute id="tooltip">Toggle if only one player can win (disables allied victory).</translatableAttribute>
+                    </object>
+                </object>
 
-                <object name="optionCheats" size="14 338 94% 366" hidden="true">
+                <object name="optionCheats" size="14 368 94% 396" hidden="true">
                     <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Cheats:</translatableAttribute>
                     </object>
@@ -396 +406 @@
                     </object>
                 </object>
 
-                <object name="optionRating" size="14 368 94% 396" hidden="true">
+                <object name="optionRating" size="14 398 94% 426" hidden="true">
                     <object size="0 0 40% 28" hidden="false" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Rated Game:</translatableAttribute>
                     </object>

binaries/data/mods/public/simulation/components/EndGameManager.js

@@ -19 +19 @@
     this.wonderDuration = 10 * 60 * 1000;
 
     // Allied victory means allied players can win if victory conditions are met for each of them
-    // Would be false for a "last man standing" game (when diplomacy is fully implemented)
+    // False for a "last man standing" game
     this.alliedVictory = true;
 };
 
@@ -81 +81 @@
         return;
 
     var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     var cmpPlayers = [];
 
     var allies = [];
@@ -100 +101 @@
             onlyAlliesLeft = false;
     }
 
+    if (!this.alliedVictory && onlyAlliesLeft)
+        cmpGUIInterface.PushNotification({
+            "message": markForTranslation("Last player remaining wins"),
+            "translateMessage": true
+        });
+
     // check if there are winners, or the game needs to continue
-    if (!allies.length || !onlyAlliesLeft || !this.alliedVictory)
-        return; 
+    if (!allies.length || !onlyAlliesLeft ||
+        !this.alliedVictory && cmpPlayers.filter(pData => pData.GetState() == "active").length != 1)
+        return;
 
     for (var p of allies)
         cmpPlayers[p].SetState("won");

binaries/data/mods/public/simulation/helpers/Setup.js

@@ -51 +51 @@
         cmpEndGameManager.SetGameType(settings.GameType);
     if (settings.WonderDuration)
         cmpEndGameManager.SetWonderDuration(settings.WonderDuration * 60 * 1000);
+    if (settings.LastManStanding)
+        cmpEndGameManager.SetAlliedVictory(false);
 
     if (settings.Garrison)
     {