Ticket #1539: gate-cost-2.patch

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

@@ -863 +863 @@
             size="10 12 100% 100%"
         >
             <object size="0 0 100% 100%">
-            <repeat count="1">
-                <object name="unitGateButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
+            <repeat count="2">
+                <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>

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

@@ -25 +25 @@
 const BARTER_RESOURCES = ["food", "wood", "stone", "metal"];
 const BARTER_ACTIONS = ["Sell", "Buy"];
 
+// Gate constants
+const GATE_ACTIONS = ["lock", "unlock"];
+
 // The number of currently visible buttons (used to optimise showing/hiding)
 var g_unitPanelButtons = {"Selection": 0, "Queue": 0, "Formation": 0, "Garrison": 0, "Training": 0, "Research": 0, "Barter": 0, "Trading": 0, "Construction": 0, "Command": 0, "Stance": 0, "Gate": 0};
 
@@ -206 +209 @@
             break;
 
         case GATE:
-            if(numberOfItems > 1)
-                numberOfItems = 1;
+            if(numberOfItems > 2)
+                numberOfItems = 2;
             break;
 
         default:
@@ -324 +327 @@
                 getGUIObjectByName("unit"+guiName+"Count["+i+"]").caption = (count > 1 ? count : "");
                 break;
 
+            case GATE:
+                var tooltip = toTitleCase(item.tooltip);
+                if (item.template)
+                    tooltip += "\n" + getEntityCostTooltip( GetTemplateData(item.template) );
+                break;
+
             case STANCE:
             case FORMATION:
-            case GATE:
                 var tooltip = toTitleCase(item);
                 break;
 
@@ -504 +512 @@
             var gateIcon;
             // If already a gate, show (un)lock icon
             if (unitEntState.gate)
-                gateIcon = unitEntState.gate.locked ? "gate_unlocked.png" : "gate_locked.png";
+            {
+                gateIcon = "lock_" + GATE_ACTIONS[i] + "ed.png";
+                selection.hidden = unitEntState.gate.locked != item.locked;
+            }
+            // otherwise show gate upgrade icon
             else
-            //  otherwise show gate upgrade icon
-                gateIcon = "production.png";
+            {
+                gateIcon = "gate_locked.png";
+                selection.hidden = true;
+            }
 
             icon.sprite = "stretched:session/icons/" + gateIcon;
         }
@@ -828 +842 @@
         {
             if (entState.gate)
             {
-                var action = entState.gate.locked ? "Unlock gate": "Lock gate";
-                setupUnitPanel(GATE, usedPanels, entState, [action],
-                    function (item) { lockGate(!entState.gate.locked); } );
+                var items = [];
+                for (var i = 0; i < GATE_ACTIONS.length; ++i)
+                    items.push({
+                        "tooltip": toTitleCase(GATE_ACTIONS[i]) + " Gate",
+                        "locked": Boolean(!i)
+                    });
+                setupUnitPanel(GATE, usedPanels, entState, items,
+                    function (item) { lockGate(item.locked); } );
             }
             else // Wall
             { 
@@ -838 +857 @@
                 var longPos = entState.template.indexOf("long");
                 if (longPos != -1)
                 {
-                    var template = entState.template.substr(0, longPos) + "gate";
-                    setupUnitPanel(GATE, usedPanels, entState, ["Convert to gate"],
-                        function (item) { transformWallToGate(template); } );
+                    var action = { "tooltip": "Convert to Gate" };
+                    action.template = entState.template.substr(0, longPos) + "gate";
+                    setupUnitPanel(GATE, usedPanels, entState, [action],
+                        function (item) { transformWallToGate(action.template); } );
                 }
             }
         }