Ticket #1659: queuecapacitytweak2.diff

binaries/data/mods/public/gui/session/sprites.xml

@@ -684 +684 @@
         <image backcolor="0 255 0 128"/>
     </sprite>
 
+    <sprite name="queueProgressLamp">
+        <image backcolor="255 165 0 128"/>
+    </sprite>
+
     <sprite name="healthBackground">
         <image backcolor="red"/>
     </sprite>

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

@@ -322 +322 @@
                 break;
 
             case QUEUE:
+                var slider = getGUIObjectByName("unit"+guiName+"ProgressSlider["+i+"]");
+                var lamp = getGUIObjectByName("unit"+guiName+"ProgressLamp["+i+"]");
                 var tooltip = getEntityNames(template);
+                if (item.slots < 0) {
+                    tooltip += "\nInsufficient population capacity: [color=\"red\"]"+Math.abs(item.slots)+"[/color]";
+                        // When training is blocked, flash icon (alternates colour every 500msec)
+                        if (g_IsTrainingBlocked && (Date.now() % 1000) < 500)
+                    {
+                        slider.hidden = true;
+                                lamp.hidden = false; //POPULATION_ALERT_COLOR
+                    }
+                        else
+                    {
+                        slider.hidden = true;
+                                lamp.hidden = true; //DEFAULT_POPULATION_COLOR
+                    }
+                }
+                else
+                {
+                    slider.hidden = false;
+                            lamp.hidden = true;
+                }
+
                 var progress = Math.round(item.progress*100) + "%";
                 getGUIObjectByName("unit"+guiName+"Count["+i+"]").caption = (item.count > 1 ? item.count : "");
 

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

@@ -894 +894 @@
                 <object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
                 <object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
                 <object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
+                <object name="unitQueueProgressLamp[n]" type="image" sprite="queueProgressLamp" ghost="true" size="3 3 37 37" z="20"/>
                 <object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
                 </object>
             </repeat>

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

@@ -353 +353 @@
             "unitTemplate": item.unitTemplate,
             "technologyTemplate": item.technologyTemplate,
             "count": item.count,
+            "slots": item.slots,
             "progress": 1-(item.timeRemaining/item.timeTotal),
             "metadata": item.metadata,
         });
@@ -506 +507 @@
             {
                 // Batch's training hasn't started yet.
                 // Try to reserve the necessary population slots
-                if (item.unitTemplate && !cmpPlayer.TryReservePopulationSlots(item.population * item.count))
+                item.slots = cmpPlayer.TryReservePopulationSlots(item.population * item.count);
+                if (item.unitTemplate && item.slots < 0)
                 {
                     // No slots available - don't train this batch now
                     // (we'll try again on the next timeout)

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

@@ -73 +73 @@
     return this.colour;
 };
 
+// Try reserving num population slots. Returns num if successful or the inverse of the number of missing slots if failed.
 Player.prototype.TryReservePopulationSlots = function(num)
 {
     if (num != 0 && num > (this.GetPopulationLimit() - this.GetPopulationCount()))
-        return false;
+        return (this.GetPopulationLimit() - this.GetPopulationCount()) - num;
 
     this.popUsed += num;
-    return true;
+    return num;
 };
 
 Player.prototype.UnReservePopulationSlots = function(num)