Ticket #2445: teambonus.diff

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

@@ -131 +131 @@
     if (!reqs)
         return true;
     
+    // function to check the requirements on a different player, given a relation function
+    // The relation is a string like "IsAlly", "IsEnemy" ...
+    var otherPlayerCheck = function(relation, ent) {
+        var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+        var numPlayers = cmpPlayerManager.GetNumPlayers();
+        var cmpPlayer = Engine.QueryInterface(ent, IID_Player);
+        for (var p = 1; p < numPlayers; p++)
+        {
+            if (!cmpPlayer[relation](p))
+                continue;
+            var playerEntID = cmpPlayerManager.GetPlayerByID(p)
+            var cmpTechnologyManager = Engine.QueryInterface(playerEntID, IID_TechnologyManager);
+            if (cmpTechnologyManager.CheckTechnologyRequirements(reqs.ally))
+                return true;
+        }
+        return false;
+    }
     if (reqs.tech)
     {
         return this.IsTechnologyResearched(reqs.tech);
@@ -178 +195 @@
         else 
             return false;
     }
-    
+    else if (reqs.ally)
+        return otherPlayerCheck("IsAlly", this.entity);
+    else if (reqs.mutualAlly)
+        return otherPlayerCheck("IsMutualAlly", this.entity);
+    else if (reqs.enemy)
+        return otherPlayerCheck("IsEnemyAlly", this.entity);
+
     // The technologies requirements are not a recognised format
     error("Bad requirements " + uneval(reqs));
     return false;

binaries/data/mods/public/simulation/data/technologies/iberians/teambonus_saripeko.json

@@ +1 @@
+{
+    "description": "Reduces the cost for skirmishers with 20% for allies of Iberian players",
+    "autoResearch": true,
+    "requirements": {"mutualAlly": {"civ": "iber"}},
+    "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}],
+    "affects": ["CitizenSoldier Javelin"]
+}

binaries/data/mods/public/simulation/data/technologies/successors/teambonus_syrian_tetrapolis.json

@@ +1 @@
+{
+    "description": "Reduces the cost for civil centers with 20% for allies of Seleucid players",
+    "autoResearch": true,
+    "requirements": {"mutualAlly": {"civ": "sele"}},
+    "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}],
+    "affects": ["CivCenter"]
+}