Ticket #2445: teambonus_withauras.diff

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

@@ -84 +84 @@
 
 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)
     {
         for (let p of affectedPlayers)
         {
@@ -384 +384 @@
     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 || IsOwnedByPlayer(msg.player, 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/data/auras/iber_player_teambonus.json

@@ +1 @@
+{
+    "type": "global",
+    "affects": ["CitizenSoldier Javelin"],
+    "affectedPlayers": ["ExclusiveMutualAlly"],
+    "modifications": [
+        { "value": "Cost/Resources/food", "multiply": 0.8 },
+        { "value": "Cost/Resources/wood", "multiply": 0.8 },
+        { "value": "Cost/Resources/metal", "multiply": 0.8 },
+        { "value": "Cost/Resources/stone", "multiply": 0.8 }
+    ],
+    "auraName": "Saripeko",
+    "auraDescription": "Reduces the cost for citizen-soldier skirmishers with 20% for allies of Iberian players"
+}

binaries/data/mods/public/simulation/data/auras/sele_player_teambonus.json

@@ +1 @@
+{
+    "type": "global",
+    "affects": ["CivilCentre"],
+    "affectedPlayers": ["MutualAlly"],
+    "modifications": [
+        { "value": "Cost/Resources/food", "multiply": 0.8 },
+        { "value": "Cost/Resources/wood", "multiply": 0.8 },
+        { "value": "Cost/Resources/metal", "multiply": 0.8 },
+        { "value": "Cost/Resources/stone", "multiply": 0.8 }
+    ],
+    "auraName": "Syryan Tetrapolis",
+    "auraDescription": "Reduces the cost for civil centers with 20% for allies of Seleucid players"
+}

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">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">sele_player_teambonus</Auras>
   <EntityLimits>
     <LimitRemovers>
       <CivilCentre>
         <RequiredTechs datatype="tokens">phase_town</RequiredTechs>
         <RequiredClasses datatype="tokens">Hero</RequiredClasses>