Ticket #2749: t2749_prevent_neutral_players_from_attacking_each_other.patch

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

@@ -67 +67 @@
     // Before changing the value, activate Fogging if necessary to hide changes
     var cmpFogging = Engine.QueryInterface(this.entity, IID_Fogging);
     if (cmpFogging)
         cmpFogging.Activate();
 
-    var enemiesFilter = function(v, i) { return v > 0 && !cmpPlayerSource.IsAlly(i); };
+    var enemiesFilter = function(v, i) { return v > 0 && cmpPlayerSource.IsEnemy(i); };
     var numberOfEnemies = this.cp.filter(enemiesFilter).length;
 
     if (numberOfEnemies == 0)
         return 0;
 
     // distribute the capture points over all enemies
     var distributedAmount = amount / numberOfEnemies;
     for (let i in this.cp)
     {
-        if (cmpPlayerSource.IsAlly(i))
+        if (!cmpPlayerSource.IsEnemy(i))
             continue;
         if (this.cp[i] > distributedAmount)
             this.cp[i] -= distributedAmount;
         else
             this.cp[i] = 0;
@@ -119 +119 @@
     if (!cmpPlayerSource)
         warn(playerID + " has no player component defined on its id");
     var cp = this.GetCapturePoints()
     var sourceEnemyCp = 0;
     for (let i in this.GetCapturePoints())
-        if (!cmpPlayerSource.IsAlly(i))
+        if (cmpPlayerSource.IsEnemy(i))
             sourceEnemyCp += cp[i];
     return sourceEnemyCp > 0;
 };
 
 //// Private functions ////

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

@@ -1737 +1737 @@
     var cmpTargetPlayer = QueryOwnerInterface(data.target, IID_Player);
     if (!cmpEntityPlayer || !cmpTargetPlayer)
         return false;
 
     // if the owner is an enemy, it's up to the attack component to decide
-    if (!cmpEntityPlayer.IsAlly(cmpTargetPlayer.GetPlayerID()))
+    if (cmpEntityPlayer.IsEnemy(cmpTargetPlayer.GetPlayerID()))
         return cmpAttack.CanAttack(data.target);
     return false;
 };
 
 /*