Ticket #1849: darkenUnavailable.2.patch

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

@@ -1008 +1008 @@
             <repeat count="16">
                 <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="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
                 <object name="unitResearchUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
                 </object>
             </repeat>

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

@@ -554 +554 @@
                 button1.tooltip = tooltip1;
                 button1.onpress = (function(e){ return function() { callback(e) } })(item.top);
 
-                // We add a red overlay to the paired button (we reuse the selection for that)
-                button1.onmouseenter = (function(e){ return function() { setOverlay(e, true) } })(selection);
-                button1.onmouseleave = (function(e){ return function() { setOverlay(e, false) } })(selection);
+                // when we hover over a pair, the other one gets a red cross over it to show it won't be available any more.
+                var unchosenIcon = getGUIObjectByName("unit"+guiName+"UnchosenIcon["+i+"]");
+                var unchosenIcon1 = getGUIObjectByName("unit"+guiName+"UnchosenIcon["+(i+rowLength)+"]");
 
-                var selection1 = getGUIObjectByName("unit"+guiName+"Selection["+(i+rowLength)+"]");;
-                button.onmouseenter = (function(e){ return function() { setOverlay(e, true) } })(selection1);
-                button.onmouseleave = (function(e){ return function() { setOverlay(e, false) } })(selection1);
+                button1.onmouseenter = (function(e){ return function() { setOverlay(e, true) } })(unchosenIcon);
+                button1.onmouseleave = (function(e){ return function() { setOverlay(e, false) } })(unchosenIcon);
 
+                button.onmouseenter = (function(e){ return function() { setOverlay(e, true) } })(unchosenIcon1);
+                button.onmouseleave = (function(e){ return function() { setOverlay(e, false) } })(unchosenIcon1);
+
                 pair.hidden = false;
             }
             else
             {
-                // Hide the overlay
-                selection.hidden = true;
+                // Hide the overlay.
+                var unchosenIcon = getGUIObjectByName("unit"+guiName+"UnchosenIcon["+i+"]");
+                unchosenIcon.hidden = true;
             }
         }
 
@@ -664 +667 @@
         {
             var grayscale = "";
             button.enabled = true;
-            
+            if (affordableMask)
+                affordableMask.hidden = true;   // actually used for the red "lack of resource" overlay, and darkening if unavailable. Sort of a hack.
+    
+            // Turn the icon into grayscale and darken it if it's unavailable
             if (guiName != SELECTION && guiName != GARRISON && template.requiredTechnology && !Engine.GuiInterfaceCall("IsTechnologyResearched", template.requiredTechnology))
             {
                 button.enabled = false;
                 var techName = getEntityNames(GetTechnologyData(template.requiredTechnology));
                 button.tooltip += "\nRequires " + techName;
                 grayscale = "grayscale:";
+                affordableMask.hidden = false;
+                affordableMask.sprite = "colour: 0 0 0 127";
             }
             
             if (guiName == RESEARCH && !Engine.GuiInterfaceCall("CheckTechnologyRequirements", entType))
@@ -678 +686 @@
                 button.enabled = false;
                 button.tooltip += "\n" + GetTechnologyData(entType).requirementsTooltip;
                 grayscale = "grayscale:";
+                affordableMask.hidden = false;
+                affordableMask.sprite = "colour: 0 0 0 127";
             }
             
             icon.sprite = "stretched:" + grayscale + "session/portraits/" + template.icon;
             
             if (guiName == RESEARCH)
             {
-                // Check resource requirements for first button
-                affordableMask.hidden = true;
+                // Check resource requirements
                 var neededResources = Engine.GuiInterfaceCall("GetNeededResources", template.cost);
                 if (neededResources)
                 {
@@ -693 +702 @@
                     {
                         button.enabled = false;
                         affordableMask.hidden = false;
+                        
+                        var totalCost = 0;
+                        for each (var resource in neededResources)
+                            totalCost += resource;
+                        var alpha = 50 + totalCost/10;
+                        alpha = alpha > 125 ? 125 : alpha;
+                        affordableMask.sprite = "colour: 255 0 0 " + (alpha);
                     }
                     button.tooltip += getNeededResourcesTooltip(neededResources);
                 }
@@ -701 +717 @@
                 {
                     grayscale = "";
                     button1.enabled = true;
+                    affordableMask1.hidden = true;
 
                     if (!Engine.GuiInterfaceCall("CheckTechnologyRequirements", entType1))
                     {
                         button1.enabled = false;
                         button1.tooltip += "\n" + GetTechnologyData(entType1).requirementsTooltip;
                         grayscale = "grayscale:";
+                        affordableMask1.hidden = false;
+                        affordableMask1.sprite = "colour: 0 0 0 127";
                     }
                     icon1.sprite = "stretched:" + grayscale + "session/portraits/" +template1.icon;
 
                     // Check resource requirements for second button
-                    affordableMask1.hidden = true;
                     neededResources = Engine.GuiInterfaceCall("GetNeededResources", template1.cost);
                     if (neededResources)
                     {
@@ -719 +737 @@
                         {
                             button1.enabled = false;
                             affordableMask1.hidden = false;
+
+                            var totalCost = 0;
+                            for each (var resource in neededResources)
+                                totalCost += resource;
+                            var alpha = 50 + totalCost/10;
+                            alpha = alpha > 125 ? 125 : alpha;
+                            affordableMask1.sprite = "colour: 255 0 0 " + (alpha);
                         }
                         button1.tooltip += getNeededResourcesTooltip(neededResources);
                     }
@@ -732 +757 @@
             }
             else if (guiName == CONSTRUCTION || guiName == TRAINING)
             {
-                affordableMask.hidden = true;
                 var totalCosts = {};
                 var trainNum = 1;
                 var button_disableable = true;
@@ -743 +767 @@
                         trainingCategory = template.trainingRestrictions.category;
                     if (trainingCategory && playerState.entityLimits[trainingCategory] &&
                         playerState.entityCounts[trainingCategory] >= playerState.entityLimits[trainingCategory])
+                    {
                         grayscale = "grayscale:";
+                        affordableMask.hidden = false;
+                        affordableMask.sprite = "colour: 0 0 0 100";
+                    }
                     icon.sprite = "stretched:" + grayscale + "session/portraits/" + template.icon;
 
                     if (Engine.HotkeyIsPressed("session.batchtrain"))
@@ -763 +791 @@
                 var neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
                 if (neededResources)
                 {
-                    var totalCost = 0;
                     if (button.enabled !== false)
                     {
+                        button.enabled = (button_disableable ? false : true);
+                        affordableMask.hidden = false;
+
+                        var totalCost = 0;
                         for each (var resource in neededResources)
                             totalCost += resource;
-
-                        button.enabled = (button_disableable ? false : true);
-                        affordableMask.hidden = false;
-                        var alpha = 75 + totalCost/6;
-                        alpha = alpha > 150 ? 150 : alpha;
+                        var alpha = 50 + totalCost/10;
+                        alpha = alpha > 125 ? 125 : alpha;
                         affordableMask.sprite = "colour: 255 0 0 " + (alpha);
                     }
                     button.tooltip += getNeededResourcesTooltip(neededResources);