Ticket #3930: 3930.diff

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

@@ -796 +796 @@
         Engine.GetGUIObjectByName("unitResearchPair["+i+"]").hidden = true;
     },
     "addData": function(data)
     {
         data.entType = data.item.pair ? [data.item.top, data.item.bottom] : [data.item];
-        data.template = data.entType.map(GetTechnologyData);
+//      data.template = data.entType.map(GetTechnologyData);
+        data.template = data.entType.map(t => Engine.GuiInterfaceCall("GetTechnologyData", {
+            "name": t,
+            "ent": data.unitEntState.id
+        }));
+
         // abort if no template found for any of the techs
         if (data.template.some(v => !v))
             return false;
+
         // 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/gui/session/session.js

@@ -192 +192 @@
 
 function GetTechnologyData(technologyName)
 {
     if (!(technologyName in g_TechnologyData))
     {
-        let template = Engine.GuiInterfaceCall("GetTechnologyData", technologyName);
+        let template = Engine.GuiInterfaceCall("GetTechnologyData", {name: technologyName, ent: null});
         translateObjectKeys(template, ["specific", "generic", "description", "tooltip", "requirementsTooltip"]);
         g_TechnologyData[technologyName] = template;
     }
 
     return g_TechnologyData[technologyName];

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

@@ -606 +606 @@
         aurasTemplate[name].auraDescription = auraTemplate.auraDescription || null;
     }
     return GetTemplateDataHelper(template, player, aurasTemplate);
 };
 
-GuiInterface.prototype.GetTechnologyData = function(player, name)
+GuiInterface.prototype.GetTechnologyData = function(player, data)
 {
     let cmpDataTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_DataTemplateManager);
-    let template = cmpDataTemplateManager.GetTechnologyTemplate(name);
+    let template = cmpDataTemplateManager.GetTechnologyTemplate(data.name);
 
     if (!template)
     {
-        warn("Tried to get data for invalid technology: " + name);
+        warn("Tried to get data for invalid technology: " + data.name);
         return null;
     }
 
     let cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
-    return GetTechnologyDataHelper(template, cmpPlayer.GetCiv());
+    let techData = GetTechnologyDataHelper(template, cmpPlayer.GetCiv());
+    if (!data.ent)
+        return techData;
+    for (let r of ["food", "wood", "stone", "metal"])
+        techData.cost[r] = ApplyValueModificationsToEntity("Technology/Resources/"+r, +techData.cost[r], data.ent);
+    techData.cost.time = ApplyValueModificationsToEntity("Technology/ResearchTime", +techData.cost.time, data.ent);
+    return techData;
 };
 
 GuiInterface.prototype.IsTechnologyResearched = function(player, data)
 {
     if (!data.tech)

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/ResearchTime", +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 r of ["food", "wood", "stone", "metal"])
+                cost[r] = Math.floor(ApplyValueModificationsToEntity("Technology/Resources/"+r, +template.cost[r], 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/Resources/wood", "multiply": 0.5 },
+    { "value": "Technology/Resources/food", "multiply": 0.5 },
+    { "value": "Technology/Resources/metal", "multiply": 0.5 },
+    { "value": "Technology/Resources/stone", "multiply": 0.5 },
+    { "value": "Technology/ResearchTime", "multiply": 0.5 }
+    ],
+    "auraDescription": "All allied Temple technologies -50% cost and 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/ResearchTime", "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>