Ticket #4455: fixAssumptions_v1-1.patch

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

@@ -367 +367 @@
 
     ret.cost = { "time": template.researchTime ? +template.researchTime : 0 };
     for (let type of resources.GetCodes())
-        ret.cost[type] = template.cost ? +template.cost[type] : 0;
+        ret.cost[type] = +(template.cost && template.cost[type] || 0);
 
     ret.tooltip = template.tooltip;
     ret.requirementsTooltip = template.requirementsTooltip || "";

binaries/data/mods/public/gui/structree/draw.js

@@ -183 +183 @@
                     prod = g_ParsedData.units[prod];
                     break;
                 case "techs":
-                    prod = clone(g_ParsedData.techs[civCode][prod]);
+                    prod = clone(g_ParsedData.techs[g_SelectedCiv][prod]);
                     for (let res in trainer.techCostMultiplier)
                         if (prod.cost[res])
                             prod.cost[res] *= trainer.techCostMultiplier[res];

binaries/data/mods/public/gui/structree/helper.js

@@ -80 +80 @@
     }
 
     if (!g_ParsedData.techs[g_SelectedCiv][techName])
-        warn(g_SelectedCiv + " : " + techName);
+    {
+        warn("The \"" + techName + "\" technology is not researchable in any structure buildable by the " + g_SelectedCiv + " civilisation, but is required by something that this civ *can* research, train or build!");
+        g_ParsedData.techs[g_SelectedCiv][techName] = loadTechnology(techName);
+    }
+
     let techReqs = g_ParsedData.techs[g_SelectedCiv][techName].reqs;
     if (!techReqs)
         return false;
@@ -91 +95 @@
             {
                 if (basename(tech).slice(0, 5) === "phase")
                     return tech;
+                if (basename(tech).slice(0, 4) === "pair")
+                    continue;
                 phaseIdx = Math.max(phaseIdx, g_ParsedData.phaseList.indexOf(GetPhaseOfTechnology(tech)));
             }
     return g_ParsedData.phaseList[phaseIdx] || false;

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

@@ -245 +245 @@
         buildList[phase].push(structCode);
     }
     for (let unitCode of g_Lists.units)
-        if (g_ParsedData.units[unitCode] && g_ParsedData.units[unitCode].production)
+        if (g_ParsedData.units[unitCode] && g_ParsedData.units[unitCode].production && Object.keys(g_ParsedData.units[unitCode].production).length)
+        {
+            // Splice out any `pair_*` techs for the actual techs of that pair
+            if (g_ParsedData.units[unitCode].production.techs)
+                for (let prod of g_ParsedData.units[unitCode].production.techs)
+                    if (prod in techPairs)
+                        g_ParsedData.units[unitCode].production.techs.splice(
+                            g_ParsedData.units[unitCode].production.techs.indexOf(prod),
+                            1, ...techPairs[prod].techs
+                        );
+
             trainerList.push(unitCode);
+        }
 
     g_CivData[g_SelectedCiv].buildList = buildList;
     g_CivData[g_SelectedCiv].trainList = trainerList;