Ticket #1571: redIcons.3.patch

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

@@ -567 +567 @@
     return ret;
 }
 
+// Used to show a red square over GUI elements you can't yet afford.
+GuiInterface.prototype.GetNeededResources = function(player, amounts){
+    var cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
+    return cmpPlayer.GetNeededResources(amounts);
+};
+
+
 GuiInterface.prototype.PushNotification = function(notification)
 {
     this.notifications.push(notification);
@@ -1617 +1624 @@
     "IsTechnologyResearched": 1,
     "CheckTechnologyRequirements": 1,
     "GetStartedResearch": 1,
+    "GetNeededResources": 1,
     "GetNextNotification": 1,
 
     "GetAvailableFormations": 1,

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

@@ -159 +159 @@
         this.resourceCount[type] += (+amounts[type]);
     }
 };
-
-Player.prototype.TrySubtractResources = function(amounts)
+Player.prototype.GetNeededResources = function(amounts)
 {
     // Check if we can afford it all
     var amountsNeeded = {};
@@ -171 +170 @@
     var formattedAmountsNeeded = [];
     for (var type in amountsNeeded)
         formattedAmountsNeeded.push(type + ": " + amountsNeeded[type]);
+    return formattedAmountsNeeded;
+};
+
+Player.prototype.TrySubtractResources = function(amounts)
+{
+    var formattedAmountsNeeded = this.GetNeededResources(amounts);
             
     // If we don't have enough resources, send a notification to the player
     if (formattedAmountsNeeded.length)

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

@@ -332 +332 @@
             case GATE:
                 var tooltip = item.tooltip;
                 if (item.template)
-                    tooltip += "\n" + getEntityCostTooltip(GetTemplateData(item.template));
+                {
+                    var template = GetTemplateData(item.template);
+
+                    var affordableMask = getGUIObjectByName("unitGateUnaffordable["+i+"]");
+                    affordableMask.hidden = true;
+                    var totalCosts = { "food" : 0, "wood" : 0, "stone" : 0, "metal" : 0 };
+                    for (var r in totalCosts)
+                        if (template.cost !== undefined)
+                            totalCosts[r] = Math.floor(template.cost[r]);
+                    var neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
+                    
+                    tooltip += "\n" + getEntityCostTooltip(template);
+                    
+                    if(neededResources.length)
+                    {
+                        affordableMask.hidden = false;
+                        tooltip += "\n[font=\"serif-bold-13\"]You don't have enough resources to convert this wall.[/font]";
+                    }
+                }
                 break;
 
             case STANCE:
@@ -415 +433 @@
 
         // Button
         var button = getGUIObjectByName("unit"+guiName+"Button["+i+"]");
-        var button1 = getGUIObjectByName("unit"+guiName+"Button["+(i+rowLength)+"]");
+        var button1 = getGUIObjectByName("unit"+guiName+"Button["+(i+rowLength)+"]");       
+        var affordableMask = getGUIObjectByName("unit"+guiName+"Unaffordable["+i+"]");
+        var affordableMask1 = getGUIObjectByName("unit"+guiName+"Unaffordable["+(i+rowLength)+"]");
         var icon = getGUIObjectByName("unit"+guiName+"Icon["+i+"]");
         var selection = getGUIObjectByName("unit"+guiName+"Selection["+i+"]");
         var pair = getGUIObjectByName("unit"+guiName+"Pair["+i+"]");
@@ -553 +573 @@
             
             if (guiName == RESEARCH)
             {
+                // Check resource requirements for first button
+                affordableMask.hidden = true;
+                var totalCosts = { "food" : 0, "wood" : 0, "stone" : 0, "metal" : 0 };
+                
+                for (var r in totalCosts)
+                    totalCosts[r] = Math.floor(template.cost[r]);
+                
+                var neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
+                if(neededResources.length)
+                {
+                    if(button.enabled !== false)
+                    {
+                        button.enabled = false;
+                        affordableMask.hidden = false;
+                    }
+                    button.tooltip += "\n\n[font=\"serif-bold-13\"]Insufficient resources:[/font]\n"+neededResources.join(", ");
+                }
+
                 if (item.pair)
                 {
                     grayscale = "";
                     button1.enabled = true;
-                    if (guiName == RESEARCH && !Engine.GuiInterfaceCall("CheckTechnologyRequirements", entType1))
+
+                    if (!Engine.GuiInterfaceCall("CheckTechnologyRequirements", entType1))
                     {
                         button1.enabled = false;
                         button1.tooltip += "\n" + GetTechnologyData(entType1).requirementsTooltip;
                         grayscale = "grayscale:";
                     }
                     icon1.sprite = "stretched:" + grayscale + "session/portraits/" +template1.icon;
+
+                    // Check resource requirements for second button
+                    affordableMask1.hidden = true;
+                    totalCosts = { "food" : 0, "wood" : 0, "stone" : 0, "metal" : 0 };
+                    
+                    for (var r in totalCosts)
+                        totalCosts[r] = Math.floor(template1.cost[r]);
+                    
+                    neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
+                    if(neededResources.length)
+                    {
+                        if(button1.enabled !== false)
+                        {
+                            button1.enabled = false;
+                            affordableMask1.hidden = false;
+                        }
+                        button1.tooltip += "\n\n[font=\"serif-bold-13\"]Insufficient resources:[/font]\n"+neededResources.join(", ");
+                    }
                 }
                 else
                 {
                     pair.hidden = true;
                     button1.hidden = true;
+                    affordableMask1.hidden = true;
+                }
+            }
+            if(guiName == CONSTRUCTION || guiName == TRAINING)
+            {
+                affordableMask.hidden = true;
+                var totalCosts = { "food" : 0, "wood" : 0, "stone" : 0, "metal" : 0 };
+                var totalCost = 0;
+                var trainNum = 1;
+                if (Engine.HotkeyIsPressed("session.batchtrain") && guiName == TRAINING)
+                {
+                    var [batchSize, batchIncrement] = getTrainingBatchStatus(unitEntState.id, entType);
+                    trainNum = batchSize + batchIncrement;
                 }
+                for (var r in totalCosts)
+                {
+                    // Walls have no cost defined.
+                    if (template.cost !== undefined)
+                    {
+                        totalCosts[r] = Math.floor(template.cost[r]*trainNum);
+                        totalCost += totalCosts[r];
+                    }
+                }
+                var neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
+                if(neededResources.length)
+                {
+                    if(button.enabled !== false)
+                    {
+                        button.enabled = false;
+                        affordableMask.hidden = false;
+                        var alpha = 75 + totalCost/6;
+                        alpha = alpha > 150 ? 150 : alpha;
+                        affordableMask.sprite = "colour: 255 0 0 " + (alpha);
+                    }
+                    button.tooltip += "\n\n[font=\"serif-bold-13\"]Insufficient resources:[/font]\n"+neededResources.join(", ");
+                }
             }
         }
         else
@@ -718 +810 @@
                 var buyPrice = unitEntState.barterMarket.prices["buy"][resource];
                 amountToBuy = "+" + Math.round(sellPrice / buyPrice * amountToSell);
             }
+
             var amount;
             if (j == 0)
             {
                 button.onpress = (function(i) { return function() { g_barterSell = i; } })(i);
-                amount = (i == g_barterSell) ? "-" + amountToSell : "";
+                if (i == g_barterSell)
+                {
+                    amount = "-" + amountToSell;
+                    
+                    var neededRess = {};
+                    neededRess[resource] = amountToSell;
+                    var neededResources = Engine.GuiInterfaceCall("GetNeededResources", neededRess );
+                    var hidden = (neededResources.length === 0);
+                    for (var ii = 0; ii < BARTER_RESOURCES.length; ii++)
+                    {
+                        var affordableMask = getGUIObjectByName("unitBarterBuyUnaffordable["+ii+"]");
+                        affordableMask.hidden = hidden;
+                    }
+                }
+                else
+                {
+                    amount = "";
+                }
             }
             else
             {

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

@@ -603 +603 @@
             <repeat count="4">
                 <object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
                 <object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+                <object name="unitBarterSellUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
                 <object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
                 <object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
                 </object>
@@ -612 +613 @@
             <repeat count="4">
                 <object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
                 <object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+                <object name="unitBarterBuyUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
                 <object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
                 </object>
             </repeat>
@@ -822 +824 @@
             <repeat count="24">
                 <object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
                 <object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+                <object name="unitConstructionUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
                 </object>
             </repeat>
             </object>
@@ -835 +838 @@
                 <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="unitResearchSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
+                <object name="unitResearchUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
                 </object>
             </repeat>
             <repeat count="8">
@@ -852 +856 @@
             <repeat count="24">
                 <object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
                 <object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+                <object name="unitTrainingUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
                 </object>
             </repeat>
             </object>
@@ -898 +903 @@
                 <object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
                 <object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
                 <object name="unitGateSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
+                <object name="unitGateUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
                 </object>
             </repeat>
             </object>