Ticket #2445: teambonus_withauras.7.diff

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

@@ -85 +85 @@
 Auras.prototype.CalculateAffectedPlayers = function(name)
 {
     var affectedPlayers = this.auras[name].affectedPlayers || ["Player"];
     this.affectedPlayers[name] = [];
 
-    var cmpPlayer = QueryOwnerInterface(this.entity);
+    var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    if (!cmpPlayer)
+        cmpPlayer = QueryOwnerInterface(this.entity);
     if (!cmpPlayer)
         return;
 
     var numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
     for (var i = 0; i < numPlayers; ++i)
@@ -384 +386 @@
     this.Clean();
 };
 
 Auras.prototype.OnDiplomacyChanged = function(msg)
 {
-    var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
-    if (cmpOwnership && cmpOwnership.GetOwner() == msg.player)
+    var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    if (cmpPlayer && (cmpPlayer.GetPlayerID() == msg.player || cmpPlayer.GetPlayerID() == msg.otherPlayer) ||
+       IsOwnedByPlayer(msg.player, this.entity) ||
+       IsOwnedByPlayer(msg.otherPlayer, this.entity))
         this.Clean();
 };
 
 Auras.prototype.OnGlobalResearchFinished = function(msg)
 {
-    let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
-    if (!cmpOwnership || cmpOwnership.GetOwner() != msg.player)
+    var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    if ((!cmpPlayer || cmpPlayer.GetPlayerID() != msg.player) && !IsOwnedByPlayer(msg.player, this.entity))
         return;
     let auraNames = this.GetAuraNames();
     let needsClean = false;
     for (let name of auraNames)
     {

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

@@ -387 +387 @@
 
             this.SetAlly(i);
             cmpPlayer.SetAlly(this.playerID);
         }
 
-    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID });
+    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID, "otherPlayer": null });
 };
 
 Player.prototype.SetLockTeams = function(value)
 {
     this.teamsLocked = value;
@@ -408 +408 @@
 };
 
 Player.prototype.SetDiplomacy = function(dipl)
 {
     this.diplomacy = dipl;
-    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID });
+    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID, "otherPlayer": null });
 };
 
 Player.prototype.SetDiplomacyIndex = function(idx, value)
 {
     var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
@@ -425 +425 @@
 
     if (this.state != "active" || cmpPlayer.state != "active")
         return;
 
     this.diplomacy[idx] = value;
-    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID });
+    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID, "otherPlayer": cmpPlayer.GetPlayerID() });
 
     // Mutual worsening of relations
     if (cmpPlayer.diplomacy[this.playerID] > value)
         cmpPlayer.SetDiplomacyIndex(this.playerID, value);
 };

binaries/data/mods/public/simulation/data/technologies/hellenes/teambonus_athen_delian_league.json

@@ -1 @@
-{
-    "genericName": "Delian League",
-    "autoResearch": true,
-    "description": "Shortly after the great naval victories at Salamis and Mycale, the Greek city-states instituted the so-called Delian League in 478 BC, whose purpose was to push the Persians out of the Aegean region. The allied states contributed ships and money, while the Athenians offered their entire navy.",
-    "requirements": {"civ": "athen"},
-    "modifications": [{"value": "Cost/BuildTime", "multiply": 0.75}],
-    "affects": ["Warship"]
-}
- Pas de fin de ligne à la fin du fichier

binaries/data/mods/public/simulation/templates/special/player_athen.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special/player">
+  <Auras datatype="tokens">teambonuses/athen_player_teambonus</Auras>
+</Entity>

binaries/data/mods/public/simulation/templates/special/player_iber.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special/player">
+  <Auras datatype="tokens">teambonuses/iber_player_teambonus</Auras>
+</Entity>

binaries/data/mods/public/simulation/templates/special/player_sele.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="special/player">
+  <Auras datatype="tokens">teambonuses/sele_player_teambonus</Auras>
   <EntityLimits>
     <LimitRemovers>
       <CivilCentre>
         <RequiredTechs datatype="tokens">phase_town</RequiredTechs>
         <RequiredClasses datatype="tokens">Hero</RequiredClasses>