Ticket #3823: upgrade2.patch

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

@@ -1111 +1111 @@
 
         let neededResources;
         if (data.item.cost)
+        {
+            for(let cost in data.item.cost)
+                data.item.cost[cost] =
+                    (cost == "time" ? 1 : data.unitEntStates.length) *
+                    +data.item.cost[cost];
+
             neededResources = Engine.GuiInterfaceCall("GetNeededResources", {
                 "cost": data.item.cost,
                 "player": data.player
             });
+        }
 
         let limits = getEntityLimitAndCount(data.playerState, data.item.entity);
         let progress = data.unitEntStates[0].upgrade.progress || 0;
@@ -1176 +1183 @@
         data.icon.sprite = modifier + "stretched:session/" +
             (data.item.icon || "portraits/" + template.icon);
 
+        data.countDisplay.caption = data.unitEntStates.length > 1 ? data.unitEntStates.length : "";
+
         let progressOverlay = Engine.GetGUIObjectByName("unitUpgradeProgressSlider[" + data.i + "]");
         if (isUpgrading)
         {

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

@@ -9 +9 @@
         <object name="unitUpgradeUpgradeIcon[n]" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/upgrade.png"/>
         <object name="unitUpgradeProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 43 43" z="20"/>
         <object name="unitUpgradeSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
+        <object name="unitUpgradeCount[n]" ghost="true" style="groupIconsText" type="text" z="30"/>
         </object>
     </repeat>
     </object>