Ticket #2130: endgame.3.diff

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

@@ -31 +31 @@
     this.alliedVictory = flag;
 };
 
-/**
- * Begin checking the end-game conditions.
- * Must be called once, after calling SetGameType.
- */
-EndGameManager.prototype.Start = function()
+EndGameManager.prototype.PlayerLostAllConquestCriticalEntities = function(playerID)
 {
-    if (this.gameType != "endless")
-    {
-        var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-        this.timer = cmpTimer.SetTimeout(this.entity, IID_EndGameManager, "ProgressTimeout", g_ProgressInterval, {});
-    }
-};
+    if (this.gameType == "endless")
+        return; 
 
-EndGameManager.prototype.OnDestroy = function()
-{
-    if (this.timer)
+    // for all other game types, defeat that player
+    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    
+    // Ignore gaia
+    var numPlayers = cmpPlayerManager.GetNumPlayers() - 1;
+    var cmpPlayers = new Array(numPlayers);
+    
+    // If the player is currently active but needs to be defeated,
+    // mark that player as defeated
+    // cache the cmpPlayer instances of the other players
+    for (var i = 0; i < numPlayers; i++)
     {
-        var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-        cmpTimer.CancelTimer(this.timer);
+        var playerEntityId = cmpPlayerManager.GetPlayerByID(i+1);
+        cmpPlayers[i] = Engine.QueryInterface(playerEntityId, IID_Player);
+        if (cmpPlayers[i].GetPlayerID() == playerID && cmpPlayers[i].GetState() == "active")
+            Engine.PostMessage(playerEntityId, MT_PlayerDefeated, { "playerId": i } );
     }
-};
 
-EndGameManager.prototype.ProgressTimeout = function(data)
-{
-    this.UpdatePlayerStates();
-    
-    // Repeat the timer
-    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-    this.timer = cmpTimer.SetTimeout(this.entity, IID_EndGameManager, "ProgressTimeout", g_ProgressInterval, data);
-};
-
-EndGameManager.prototype.UpdatePlayerStates = function()
-{
-    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-    switch (this.gameType)
+    var allies = [];
+    for (var i = 0; i < numPlayers; i++)
     {
-    case "conquest":
+        if (cmpPlayers[i].GetState() != "active")
+            continue; // search for the first active player
 
-        // Ignore gaia
-        var numPlayers = cmpPlayerManager.GetNumPlayers() - 1;
-        var cmpPlayers = new Array(numPlayers);
-        
-        // If a player is currently active but has no suitable units left,
-        // mark that player as defeated
-        for (var i = 0; i < numPlayers; i++)
+        for (var j = 0; j < numPlayers; j++)
         {
-            var playerEntityId = cmpPlayerManager.GetPlayerByID(i+1);
-            cmpPlayers[i] = Engine.QueryInterface(playerEntityId, IID_Player);
-            if (cmpPlayers[i].GetState() == "active")
+            if (cmpPlayers[j].GetState() == "active")
             {
-                if (cmpPlayers[i].GetConquestCriticalEntitiesCount() == 0)
-                {   // Defeated - notify AIs by sending playerId
-                    Engine.PostMessage(playerEntityId, MT_PlayerDefeated, { "playerId": i } );
-                }
+                if (i == j || cmpPlayers[i].IsMutualAlly(j+1))
+                    allies.push(j);
+                else
+                    return;
             }
         }
+        break;
+    }
 
-        var onlyAlliesLeft = true;
-        var allies = [];
-        for (var i = 0; i < numPlayers && onlyAlliesLeft; i++)
-        {
-            if (cmpPlayers[i].GetState() == "active")
-            {   //Active player
-                for (var j = 0; j < numPlayers && onlyAlliesLeft; j++)
-                {
-                    if (cmpPlayers[j].GetState() == "active"
-                        && (cmpPlayers[i].IsEnemy(j+1) || cmpPlayers[j].IsEnemy(i+1)
-                            || cmpPlayers[i].IsNeutral(j+1) || cmpPlayers[j].IsNeutral(i+1)))
-                    {   // Only need to find an active non-allied player
-                        onlyAlliesLeft = false;
-                    }
-                }
-                
-                if (onlyAlliesLeft)
-                    allies.push(i);
-            }
-        }
+    // If only allies left and allied victory set (or only one player left)
+    if (!this.alliedVictory && allies.length != 1)
+        return;
+    for each (var p in allies)
+        cmpPlayers[p].SetState("won");
 
-        // If only allies left and allied victory set (or only one player left)
-        if (onlyAlliesLeft && (this.alliedVictory || allies.length == 1))
-        {
-            for each (var p in allies)
-            {
-                cmpPlayers[p].SetState("won");
-            }
-
-            // Reveal the map to all players
-            var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-            cmpRangeManager.SetLosRevealAll(-1, true);
-        }
-
-        break;
-
-    default:
-        error("Invalid game type "+this.gameType);
-        break;
-    }
+    // Reveal the map to all players
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    cmpRangeManager.SetLosRevealAll(-1, true);
 };
 
 Engine.RegisterComponentType(IID_EndGameManager, "EndGameManager", EndGameManager);

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

@@ -482 +482 @@
         if (cmpIdentity && cmpIdentity.HasClass("ConquestCritical"))
             this.conquestCriticalEntitiesCount--;
 
+        if (this.conquestCriticalEntitiesCount == 0)
+        {
+            // end game when needed
+            var cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
+            cmpEndGameManager.PlayerLostAllConquestCriticalEntities(this.playerID);
+        }
+
         if (cmpCost)
         {
             this.popUsed -= cmpCost.GetPopCost();

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

@@ -38 +38 @@
 
     var cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
     if (settings.GameType)
-    {
         cmpEndGameManager.SetGameType(settings.GameType);
-    }
-    cmpEndGameManager.Start();
 }
 
 Engine.RegisterGlobal("LoadMapSettings", LoadMapSettings);