Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added "select all units" keybind

Browse Source
This commit is contained in:
Anuken
2022-10-30 14:52:12 -04:00
parent 4b97814955
commit 0ee054b310
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -1139,6 +1139,7 @@ keybind.select.name = Select/Shoot
keybind.diagonal_placement.name = Diagonal Placement keybind.diagonal_placement.name = Diagonal Placement
keybind.pick.name = Pick Block keybind.pick.name = Pick Block
keybind.break_block.name = Break Block keybind.break_block.name = Break Block
keybind.select_all_units = Select All Units
keybind.deselect.name = Deselect keybind.deselect.name = Deselect
keybind.pickupCargo.name = Pickup Cargo keybind.pickupCargo.name = Pickup Cargo
keybind.dropCargo.name = Drop Cargo keybind.dropCargo.name = Drop Cargo

2
core/src/mindustry/input/Binding.java
View File

@@ -19,6 +19,8 @@ public enum Binding implements KeyBind{
deselect(KeyCode.mouseRight), deselect(KeyCode.mouseRight),
break_block(KeyCode.mouseRight), break_block(KeyCode.mouseRight),
select_all_units(KeyCode.g),
pickupCargo(KeyCode.leftBracket), pickupCargo(KeyCode.leftBracket),
dropCargo(KeyCode.rightBracket), dropCargo(KeyCode.rightBracket),

9
core/src/mindustry/input/DesktopInput.java
View File

@@ -254,6 +254,15 @@ public class DesktopInput extends InputHandler{
//validate commanding units //validate commanding units
selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid()); selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid());
if(commandMode && input.keyTap(Binding.select_all_units) && !scene.hasField() && !scene.hasDialog()){
selectedUnits.clear();
for(var unit : player.team().data().units){
if(unit.isCommandable()){
selectedUnits.add(unit);
}
}
}
if(!scene.hasMouse() && !locked && state.rules.possessionAllowed){ if(!scene.hasMouse() && !locked && state.rules.possessionAllowed){
if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){ if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){
Unit on = selectedUnit(); Unit on = selectedUnit();

18
core/src/mindustry/service/Achievement.java
View File

@@ -104,18 +104,18 @@ public enum Achievement{
joinCommunityServer, //TODO - test joinCommunityServer, //TODO - test
openConsole, //TODO - test openConsole, //TODO - test
controlTurret, //TODO - Steam - icon done controlTurret, //TODO - test
dropUnitsCoreZone, //TODO - Steam - icon done dropUnitsCoreZone, //TODO - test
destroyScatterFlare, //TODO - Steam - icon done destroyScatterFlare, //TODO - test
boostUnit, //TODO - Steam - icon done boostUnit, //TODO - test
boostBuildingFloor, //TODO - Steam - icon done boostBuildingFloor, //TODO - test
hoverUnitLiquid, //TODO - Steam - icon done hoverUnitLiquid, //TODO - test
break100Boulders(SStat.bouldersDeconstructed, 100), //TODO - Steam - icon done break100Boulders(SStat.bouldersDeconstructed, 100), //TODO - test
break10000Boulders(SStat.bouldersDeconstructed, 10_000), //TODO - Steam - icon done break10000Boulders(SStat.bouldersDeconstructed, 10_000), //TODO - test
shockwaveTowerUse, //TODO - Steam - icon done shockwaveTowerUse, //TODO - test
useAnimdustryEmoji, //TODO - Steam - icon done useAnimdustryEmoji, //TODO - Steam - icon done