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

No unit control multi-select

Browse Source
This commit is contained in:
Anuken
2022-02-09 00:18:51 -05:00
parent 257ecd397f
commit a24a94d0b0
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/input/DesktopInput.java
+20 -6
View File
@@ -134,7 +134,7 @@ public class DesktopInput extends InputHandler{
if(commandMode && !commandRect){ if(commandMode && !commandRect){
Unit sel = selectedCommandUnit(input.mouseWorldX(), input.mouseWorldY()); Unit sel = selectedCommandUnit(input.mouseWorldX(), input.mouseWorldY());
if(sel != null){ if(sel != null && !(!multiSelect() && selectedUnits.size == 1 && selectedUnits.contains(sel))){
drawCommand(sel); drawCommand(sel);
} }
} }
@@ -537,8 +537,12 @@ public class DesktopInput extends InputHandler{
if(Core.input.keyRelease(Binding.select) && commandRect){ if(Core.input.keyRelease(Binding.select) && commandRect){
if(!tappedOne){ if(!tappedOne){
var units = selectedCommandUnits(commandRectX, commandRectY, input.mouseWorldX() - commandRectX, input.mouseWorldY() - commandRectY); var units = selectedCommandUnits(commandRectX, commandRectY, input.mouseWorldX() - commandRectX, input.mouseWorldY() - commandRectY);
//tiny brain method of unique addition if(multiSelect()){
selectedUnits.removeAll(units); //tiny brain method of unique addition
selectedUnits.removeAll(units);
}else if(units.size > 0){
selectedUnits.clear();
}
selectedUnits.addAll(units); selectedUnits.addAll(units);
} }
commandRect = false; commandRect = false;
@@ -660,6 +664,11 @@ public class DesktopInput extends InputHandler{
} }
} }
//TODO
public boolean multiSelect(){
return false;
}
@Override @Override
public boolean tap(float x, float y, int count, KeyCode button){ public boolean tap(float x, float y, int count, KeyCode button){
if(scene.hasMouse()) return false; if(scene.hasMouse()) return false;
@@ -668,10 +677,15 @@ public class DesktopInput extends InputHandler{
Unit unit = selectedCommandUnit(input.mouseWorldX(), input.mouseWorldY()); Unit unit = selectedCommandUnit(input.mouseWorldX(), input.mouseWorldY());
if(unit != null){ if(unit != null){
if(selectedUnits.contains(unit)){ if(!multiSelect()){
selectedUnits.remove(unit); selectedUnits.clear();
}else{
selectedUnits.add(unit); selectedUnits.add(unit);
}else{
if(selectedUnits.contains(unit)){
selectedUnits.remove(unit);
}else{
selectedUnits.add(unit);
}
} }
}else if(selectedUnits.size > 0){ }else if(selectedUnits.size > 0){
//move to location - TODO right click instead? //move to location - TODO right click instead?