Ticket #4129: 4129.diff

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

@@ -54 +54 @@
         <action on="Press">stopUnits(g_Selection.toList());</action>
     </object>
 
     <!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
     <object hotkey="selection.idlewarrior">
-        <action on="Press">findIdleUnit(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship", "Dog"]);</action>
+        <action on="Press">findIdleUnit(g_MilitaryTypes);</action>
     </object>
 
     <object hotkey="selection.cancel">
         <action on="Press">clearSelection();</action>
     </object>

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

@@ -447 +447 @@
     },
     "isDefensive": entity => {
         var entState = GetEntityState(entity);
         return entState && hasClass(entState, "Defensive");
     },
-    "isNotSupport": entity => {
+    "isMil": entity => {
         var entState = GetEntityState(entity);
-
         return entState &&
-            hasClass(entState, "Unit") &&
-            !hasClass(entState, "Support") &&
-            !hasClass(entState, "Domestic");
+            g_MilitaryTypes.some(c => hasClass(entState, c));
     },
     "isIdle": entity => {
         var entState = GetEntityState(entity);
 
         return entState &&
@@ -478 +475 @@
     // Default filters
     var filters = [unitFilters.isUnit, unitFilters.isDefensive, unitFilters.isAnything];
 
     // Handle hotkeys
     if (Engine.HotkeyIsPressed("selection.milonly"))
-        filters = [unitFilters.isNotSupport];
+        filters = [unitFilters.isMil];
     if (Engine.HotkeyIsPressed("selection.idleonly"))
         filters = [unitFilters.isIdle];
 
     var preferredEnts = [];
     for (var i = 0; i < filters.length; ++i)

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

@@ -143 +143 @@
 
 /**
  * Unit classes to be checked for the idle-worker-hotkey.
  */
 var g_WorkerTypes = ["Female", "Trader", "FishingBoat", "CitizenSoldier"];
-
+/**
+ * Unit classes to be checked for the military-only-selection modifier and for the idle-warrior-hotkey.
+ */
+var g_MilitaryTypes = ["Hero", "Champion", "CitizenSoldier", "Mercenary", "Siege", "Warship", "Dog"];
 /**
  * Cache the idle worker status.
  */
 var g_HasIdleWorker = false;