Ticket #1839: tribute-shift-click.patch

gui/session/input.js

@@ -27 +27 @@
 const INPUT_PRESELECTEDACTION = 7;
 const INPUT_BUILDING_WALL_CLICK = 8;
 const INPUT_BUILDING_WALL_PATHING = 9;
+const INPUT_TRIBUTING = 10;
 
 var inputState = INPUT_NORMAL;
 var placementSupport = new PlacementSupport();
@@ -977 +978 @@
         }
         break;
 
-    case INPUT_BATCHTRAINING:
+    case INPUT_BATCHTRAINING: case INPUT_TRIBUTING:
         switch (ev.type)
         {
         case "hotkeyup":
             if (ev.hotkey == "session.batchtrain")
             {
-                flushTrainingBatch();
+                if (inputState == INPUT_BATCHTRAINING)
+                    flushTrainingBatch();
+                else
+                    flushTributing();
                 inputState = INPUT_NORMAL;
             }
             break;

gui/session/menu.js

@@ -34 +34 @@
 
 var isDiplomacyOpen = false;
 
+// Redefined every time someone makes a tribute (so we can save some data in a closure). Called in input.js handleInputBeforeGui.
+var flushTributing = function() {};
+
 // Ignore size defined in XML and set the actual menu size here
 function initMenuPosition()
 {
@@ -271 +274 @@
         for each (var resource in ["food", "wood", "stone", "metal"])
         {
             var button = getGUIObjectByName("diplomacyPlayerTribute"+toTitleCase(resource)+"["+(i-1)+"]");
-            // TODO: Make amounts changeable or change to 500 if shift is pressed
-            var amounts = {
-                "food": (resource=="food")?100:0,
-                "wood": (resource=="wood")?100:0,
-                "stone": (resource=="stone")?100:0,
-                "metal": (resource=="metal")?100:0,
-            };
-            button.onpress = (function(e){ return function() { tributeResource(e) } })({"player": i, "amounts": amounts});
+            button.onpress = (function(player, resource, button){
+                // Implement something like how unit batch training works. Shift+click to send 500, shift+click+click to send 1000, etc.
+                // Also see input.js (searching for "INPUT_TRIBUTING" should get all the relevant parts).
+                var multiplier = 1;
+                return function() {
+                    var isBatchTrainPressed = Engine.HotkeyIsPressed("session.batchtrain");
+                    if (isBatchTrainPressed)
+                    {
+                        inputState = INPUT_TRIBUTING;
+                        multiplier += multiplier == 1 ? 4 : 5;
+                    }
+                    var amounts = {
+                        "food": (resource == "food" ? 100 : 0) * multiplier,
+                        "wood": (resource == "wood" ? 100 : 0) * multiplier,
+                        "stone": (resource == "stone" ? 100 : 0) * multiplier,
+                        "metal": (resource == "metal" ? 100 : 0) * multiplier,
+                    };
+                    button.tooltip = formatTributeTooltip(players[player], resource, amounts[resource]);
+                    // This is in a closure so that we have access to `player`, `amounts`, and `multiplier` without some
+                    // evil global variable hackery.
+                    flushTributing = function() {
+                        tributeResource({"player": player, "amounts": amounts});
+                        multiplier = 1;
+                        button.tooltip = formatTributeTooltip(players[player], resource, 100);
+                    };
+                    if (!isBatchTrainPressed)
+                        flushTributing();
+                };
+            })(i, resource, button);
             button.hidden = false;
+            button.tooltip = formatTributeTooltip(players[i], resource, 100);
         }
 
         // Skip our own teams on teams locked
@@ -396 +421 @@
     closeDiplomacy();
     closeSettings(false);
 }
+
+function formatTributeTooltip(player, resource, amount)
+{
+    var playerColor = player.color.r + " " + player.color.g + " " + player.color.b;
+    return "Tribute " + amount + " " + resource + " to [color=\"" + playerColor + "\"]" + player.name +
+        "[/color]. Shift-click to tribute " + (amount < 500 ? 500 : amount + 500) + ".";
+}

gui/session/session.xml

@@ -313 +313 @@
                     <object name="diplomacyPlayerEnemy[n]" size="100%-140 0 100%-120 100%" type="button" style="StoneButton" hidden="true"/>
 
                     <!-- Tribute -->
-                    <object name="diplomacyPlayerTributeFood[n]" size="100%-110 0 100%-90 100%" type="button" style="iconButton" tooltip="Food" hidden="true">
+                    <object name="diplomacyPlayerTributeFood[n]" size="100%-110 0 100%-90 100%" type="button" style="iconButton" hidden="true">
                         <object name="diplomacyPlayerTributeFoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
                     </object>
-                    <object name="diplomacyPlayerTributeWood[n]" size="100%-90 0 100%-70 100%" type="button" style="iconButton" tooltip="Wood" hidden="true">
+                    <object name="diplomacyPlayerTributeWood[n]" size="100%-90 0 100%-70 100%" type="button" style="iconButton" hidden="true">
                         <object name="diplomacyPlayerTributeWoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
                     </object>
-                    <object name="diplomacyPlayerTributeStone[n]" size="100%-70 0 100%-50 100%" type="button" style="iconButton" tooltip="Stone" hidden="true">
+                    <object name="diplomacyPlayerTributeStone[n]" size="100%-70 0 100%-50 100%" type="button" style="iconButton" hidden="true">
                         <object name="diplomacyPlayerTributeStoneImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
                     </object>
-                    <object name="diplomacyPlayerTributeMetal[n]" size="100%-50 0 100%-30 100%" type="button" style="iconButton" tooltip="Metal" hidden="true">
+                    <object name="diplomacyPlayerTributeMetal[n]" size="100%-50 0 100%-30 100%" type="button" style="iconButton" hidden="true">
                         <object name="diplomacyPlayerTributeMetalImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
                     </object>
                 </object>