Ticket #3930: 3930.4.diff

binaries/data/mods/public/gui/session/selection_panels.js

@@ -800 +800 @@
         data.entType = data.item.pair ? [data.item.top, data.item.bottom] : [data.item];
         data.template = data.entType.map(GetTechnologyData);
         // abort if no template found for any of the techs
         if (data.template.some(v => !v))
             return false;
+        data.template = data.template.map(t => Engine.GuiInterfaceCall("GetModifiedTechnologyCosts", {
+            "template": t,
+            "ent": data.unitEntState.id
+        }));
         // index one row below
         var shiftedIndex = data.i + data.rowLength;
         data.positions = data.item.pair ? [data.i, shiftedIndex] : [shiftedIndex];
         data.positionsToHide = data.item.pair ? [] : [data.i];
 

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

@@ -621 +621 @@
 
     let cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
     return GetTechnologyDataHelper(template, cmpPlayer.GetCiv());
 };
 
+GuiInterface.prototype.GetModifiedTechnologyCosts = function(player, data)
+{
+    for (let c in data.template.cost)
+        data.template.cost[c] = ApplyValueModificationsToEntity("Technology/Cost/"+c, +data.template.cost[c], data.ent);
+    return data.template;
+};
+
 GuiInterface.prototype.IsTechnologyResearched = function(player, data)
 {
     if (!data.tech)
         return true;
 
@@ -1929 +1936 @@
     "GetEntityState": 1,
     "GetExtendedEntityState": 1,
     "GetAverageRangeForBuildings": 1,
     "GetTemplateData": 1,
     "GetTechnologyData": 1,
+    "GetModifiedTechnologyCosts": 1,
     "IsTechnologyResearched": 1,
     "CheckTechnologyRequirements": 1,
     "GetStartedResearch": 1,
     "GetBattleState": 1,
     "GetIncomingAttacks": 1,

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

@@ -319 +319 @@
             var cmpDataTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_DataTemplateManager);
             var template = cmpDataTemplateManager.GetTechnologyTemplate(templateName);
             if (!template)
                 return;
             var cmpPlayer = QueryOwnerInterface(this.entity);
-            var time = template.researchTime * cmpPlayer.GetCheatTimeMultiplier();
+            var time = ApplyValueModificationsToEntity("Technology/Cost/time", +template.researchTime, this.entity) * cmpPlayer.GetCheatTimeMultiplier();
 
             var cost = {};
-            for each (var r in ["food", "wood", "stone", "metal"])
-                cost[r] = Math.floor(template.cost[r]);
+            for (let res in template.cost)
+                cost[res] = Math.floor(ApplyValueModificationsToEntity("Technology/Cost/"+res, +template.cost[res], this.entity));
             
             // TrySubtractResources should report error to player (they ran out of resources)
             if (!cmpPlayer.TrySubtractResources(cost))
                 return;
             

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

@@ +1 @@
+{
+    "type": "global",
+    "affectedPlayers": ["MutualAlly"],
+    "affects": ["Temple"],
+    "modifications": [
+        { "value": "Technology/Cost/wood", "multiply": 0.5 },
+        { "value": "Technology/Cost/food", "multiply": 0.5 },
+        { "value": "Technology/Cost/metal", "multiply": 0.5 },
+        { "value": "Technology/Cost/stone", "multiply": 0.5 },
+        { "value": "Technology/Cost/time", "multiply": 0.5 }
+    ],
+    "auraDescription": "All allied Temple technologies -50% cost and -50% research time.",
+    "auraName": "Evangelism Aura",
+    "overlayIcon": "art/textures/ui/session/auras/build_bonus.png"
+}

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

@@ +1 @@
+{
+    "type": "garrison",
+    "affects": ["Structure"],
+    "modifications": [
+        { "value": "Technology/Cost/time", "multiply": 0.5 }
+    ],
+    "auraDescription": "Empower a building with -50% research time.",
+    "auraName": "Teacher Aura",
+    "overlayIcon": "art/textures/ui/session/auras/build_bonus.png"
+}

binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml

@@ -15 +15 @@
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Infantry</List>
+    <List datatype="tokens">Infantry Healer</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>

binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
+  <Auras datatype="tokens">maur_hero_ashoka</Auras>
   <Footprint replace="">
     <Square width="6.0" depth="12.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>

binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml

@@ -3 +3 @@
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <Heal>
-    <Range>20</Range>
-    <HP>12</HP>
-    <Rate>2000</Rate>
-    <UnhealableClasses datatype="tokens"/>
-    <HealableClasses datatype="tokens">Human</HealableClasses>
-  </Heal>
+  <Auras datatype="tokens">maur_hero_chanakya</Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>60</BuildTime>
     <Resources>
       <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
+  <Heal>
+    <Range>20</Range>
+    <HP>12</HP>
+    <Rate>2000</Rate>
+    <UnhealableClasses datatype="tokens"/>
+    <HealableClasses datatype="tokens">Human</HealableClasses>
+  </Heal>
   <Health>
     <Max>600</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
-    <Classes datatype="tokens">Human Organic</Classes>
+    <Classes datatype="tokens">Human Organic Support</Classes>
     <VisibleClasses datatype="tokens">Hero Healer</VisibleClasses>
     <GenericName>Acharya Chanakya</GenericName>
     <SpecificName>Acharya Chāṇakya</SpecificName>
     <Icon>units/maur_hero_chanakya.png</Icon>
     <Tooltip>Hero Special: "Healer" - Heal units at an accelerated rate.
-Hero Special: "Teacher" - Empower a building to research and train +50% faster.
 Hero Special: "Philosopher" - Research 4 special technologies only available to Chanakya.</Tooltip>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Minimap>
     <Type>hero</Type>