Ticket #3689: techno.patch

binaries/data/mods/public/globalscripts/Templates.js

@@ -304 +304 @@
         "time": template.researchTime ? (+template.researchTime) : 0,
     }
     ret.tooltip = template.tooltip;
+    ret.requirementsTooltip = template.requirementsTooltip || "";
+    ret.pairRequirementsTooltip = template.pairRequirementsTooltip || "";
 
-    if (template.requirementsTooltip)
-        ret.requirementsTooltip = template.requirementsTooltip;
-    else
-        ret.requirementsTooltip = "";
-
     if (template.requirements && template.requirements.class)
         ret.classRequirements = {"class": template.requirements.class, "number": template.requirements.number};
 

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

@@ -751 +751 @@
     },
     "addData": function(data)
     {
-        data.entType = data.item.pair ? [data.item.top, data.item.bottom] : [data.item];
+        // index one row below
+        var shiftedIndex = data.i + data.rowLength;
+        // when a pair, data.item.top=null when one item already searched for
+        if (data.item.pair && data.item.top)
+        {
+            data.entType = [data.item.top, data.item.bottom];
+            data.positions = [data.i, shiftedIndex];
+            data.positionsToHide = [];
+        }
+        else
+        {
+            data.entType = data.item.pair ? [data.item.bottom] : [data.item];
+            data.positions = [shiftedIndex];
+            data.positionsToHide = [data.i];
+        }
         data.template = data.entType.map(GetTechnologyData);
         // abort if no template found for any of the techs
-        if (!data.template.every(function(v) { return v; }))
+        if (!data.template.every(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];
 
         // add top buttons to the data
-        data.button = data.positions.map(function(p) { 
-            return Engine.GetGUIObjectByName("unitResearchButton["+p+"]"); 
-        });
+        data.button = data.positions.map(p => Engine.GetGUIObjectByName("unitResearchButton["+p+"]")); 
 
-        data.buttonsToHide = data.positionsToHide.map(function(p) { 
-            return Engine.GetGUIObjectByName("unitResearchButton["+p+"]"); 
-        });
+        data.buttonsToHide = data.positionsToHide.map(p => Engine.GetGUIObjectByName("unitResearchButton["+p+"]"));
 
 
-        data.affordableMask = data.positions.map(function(p) { 
-            return Engine.GetGUIObjectByName("unitResearchUnaffordable["+p+"]");
-        });
+        data.affordableMask = data.positions.map(p => Engine.GetGUIObjectByName("unitResearchUnaffordable["+p+"]"));
 
-        data.icon = data.positions.map(function(p) { 
-            return Engine.GetGUIObjectByName("unitResearchIcon["+p+"]");
-        });
+        data.icon = data.positions.map(p => Engine.GetGUIObjectByName("unitResearchIcon["+p+"]"));
 
-        data.unchosenIcon = data.positions.map(function(p) { 
-            return Engine.GetGUIObjectByName("unitResearchUnchosenIcon["+p+"]");
-        });
+        if (data.item.researchBoth)
+            data.unchosenIcon = data.positions.map(p => Engine.GetGUIObjectByName("unitResearchDelayedIcon["+p+"]"));
+        else
+            data.unchosenIcon = data.positions.map(p => Engine.GetGUIObjectByName("unitResearchUnchosenIcon["+p+"]"));
 
-        data.neededResources = data.template.map(function(t) { 
-            return Engine.GuiInterfaceCall("GetNeededResources", t.cost);
-        });
+        data.neededResources = data.template.map(t => Engine.GuiInterfaceCall("GetNeededResources", t.cost));
 
-        data.requirementsPassed = data.entType.map(function(e) { 
-            return Engine.GuiInterfaceCall("CheckTechnologyRequirements",e); 
-        });
+        data.requirementsPassed = data.entType.map(e => Engine.GuiInterfaceCall("CheckTechnologyRequirements",e)); 
 
         data.pair = Engine.GetGUIObjectByName("unitResearchPair["+data.i+"]");
 
@@ -808 +807 @@
             tooltip += "\n" + getEntityCostTooltip(template);
             if (!data.requirementsPassed[i])
             {
-                tooltip += "\n" + template.requirementsTooltip;
+                if (!data.item.pair || data.item.top)
+                    tooltip += "\n" + template.requirementsTooltip;
+                else
+                    tooltip += "\n" + template.pairRequirementsTooltip;
                 if (template.classRequirements)
                 {
                     var player = Engine.GetPlayerID();
@@ -819 +821 @@
             }
             if (data.neededResources[i])
                 tooltip += getNeededResourcesTooltip(data.neededResources[i]);
+            if (data.item.pair && data.item.top)
+            {
+                if (data.item.researchBoth && template.pairRequirementsTooltip)
+                    tooltip += "\n(" + translate("second choice: ") + template.pairRequirementsTooltip +")";
+                else if (!data.item.researchBoth)
+                    tooltip += "\n(" + translate("no second choice") + ")";
+            }
             data.button[i].tooltip = tooltip;
         }
     },
@@ -879 +888 @@
         for (var button of data.buttonsToHide)
             button.hidden = true;
         // show the tech connector
-        data.pair.hidden = data.item.pair == null;
+        data.pair.hidden = data.item.pair == null || data.item.top == null;
     },
     "setPosition": function(data)
     {

binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml

@@ -7 +7 @@
         <object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
         <object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
         <object name="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
+        <object name="unitResearchDelayedIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_delayed.png"/>
         <object name="unitResearchUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="color: 255 0 0 60"/>
         </object>
     </repeat>

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

@@ -130 +130 @@
     if (!(technologyName in g_TechnologyData))
     {
         var template = Engine.GuiInterfaceCall("GetTechnologyData", technologyName);
-        translateObjectKeys(template, ["specific", "generic", "description", "tooltip", "requirementsTooltip"]);
+        translateObjectKeys(template, ["specific", "generic", "description", "tooltip", "requirementsTooltip", "pairRequirementsTooltip"]);
         g_TechnologyData[technologyName] = template;
     }
 

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

@@ -162 +162 @@
     var disabledTechnologies = cmpPlayer.GetDisabledTechnologies();
     
     // Add any top level technologies to an array which corresponds to the displayed icons
-    // Also store what a technology is superceded by in the superceded object {"tech1":"techWhichSupercedesTech1", ...}
-    for (var i in techs)
+    // Also store what a technology is superseded by in the superseded object {"tech1":"techWhichSupersedesTech1", ...}
+    for (let tech of techs)
     {
-        var tech = techs[i];
         if (disabledTechnologies && disabledTechnologies[tech])
             continue;
-        var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
+        let template = cmpTechnologyManager.GetTechnologyTemplate(tech);
         if (!template.supersedes || techs.indexOf(template.supersedes) === -1)
             techList.push(tech);
         else
@@ -176 +175 @@
     }
     
     // Now make researched/in progress techs invisible
-    for (var i in techList)
+    for (let i in techList)
     {
-        var tech = techList[i];
-        while (this.IsTechnologyResearchedOrInProgress(tech))
-        {
+        let tech = techList[i];
+        while (cmpTechnologyManager.IsTechnologyResearchedOrInProgress(tech))
             tech = superseded[tech];
-        }
-        
         techList[i] = tech;
     }
     
@@ -190 +186 @@
     var ret = [];
     
     // This inserts the techs into the correct positions to line up the technology pairs
-    for (var i = 0; i < techList.length; i++)
+    for (let i = 0; i < techList.length; ++i)
     {
-        var tech = techList[i];
+        let tech = techList[i];
         if (!tech)
         {
             ret[i] = undefined;
@@ -199 +195 @@
             continue;
         }
         
-        var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
+        let template = cmpTechnologyManager.GetTechnologyTemplate(tech);
         if (template.top)
-            ret[i] = {"pair": true, "top": template.top, "bottom": template.bottom};
+        {
+            if (cmpTechnologyManager.IsTechnologyResearchedOrInProgress(template.top))
+                ret[i] = {"pair": tech, "top": null, "bottom": template.bottom};
+            else if (cmpTechnologyManager.IsTechnologyResearchedOrInProgress(template.bottom))
+                ret[i] = {"pair": tech, "top": null, "bottom": template.top};
+            else
+                ret[i] = {"pair": tech, "top": template.top, "bottom": template.bottom, "researchBoth": template.researchBoth};
+        }
         else
             ret[i] = tech;
     }
@@ -209 +212 @@
     return ret;
 };
 
-ProductionQueue.prototype.IsTechnologyResearchedOrInProgress = function(tech)
-{
-    if (!tech)
-        return false;
-    
-    var cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager);
-    
-    var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
-    if (template.top)
-    {
-        return (cmpTechnologyManager.IsTechnologyResearched(template.top) || cmpTechnologyManager.IsInProgress(template.top)
-            || cmpTechnologyManager.IsTechnologyResearched(template.bottom) || cmpTechnologyManager.IsInProgress(template.bottom));
-    }
-    else
-    {
-        return (cmpTechnologyManager.IsTechnologyResearched(tech) || cmpTechnologyManager.IsInProgress(tech));
-    }
-};
-
 /*
  * Adds a new batch of identical units to train or a technology to research to the production queue.
  */

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

@@ -64 +64 @@
     {
         var tech = cmpTechTempMan.GetTemplate(key);
         if ((tech.autoResearch && this.CanResearch(key))
-            || (tech.top && (this.IsTechnologyResearched(tech.top) || this.IsTechnologyResearched(tech.bottom))))
+            || (tech.top && (this.IsTechnologyResearched(tech.top) && this.IsTechnologyResearched(tech.bottom))))
         {
             delete this.autoResearchTech[key];
             this.ResearchTechnology(key);
@@ -95 +95 @@
     return (this.researchedTechs[tech] !== undefined);
 };
 
+// Checks of a technology or pair has already been researched or is in progress
+TechnologyManager.prototype.IsTechnologyResearchedOrInProgress = function(tech)
+{
+    if (!tech)
+        return false;
+
+    let template = this.GetTechnologyTemplate(tech);
+    if (template.top)
+    {
+        if (template.researchBoth)
+            return (this.IsTechnologyResearched(template.top) || this.IsInProgress(template.top))
+             && (this.IsTechnologyResearched(template.bottom) || this.IsInProgress(template.bottom));
+        else
+            return  this.IsTechnologyResearched(template.top) || this.IsInProgress(template.top)
+              || this.IsTechnologyResearched(template.bottom) || this.IsInProgress(template.bottom);
+    }
+
+    return this.IsTechnologyResearched(tech) || this.IsInProgress(tech);
+};
+
 // Checks the requirements for a technology to see if it can be researched at the current time
 TechnologyManager.prototype.CanResearch = function(tech)
 {
@@ -109 +129 @@
     if (template.supersedes && !this.IsTechnologyResearched(template.supersedes))
         return false;
 
-    if (template.top && this.IsInProgress(template.top) ||
-        template.bottom && this.IsInProgress(template.bottom))
-        return false;
+    if (template.top)
+    {
+        if (template.researchBoth)
+            return !this.IsTechnologyResearchedOrInProgress(template.top) || !this.IsTechnologyResearchedOrInProgress(template.bottom);
+        else
+            return !this.IsTechnologyResearchedOrInProgress(template.top) && !this.IsTechnologyResearchedOrInProgress(template.bottom);
+    }
 
     if (template.pair && !this.CanResearch(template.pair))
         return false;
@@ -122 +146 @@
     if (this.IsTechnologyResearched(tech))
         return false;
 
-    return this.CheckTechnologyRequirements(template.requirements || null);
+    let requirements = template.requirements || null;
+    if (template.pair)
+    {
+        let pairTemplate = this.GetTechnologyTemplate(template.pair);
+        if (this.IsTechnologyResearchedOrInProgress(pairTemplate.top) || this.IsTechnologyResearchedOrInProgress(pairTemplate.bottom))
+            requirements = template.pairRequirements || requirements;
+    }
+    return this.CheckTechnologyRequirements(requirements);
 };
 
 // Private function for checking a set of requirements is met

binaries/data/mods/public/simulation/data/technologies/attack_tower_murderholes.json

@@ -1 +1 @@
 {
+    "pair": "pair_tower_range",
     "genericName": "Murder Holes",
     "description": "Murder holes allow hitting enemies at the foot of the tower.",
     "cost": {"food": 0, "wood": 250, "stone": 100, "metal": 0},
-    "requirements": {"tech": "phase_city"},
-    "requirementsTooltip": "Unlocked in City Phase.",
+    "requirements": {"tech": "phase_town"},
+    "requirementsTooltip": "Unlocked in Town Phase.",
+    "pairRequirements": {"tech": "phase_city"},
+    "pairRequirementsTooltip": "Unlocked in City Phase.",
     "icon": "murder_holes.png",
     "researchTime": 40,
     "tooltip": "Removes defense tower minimum range.",

binaries/data/mods/public/simulation/data/technologies/attack_tower_range.json

@@ -1 +1 @@
 {
+    "pair": "pair_tower_range",
     "genericName": "Arrow Shooters",
     "description": "Arrow shooters increase the maximum range of the fire arrows.",
     "cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250},
     "requirements": {"tech": "phase_town"},
     "requirementsTooltip": "Unlocked in Town Phase.",
+    "pairRequirements": {"tech": "phase_city"},
+    "pairRequirementsTooltip": "Unlocked in City Phase.",
     "icon": "arrow.png",
     "researchTime": 40,
     "tooltip": "Increases defense tower maximum range by 8 meters.",

binaries/data/mods/public/simulation/data/technologies/pair_tower_range.json

@@ +1 @@
+{
+    "genericName": "Tower Range",
+    "top": "attack_tower_range",
+    "bottom": "attack_tower_murderholes",
+    "researchBoth": true
+}

binaries/data/mods/public/simulation/data/technologies/pair_trade_convoys.json

@@ +1 @@
+{
+    "genericName": "Trade Convoys",
+    "top": "trade_convoys_speed",
+    "bottom": "trade_convoys_armor",
+    "researchBoth": true
+}

binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json

@@ -1 +1 @@
 {
+    "pair": "pair_trade_convoys",
     "genericName": "Trade Convoys",
     "description": "Increases defensive capability of traders.",
     "cost": {"food": 0, "wood": 0, "stone": 0, "metal": 200},
-    "requirements": {"tech": "phase_city"},
-    "requirementsTooltip": "Unlocked in City Phase.",
-    "supersedes": "trade_convoys_speed",
+    "requirements": {"tech": "phase_town"},
+    "requirementsTooltip": "Unlocked in Town Phase.",
+    "pairRequirements": {"tech": "phase_city"},
+    "pairRequirementsTooltip": "Unlocked in City Phase.",
     "icon": "wheel.png",
     "researchTime": 40,
     "tooltip": "Traders +2 Hack and Pierce armor levels.",

binaries/data/mods/public/simulation/data/technologies/trade_convoys_speed.json

@@ -1 +1 @@
 {
+    "pair": "pair_trade_convoys",
     "genericName": "Trade Convoys",
     "description": "Increases movement rate of traders, which in turn increases trade income.",
     "cost": {"food": 0, "wood": 0, "stone": 0, "metal": 200},
     "requirements": {"tech": "phase_town"},
     "requirementsTooltip": "Unlocked in Town Phase.",
+    "pairRequirements": {"tech": "phase_city"},
+    "pairRequirementsTooltip": "Unlocked in City Phase.",
     "icon": "wheel.png",
     "researchTime": 40,
     "tooltip": "Traders +25% Walk Speed, which quickly increases trade income.",

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

@@ -73 +73 @@
     <Technologies datatype="tokens">
       attack_tower_watch
       attack_tower_crenellations
-      attack_tower_range
-      attack_tower_murderholes
+      pair_tower_range
       attack_tower_defense
     </Technologies>
   </ProductionQueue>

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

@@ -53 +53 @@
   <ProductionQueue>
     <Technologies datatype="tokens">
       -attack_tower_crenellations
-      -attack_tower_range
-      -attack_tower_murderholes
+      -pair_tower_range
       -attack_tower_defense
     </Technologies>
   </ProductionQueue>

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

@@ -51 +51 @@
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       unlock_shared_los
-      trade_convoys_speed
-      trade_convoys_armor
+      pair_trade_convoys
       trade_gain_01
       trade_gain_02
     </Technologies>