mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-13 09:17:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Allow commanding while planning on mobile

Browse Source
This commit is contained in:
Anuken
2025-02-08 21:41:36 -05:00
parent a77f64f2d0
commit 5cdee0e765
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/mindustry/input/MobileInput.java
View File

@ -279,7 +279,7 @@ public class MobileInput extends InputHandler implements GestureListener{
group.fill(t -> { group.fill(t -> {
t.visible(this::showCancel); t.visible(this::showCancel);
t.bottom().left(); t.bottom().left();
t.button("@cancel", Icon.cancel, () -> { t.button("@cancel", Icon.cancel, Styles.clearTogglet, () -> {
if(!player.dead()){ if(!player.dead()){
player.unit().clearBuilding(); player.unit().clearBuilding();
} }
@ -290,7 +290,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}); });
group.fill(t -> { group.fill(t -> {
t.visible(() -> !showCancel() && block == null && !hasSchematic() && !state.rules.editor); t.visible(() -> !hasSchematic() && !state.rules.editor);
t.bottom().left(); t.bottom().left();
t.button("@command.queue", Icon.rightOpen, Styles.clearTogglet, () -> { t.button("@command.queue", Icon.rightOpen, Styles.clearTogglet, () -> {
@ -299,7 +299,14 @@ public class MobileInput extends InputHandler implements GestureListener{
t.button("@command", Icon.units, Styles.clearTogglet, () -> { t.button("@command", Icon.units, Styles.clearTogglet, () -> {
commandMode = !commandMode; commandMode = !commandMode;
}).width(155f).height(48f).margin(12f).checked(b -> commandMode); if(commandMode){
block = null;
rebuildMode = false;
mode = none;
}
}).width(155f).height(48f).margin(12f).checked(b -> commandMode).row();
t.spacerY(() -> showCancel() ? 50f : 0f).row();
//for better looking insets //for better looking insets
t.rect((x, y, w, h) -> { t.rect((x, y, w, h) -> {
@ -516,7 +523,7 @@ public class MobileInput extends InputHandler implements GestureListener{
if(cursor == null || Core.scene.hasMouse(screenX, screenY)) return false; if(cursor == null || Core.scene.hasMouse(screenX, screenY)) return false;
//only begin selecting if the tapped block is a plan //only begin selecting if the tapped block is a plan
selecting = hasPlan(cursor); selecting = hasPlan(cursor) && !commandMode;
//call tap events //call tap events
if(pointer == 0 && !selecting){ if(pointer == 0 && !selecting){
@ -678,7 +685,7 @@ public class MobileInput extends InputHandler implements GestureListener{
} }
//remove if plan present //remove if plan present
if(hasPlan(cursor)){ if(hasPlan(cursor) && !commandMode){
removePlan(getPlan(cursor)); removePlan(getPlan(cursor));
}else if(mode == placing && isPlacing() && validPlace(cursor.x, cursor.y, block, rotation) && !checkOverlapPlacement(cursor.x, cursor.y, block)){ }else if(mode == placing && isPlacing() && validPlace(cursor.x, cursor.y, block, rotation) && !checkOverlapPlacement(cursor.x, cursor.y, block)){
//add to selection queue if it's a valid place position //add to selection queue if it's a valid place position
@ -757,7 +764,7 @@ public class MobileInput extends InputHandler implements GestureListener{
payloadTarget = null; payloadTarget = null;
} }
if(locked || block != null || scene.hasField() || hasSchematic() || selectPlans.size > 0){ if(locked || block != null || scene.hasField() || hasSchematic()){
commandMode = false; commandMode = false;
} }