Ticket #1989: selection_limitation.diff

binaries/data/config/default.cfg

@@ -263 +263 @@
 hotkey.selection.group.select.9 = 9
 hotkey.selection.group.save.9 = "Ctrl+9"
 hotkey.selection.group.add.9 = "Shift+9"
+hotkey.selection.part1 = "Num1" ; select one part of a selection
+hotkey.selection.part2 = "Num2" 
+hotkey.selection.part3 = "Num3" 
+hotkey.selection.part4 = "Num4" 
+hotkey.selection.part5 = "Num5" 
+hotkey.selection.part6 = "Num6" 
+hotkey.selection.part7 = "Num7" 
+hotkey.selection.part8 = "Num8" 
+hotkey.selection.part9 = "Num9" 
 
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units

binaries/data/mods/public/gui/manual/intro.txt

@@ -66 +66 @@
 Ctrl + 1 (and so on up to Ctrl + 0): Create control group 1 (to 0) from the selected units/buildings
 1 (and so on up to 0): Select the units/buildings in control group 1 (to 0)
 Shift + 1 (to 0): Add selected units/buildings to control group 1 (to 0)
+Numpad 1 (and so on, up to Numpad 9): Restrict the selection to the number you pushed (f.e. 4 units if you pressed '4'). Hold Shift to multiply it by five (f.e. 20 units if you pressed Shift+4)
 Ctrl + F5 (and so on up to F8): Mark the current camera position, for jumping back to later.
 F5, F6, F7, and F8: Move the camera to a marked position. Jump back to the last location if the camera is already over the marked position.
 Z, X, C, V, B, N, M: With training buildings selected. Add the 1st, 2nd, ... unit shown to the training queue for all the selected buildings.

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

@@ -1094 +1094 @@
                         prevHotkey = ev.hotkey;
                     }
                 }
+                if (ev.hotkey.indexOf("selection.part") == 0 )
+                {
+                    var num = +ev.hotkey.charAt(ev.hotkey.length - 1);
+                    performSelectionPart(num);
+                }
                 break;
         }
         break;
@@ -1857 +1862 @@
     }
 }
 
+// Perform part the selection
+function performSelectionPart(number)
+{
+    if( Engine.HotkeyIsPressed("session.queue"))
+    {
+        g_Selection.selectPart(number*5);   
+    }
+    else
+    {
+        g_Selection.selectPart(+number);
+    }
+}
+
 // Performs the specified group
 function performGroup(action, groupId)
 {

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

@@ -213 +213 @@
 }
 
 /**
+ * Remove entities from selection until you have exactly 'number' left
+ * Prefer to keep idle entities
+ */
+EntitySelection.prototype.selectPart = function(number)
+{
+    var ents = this.selected;
+    var count = 0;
+    var newSelection = {};
+
+    for each (var ent in ents)
+    {
+        var entState = GetEntityState(ent);
+        // prefer idle entities
+        if (entState && entState.unitAI && entState.unitAI.state == "INDIVIDUAL.IDLE")
+        {
+            newSelection[ent] = ents[ent];
+            delete ents[ent];
+
+            if ( ++count >= number )
+                break;
+        }
+    }
+
+    for each (var ent in ents)
+    {
+        
+        if ( ++count > number )
+            break;
+        newSelection[ent] = ents[ent];
+        
+    }
+
+    this.reset();
+    this.addList(newSelection);
+}
+
+/**
  * Update the selection to take care of changes (like units that have been killed)
  */
 EntitySelection.prototype.update = function()