Ticket #3970: lastmanstanding_v4.patch

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

@@ -494 +494 @@
         "ExploreMap": "exploreMap",
         "DisableTreasures": "disableTreasures",
         "LockTeams": "lockTeams",
+        "LastManStanding" : "lastManStanding",
         "CheatsEnabled": "enableCheats"
     };
 
@@ -511 +512 @@
         Engine.GetGUIObjectByName("lockTeams").enabled = !this.checked;
         updateGameAttributes();
     };
+
+    Engine.GetGUIObjectByName("lockTeams").onPress = function() {
+        g_GameAttributes.settings.LockTeams = this.checked;
+        g_GameAttributes.settings.LastManStanding = !this.checked ? this.checked : !this.checked;
+        updateGameAttributes();
+    };
 }
 
 /**
@@ -1151 +1158 @@
     }
 
     if (g_GameAttributes.mapType == "scenario")
+    {
         delete g_GameAttributes.settings.WonderDuration;
+        delete g_GameAttributes.settings.LastManStanding;
+    }
 
     if (mapSettings.PlayerData)
         sanitizePlayerData(mapSettings.PlayerData);
@@ -1362 +1372 @@
     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 =
@@ -1372 +1383 @@
 
     Engine.GetGUIObjectByName("enableCheats").enabled = !mapSettings.RatingEnabled;
     Engine.GetGUIObjectByName("lockTeams").enabled = !mapSettings.RatingEnabled;
+    Engine.GetGUIObjectByName("optionLastManStanding").hidden = mapSettings.LockTeams;
 
     // Mapsize completely hidden for non-random maps
     let isRandom = g_GameAttributes.mapType == "random";
@@ -1384 +1396 @@
 
     for (let ctrl of ["victoryCondition", "wonderDuration", "populationCap",
                       "startingResources", "ceasefire", "revealMap",
-                      "exploreMap", "disableTreasures", "lockTeams"])
+                      "exploreMap", "disableTreasures", "lockTeams", "lastManStanding"])
         hideControl(ctrl, ctrl + "Text", notScenario);
 
     Engine.GetGUIObjectByName("civResetButton").hidden = !notScenario;

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

@@ -386 +386 @@
                     </object>
                 </object>
 
-                <object name="optionCheats" size="14 338 94% 366" hidden="true">
+                <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 whether the last remaining player or the last remaining set of allies wins.</translatableAttribute>
+                    </object>
+                </object>
+
+                <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>
                     <object name="enableCheatsText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
@@ -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;
+    this.noAlliesLeftMessage = {};
 };
 
 EndGameManager.prototype.GetGameType = function()
@@ -75 +76 @@
     this.alliedVictory = flag;
 };
 
-EndGameManager.prototype.OnGlobalPlayerDefeated = function(msg)
+function LastManStandingCheck(onlyAlliesLeft)
 {
-    if (msg.skip)
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    var cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
+
+    if (!cmpGuiInterface || !cmpPlayerManager)
         return;
 
-    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-    var cmpPlayers = [];
+    if (cmpEndGameManager.alliedVictory)
+    {
+        cmpGuiInterface.DeleteTimeNotification(cmpEndGameManager.noAlliesLeftMessage);
+        return;
+    }
 
+    if (!cmpEndGameManager.alliedVictory && onlyAlliesLeft)
+    {
+        cmpGuiInterface.DeleteTimeNotification(cmpEndGameManager.noAlliesLeftMessage);
+        cmpEndGameManager.noAlliesLeftMessage = cmpGuiInterface.AddTimeNotification({
+            "message": markForTranslation("Last player remaining wins."),
+            "translateMessage": true,
+            }, 90 * 60 * 1000);
+    }
+
+    else if (!cmpEndGameManager.alliedVictory && !onlyAlliesLeft)
+        cmpGuiInterface.DeleteTimeNotification(cmpEndGameManager.noAlliesLeftMessage);
+
+};
+
+function OnlyAlliesLeft(msg)
+{
+    var numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
     var allies = [];
     var onlyAlliesLeft = true;
 
-    var numPlayers = cmpPlayerManager.GetNumPlayers(); 
+    var cmpPlayers = [];
 
     for (var i = 1; i < numPlayers; ++i)
     {
         cmpPlayers[i] = QueryPlayerIDInterface(i);
-        if (cmpPlayers[i].GetState() != "active" || i == msg.playerId) 
+        if (cmpPlayers[i].GetState() != "active" || i == msg.playerId)
             continue;
 
         if (!allies.length || cmpPlayers[allies[0]].IsMutualAlly(i))
             allies.push(i);
         else
-            onlyAlliesLeft = false;
+            return false;
     }
+    return allies;
+}
 
+EndGameManager.prototype.OnInitGame = function(msg)
+{
+    LastManStandingCheck(OnlyAlliesLeft(msg));
+};
+
+EndGameManager.prototype.OnGlobalDiplomacyChanged = function(msg)
+{
+    LastManStandingCheck(OnlyAlliesLeft(msg));
+};
+
+EndGameManager.prototype.OnGlobalPlayerDefeated = function(msg)
+{
+    if (msg.skip)
+        return;
+
+    var numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
+    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    var cmpPlayers = [];
+
+    for (var i = 1; i < numPlayers; ++i)
+        cmpPlayers[i] = QueryPlayerIDInterface(i);
+
+    let allies = OnlyAlliesLeft(msg);
+    LastManStandingCheck(allies);
+
     // check if there are winners, or the game needs to continue
-    if (!allies.length || !onlyAlliesLeft || !this.alliedVictory)
-        return; 
+    if (!allies.length || !allies ||
+        !this.alliedVictory && cmpPlayers.filter(pData => pData.GetState() == "active").length != 1)
+        return;
 
+    cmpGuiInterface.DeleteTimeNotification(this.noAlliesLeftMessage);
+
     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)
     {