Ticket #1491: civc_hotkey.patch

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

@@ -1648 +1648 @@
     currIdleClass = 0;
 }
 
+var lastBuilding = 0;
+function selectBuilding(entity)
+{
+    if (entity)
+    {
+        var data = { prevBuilding: lastBuilding, buildingClass: entity };
+        var newBuilding = Engine.GuiInterfaceCall("FindBuilding", data);
+        if (newBuilding && newBuilding != lastBuilding)
+        {
+            lastBuilding = newBuilding;
+            g_Selection.reset()
+            g_Selection.addList([lastBuilding]);
+            Engine.CameraFollow(lastBuilding);
+        }
+    }
+    lastBuilding = 0;
+}
+
 function findIdleUnit(classes)
 {
     // Cycle through idling classes before giving up

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

@@ -89 +89 @@
             <action on="Press">findIdleUnit(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"]);</action>
         </object>
 
+        <!-- Select towncenter-->
+        <object hotkey="selection.civilcenter">
+            <action on="Press">selectBuilding("CivCentre");</action>
+        </object>
+
         <!-- ================================  ================================ -->
         <!-- Developer / Debug items -->
         <!-- ================================  ================================ -->

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

@@ -1452 +1452 @@
     return 0;
 };
 
+GuiInterface.prototype.FindBuilding = function(player, data)
+{
+    var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var playerEntities = rangeMan.GetEntitiesByPlayer(player);
+
+    // Find the first matching entity that is after the previous selection,
+    // so that we cycle around in a predictable order
+    for each (var ent in playerEntities)
+    {
+        var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
+        if (ent > data.prevBuilding && cmpIdentity && cmpIdentity.HasClass(data.buildingClass))
+            return ent;
+    }
+
+    // No idle entities left in the class
+    return 0;
+};
+
+
+
 GuiInterface.prototype.GetTradingDetails = function(player, data)
 {
     var cmpEntityTrader = Engine.QueryInterface(data.trader, IID_Trader);
@@ -1572 +1592 @@
     "GetFoundationSnapData": 1,
     "PlaySound": 1,
     "FindIdleUnit": 1,
+    "FindBuilding": 1,
     "GetTradingDetails": 1,
     "CanAttack": 1,
 

binaries/data/config/default.cfg

@@ -152 +152 @@
 hotkey.selection.remove = Ctrl              ; Remove units from selection
 hotkey.selection.idleworker = Period        ; Select next idle worker
 hotkey.selection.idlewarrior = Comma        ; Select next idle warrior
+hotkey.selection.civilcenter = H             ; Select towncenter
 hotkey.selection.offscreen = Alt            ; Include offscreen units in selection
 hotkey.selection.group.select.0 = 0
 hotkey.selection.group.save.0 = "Ctrl+0"