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

Allow setting attack mode wave unit spawn position

Browse Source
This commit is contained in:
Anuken
2025-05-05 20:50:43 -04:00
parent 317f9878dc
commit 16cb530b99
9 changed files with 143 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,7 +326,7 @@ public class DesktopInput extends InputHandler{
selectedUnits.clear();
commandBuildings.clear();
for(var build : player.team().data().buildings){
if(build.block.commandable){
if(build.isCommandable()){
commandBuildings.add(build);
}
}

10
core/src/mindustry/input/InputHandler.java
View File

@@ -155,6 +155,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Events.on(ResetEvent.class, e -> {
logicCutscene = false;
commandBuildings.clear();
selectedUnits.clear();
itemDepositCooldown = 0f;
Arrays.fill(controlGroups, null);
lastUnit = null;
@@ -413,7 +415,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
for(int pos : buildings){
var build = world.build(pos);
if(build == null || build.team() != player.team() || !build.block.commandable) continue;
if(build == null || build.team() != player.team() || !build.isCommandable()) continue;
build.onCommand(target);
build.updateLastAccess(player);
@@ -839,7 +841,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
itemDepositCooldown -= Time.delta / 60f;
commandBuildings.removeAll(b -> !b.isValid());
commandBuildings.removeAll(b -> !b.isValid() || !b.isCommandable() || b.team != player.team());
if(!commandMode){
commandRect = false;
@@ -1025,7 +1027,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
//deselect
selectedUnits.clear();
if(build != null && build.team == player.team() && build.block.commandable){
if(build != null && build.team == player.team() && build.isCommandable()){
if(commandBuildings.contains(build)){
commandBuildings.remove(build);
}else{
@@ -1742,7 +1744,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
boolean consumed = false, showedInventory = false;
//select building for commanding
if(build.block.commandable && commandMode){
if(build.isCommandable() && commandMode){
//TODO handled in tap.
consumed = true;
}else if(build.block.configurable && build.interactable(player.team())){ //check if tapped block is configurable