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

Mobile unit command support

Browse Source
This commit is contained in:
Anuken
2022-05-07 00:30:25 -04:00
parent 6740b60af2
commit aa0e254f0e
5 changed files with 181 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package mindustry.input;
import arc.*;
import arc.func.*;
import arc.graphics.g2d.*;
import arc.input.GestureDetector.*;
import arc.input.*;
@@ -26,6 +25,7 @@ import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import static arc.Core.*;
import static mindustry.Vars.*;
import static mindustry.input.PlaceMode.*;
@@ -252,12 +252,19 @@ public class MobileInput extends InputHandler implements GestureListener{
}).visible(() -> !selectPlans.isEmpty()).name("confirmplace");
}
boolean showCancel(){
return (player.unit().isBuilding() || block != null || mode == breaking || !selectPlans.isEmpty()) && !hasSchem();
}
boolean hasSchem(){
return lastSchematic != null && !selectPlans.isEmpty();
}
@Override
public void buildUI(Group group){
Boolp schem = () -> lastSchematic != null && !selectPlans.isEmpty();
group.fill(t -> {
t.visible(() -> (player.unit().isBuilding() || block != null || mode == breaking || !selectPlans.isEmpty()) && !schem.get());
t.visible(this::showCancel);
t.bottom().left();
t.button("@cancel", Icon.cancel, () -> {
player.unit().clearBuilding();
@@ -268,7 +275,15 @@ public class MobileInput extends InputHandler implements GestureListener{
});
group.fill(t -> {
t.visible(schem);
t.visible(() -> !showCancel() && block == null);
t.bottom().left();
t.button("@command", Icon.units, Styles.squareTogglet, () -> {
commandMode = !commandMode;
}).width(155f).height(50f).margin(12f).checked(b -> commandMode);
});
group.fill(t -> {
t.visible(this::hasSchem);
t.bottom().left();
t.table(Tex.pane, b -> {
b.defaults().size(50f);
@@ -342,6 +357,8 @@ public class MobileInput extends InputHandler implements GestureListener{
if(mode == schematicSelect){
drawSelection(lineStartX, lineStartY, lastLineX, lastLineY, Vars.maxSchematicSize);
}
drawCommanded();
}
@Override
@@ -522,6 +539,10 @@ public class MobileInput extends InputHandler implements GestureListener{
tryDropItems(tile == null ? null : tile.build, Core.input.mouseWorld(screenX, screenY).x, Core.input.mouseWorld(screenX, screenY).y);
}
//select some units
selectUnitsRect();
return false;
}
@@ -538,26 +559,36 @@ public class MobileInput extends InputHandler implements GestureListener{
if(mode == none){
Vec2 pos = Core.input.mouseWorld(x, y);
if(player.unit() instanceof Payloadc pay){
Unit target = Units.closest(player.team(), pos.x, pos.y, 8f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(pos, u.hitSize + 8f));
if(target != null){
payloadTarget = target;
}else{
Building build = world.buildWorld(pos.x, pos.y);
if(commandMode){
//long press begins rect selection.
commandRect = true;
commandRectX = input.mouseWorldX();
commandRectY = input.mouseWorldY();
if(build != null && build.team == player.team() && (pay.canPickup(build) || build.getPayload() != null && pay.canPickupPayload(build.getPayload()))){
payloadTarget = build;
}else if(pay.hasPayload()){
//drop off at position
payloadTarget = new Vec2(pos);
}else{
manualShooting = true;
this.target = null;
}
}
}else{
manualShooting = true;
this.target = null;
if(player.unit() instanceof Payloadc pay){
Unit target = Units.closest(player.team(), pos.x, pos.y, 8f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(pos, u.hitSize + 8f));
if(target != null){
payloadTarget = target;
}else{
Building build = world.buildWorld(pos.x, pos.y);
if(build != null && build.team == player.team() && (pay.canPickup(build) || build.getPayload() != null && pay.canPickupPayload(build.getPayload()))){
payloadTarget = build;
}else if(pay.hasPayload()){
//drop off at position
payloadTarget = new Vec2(pos);
}else{
manualShooting = true;
this.target = null;
}
}
}else{
manualShooting = true;
this.target = null;
}
}
if(!state.isPaused()) Fx.select.at(pos);
@@ -615,6 +646,9 @@ public class MobileInput extends InputHandler implements GestureListener{
}else if(mode == breaking && validBreak(linked.x,linked.y) && !hasPlan(linked)){
//add to selection queue if it's a valid BREAK position
selectPlans.add(new BuildPlan(linked.x, linked.y));
}else if(commandMode && selectedUnits.size > 0){
//handle selecting units with command mode
commandTap(x, y);
}else{
//control units
if(count == 2){
@@ -671,6 +705,10 @@ public class MobileInput extends InputHandler implements GestureListener{
payloadTarget = null;
}
if(locked || block != null || scene.hasField() || hasSchem() || selectPlans.size > 0){
commandMode = false;
}
//zoom camera
if(!locked && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!player.isBuilder() || !isPlacing() || !block.rotate) && selectPlans.isEmpty()))){
renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
@@ -801,7 +839,7 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override
public boolean pan(float x, float y, float deltaX, float deltaY){
if(Core.scene == null || Core.scene.hasDialog() || Core.settings.getBool("keyboard") || locked()) return false;
if(Core.scene == null || Core.scene.hasDialog() || Core.settings.getBool("keyboard") || locked() || commandRect) return false;
float scale = Core.camera.width / Core.graphics.getWidth();
deltaX *= scale;