Ticket #1492: hotkeys4.patch

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

@@ -1767 +1767 @@
                         lst = lst[nr]; // selected buildings
                     else
                         lst = lst[0];
-                    // FIXME: follow when ungarrisoning all
                     var state = GetEntityState(lst);
                     var gents = state.garrisonHolder.entities;
                     unloadAll(lst);
-                    Engine.CameraFollow(0);
-                    g_Selection.reset();
-                    g_Selection.addList(gents);
-                    Engine.CameraFollow(gents[0]);
+                    // FIXME: follow when ungarrisoning all
+                    // sadly these gents cannot be viewed after ungarissoning:
+                    if (gents)
+                    {
+                        //Engine.CameraFollow(0);
+                        g_Selection.reset();
+                        g_Selection.addList(gents);
+                        Engine.CameraFollow(gents);
+                    }
                 } else {
                     lst = lst[0];
                     var state = GetEntityState(lst);
@@ -1847 +1851 @@
     currEntClass = 0;
 }
 
+function findAllVisibleEntities(classes, mode)
+{
+    var player = Engine.GetPlayerID();
+    var plEnts = Engine.PickFriendlyEntitiesOnScreen(player);
+    // Or we could do somthing alike the below, but this is resolution dependent
+    //var plEnts = Engine.PickFriendlyEntitiesInRect(250, 250, 1400, 750, player);
+    if (!plEnts.length)
+        return;
+    var visibleEnts = [];
+    for each (cls in classes)
+    {
+        var data = {
+            entClass: cls,
+            searchMode: mode,
+            playerEnts: plEnts,
+        };
+        var entities = Engine.GuiInterfaceCall("SubsetMatchedEnts", data);
+        if (entities.length)
+            visibleEnts = visibleEnts.concat(entities);
+    }
+
+    if (visibleEnts.length) {
+        if (!getActionForSelection(player, visibleEnts).length)
+            resetPreselectedAction();
+        g_Selection.reset();
+        g_Selection.addList(visibleEnts);
+        Engine.CameraFollow(visibleEnts[0]);
+    }
+}
+
 function findEntity(classes, mode)
 {
+    var queued = Engine.HotkeyIsPressed("session.queue");
+    if (queued) {
+        findAllVisibleEntities(classes, mode)
+        return;
+    }
     var player = Engine.GetPlayerID();
     // Cycle through idling classes before giving up
     for (var i = 0; i <= classes.length; ++i)

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

@@ -1426 +1426 @@
     PlaySound(data.name, data.entity);
 };
 
+GuiInterface.prototype.MatchEnt = function(ent, data)
+{
+    var ret;
+    var cmpId = Engine.QueryInterface(ent, IID_Identity);
+    if (cmpId && cmpId.HasClass(data.entClass)) {
+        if (data.searchMode == 0) {
+            ret = ent;
+        }  else if (data.searchMode == 1) { // Search idle villager/soldier
+            var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+            if (cmpUnitAI && cmpUnitAI.IsIdle() && !cmpUnitAI.IsGarrisoned())
+                ret = ent;
+        }
+    }
+    return ret;
+}
+
+GuiInterface.prototype.SubsetMatchedEnts = function(player, data)
+{
+    var ret = [];
+    for each (var ent in data.playerEnts)
+    {
+        var match = this.MatchEnt(ent, data);
+        if (match)
+            ret.push(match);
+    }
+    return ret;
+}
+
 GuiInterface.prototype.FindEntity = function(player, data)
 {
     var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
@@ -1435 +1463 @@
     // so that we cycle around in a predictable order
     for each (var ent in playerEntities)
     {
-        var cmpId = Engine.QueryInterface(ent, IID_Identity);
-        if (ent > data.prevEntity && cmpId && cmpId.HasClass(data.entClass)) {
-            if (data.searchMode == 0) {
-                return ent;
-            }  else if (data.searchMode == 1) { // Search idle villager/soldier
-                var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
-                if (cmpUnitAI && cmpUnitAI.IsIdle() && !cmpUnitAI.IsGarrisoned())
-                    return ent;
-            }
+        if (ent > data.prevEntity)
+        {
+            var match = this.MatchEnt(ent, data);
+            if (match)
+                return match;
         }
     }
 
@@ -1570 +1594 @@
     "SetWallPlacementPreview": 1,
     "GetFoundationSnapData": 1,
     "PlaySound": 1,
+    "SubsetMatchedEnts": 1,
     "FindEntity": 1,
     "GetTradingDetails": 1,
     "CanAttack": 1,