Ticket #4384: remove_caputre_points_of_defeated_players_v1.patch

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

@@ -76 +76 @@
     if (numberOfEnemies == 0)
         return 0;
 
-    // distribute the capture points over all enemies
+    // Distribute the capture points over all enemies
     let distributedAmount = amount / numberOfEnemies;
     let removedAmount = 0;
     while (distributedAmount > 0.0001)
@@ -111 +111 @@
 };
 
 /**
+ * Transfer the players capture points to gaia.
+ */
+Capturable.prototype.RemovePlayer = function(playerID)
+{
+    if (!this.cp[playerID])
+        return;
+
+    this.cp[0] += this.cp[playerID];
+    this.cp[playerID] = 0;
+    this.RegisterCapturePointsChanged();
+    this.CheckTimer();
+}
+
+/**
  * Check if the source can (re)capture points from this building
  */
 Capturable.prototype.CanCapture = function(playerID)
@@ -130 +144 @@
 //// Private functions ////
 
 /**
- * this has to be called whenever the capture points are changed.
+ * This has to be called whenever the capture points are changed.
  * It notifies other components of the change, and switches ownership when needed
  */
 Capturable.prototype.RegisterCapturePointsChanged = function()
@@ -145 +159 @@
     if (owner == -1 || this.cp[owner] > 0)
         return;
 
-    // if all cp has been taken from the owner, convert it to the best player
+    // If all cp has been taken from the owner, convert it to the best player
     var bestPlayer = 0;
     for (let i in this.cp)
         if (this.cp[i] >= this.cp[bestPlayer])
@@ -185 +199 @@
     var owner = cmpOwnership.GetOwner();
     var modifiedCp = 0;
 
-    // special handle for the territory decay
-    // reduce cp from the owner in favour of all neighbours (also allies)
+    // Special handle for the territory decay.
+    // Reduce cp from the owner in favour of all neighbours (also allies).
     var cmpTerritoryDecay = Engine.QueryInterface(this.entity, IID_TerritoryDecay);
     if (cmpTerritoryDecay && cmpTerritoryDecay.IsDecaying())
     {
@@ -214 +228 @@
     if (modifiedCp)
         return;
 
-    // nothing changed, stop the timer
+    // Nothing changed, stop the timer
     var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
     cmpTimer.CancelTimer(this.timer);
     this.timer = 0;
@@ -290 +304 @@
     }
     else
     {
-        // initialise the capture points when created
+        // Initialise the capture points when created
         var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
         for (let i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
             if (i == msg.to)

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

@@ -381 +381 @@
         cmpRangeManager.SetLosRevealAll(this.playerID, true);
     else
     {
-        // Reassign all player's entities to Gaia
-        let entities = cmpRangeManager.GetEntitiesByPlayer(this.playerID);
 
+        let ownedEntities = [];
+        let otherEntities = [];
+        let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+        for (let i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
+        {
+            let entities = cmpRangeManager.GetEntitiesByPlayer(i);
+
+            if (i == this.playerID)
+                ownedEntities = ownedEntities.concat(entities);
+            else
+                otherEntities = otherEntities.concat(entities);
+        }
+
+        // Reassign all player's entities to Gaia
         // The ownership change is done in two steps so that entities don't hit idle
         // (and thus possibly look for "enemies" to attack) before nearby allies get
         // converted to Gaia as well.
-        for (let entity of entities)
+        for (let entity of ownedEntities)
         {
             let cmpOwnership = Engine.QueryInterface(entity, IID_Ownership);
             cmpOwnership.SetOwnerQuiet(0);
         }
 
         // With the real ownership change complete, send OwnershipChanged messages.
-        for (let entity of entities)
+        for (let entity of ownedEntities)
             Engine.PostMessage(entity, MT_OwnershipChanged, {
                 "entity": entity,
                 "from": this.playerID,
                 "to": 0
             });
+
+        // Remove capture points from other entities
+        for (let entity of otherEntities)
+        {
+            let cmpCapturable = Engine.QueryInterface(entity, IID_Capturable);
+            if (cmpCapturable)
+                cmpCapturable.RemovePlayer(this.playerID);
+        }
     }
 
     Engine.BroadcastMessage(won ? MT_PlayerWon : MT_PlayerDefeated, { "playerId": this.playerID });

binaries/data/mods/public/simulation/components/tests/test_Capturable.js

@@ -191 +191 @@
 testReduce(testData, 1500, 3, 1500);
 testReduce(testData, 2000, 3, 2000);
 testReduce(testData, 3000, 3, 2000);
+
+
+// Transfer capture points of defeatet players to gaia
+testCapturable(testData, cmpCapturable => {
+    cmpCapturable.SetCapturePoints([500, 1000, 0, 250]);
+    cmpCapturable.RemovePlayer(3);
+    TS_ASSERT_UNEVAL_EQUALS(cmpCapturable.GetCapturePoints(), [750, 1000, 0, 0]);
+});