Ticket #4251: 4251_fix_v4.patch

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

@@ -743 +743 @@
             if (!state.production || !state.production.technologies)
                 continue;
             // Remove the techs we already have in ret (with the same name and techCostMultiplier)
             let filteredTechs = state.production.technologies.filter(
                 tech => tech != null && !ret.some(
-                    item => item.tech == tech && Object.keys(item.techCostMultiplier).every(
-                        k => item.techCostMultiplier[k] == state.production.techCostMultiplier[k]
-            )));
+                    item =>
+                        (item.tech == tech ||
+                            item.tech.pair &&
+                            tech.pair &&
+                            item.tech.bottom == tech.bottom &&
+                            item.tech.top == tech.top) &&
+                        Object.keys(item.techCostMultiplier).every(
+                            k => item.techCostMultiplier[k] == state.production.techCostMultiplier[k])
+            ));
 
             if (filteredTechs.length + ret.length <= this.getMaxNumberOfItems() &&
                 getNumberOfRightPanelButtons() <= this.getMaxNumberOfItems() * (filteredTechs.some(tech => !!tech.pair) ? 1 : 2))
                 ret = ret.concat(filteredTechs.map(tech => ({
                     "tech": tech,

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

@@ -335 +335 @@
             // Load the technology template
             var cmpDataTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_DataTemplateManager);
             var template = cmpDataTemplateManager.GetTechnologyTemplate(templateName);
             if (!template)
                 return;
-            if (this.GetTechnologiesList().indexOf(templateName) == -1)
+            if (!this.GetTechnologiesList().some(tech =>
+                tech &&
+                    (tech == templateName ||
+                        tech.pair &&
+                        (tech.top == templateName || tech.bottom == templateName))))
             {
-                warn("This entity cannot research " + JSON.stringify(templateName));
+                error("This entity cannot research " + uneval(templateName) +
+                    ". It can only research: " + uneval(this.GetTechnologiesList()));
                 return;
             }
             var cmpPlayer = QueryOwnerInterface(this.entity);
             let techCostMultiplier = this.GetTechCostMultiplier();
             let time =  techCostMultiplier.time * template.researchTime * cmpPlayer.GetCheatTimeMultiplier();