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

Mobile rebuild button support

Browse Source
This commit is contained in:
Anuken
2023-05-11 13:41:45 -04:00
parent 74f1688dd2
commit d34631458e
7 changed files with 90 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ public class MobileInput extends InputHandler implements GestureListener{
/** Whether the player is currently shifting all placed tiles. */
public boolean selecting;
/** Whether the player is currently in line-place mode. */
public boolean lineMode, schematicMode;
public boolean lineMode, schematicMode, rebuildMode;
/** Current place mode. */
public PlaceMode mode = none;
/** Whether no recipe was available when switching to break mode. */
@@ -208,6 +208,8 @@ public class MobileInput extends InputHandler implements GestureListener{
if(schematicMode){
block = null;
mode = none;
}else{
rebuildMode = false;
}
}
}).update(i -> {
@@ -219,37 +221,45 @@ public class MobileInput extends InputHandler implements GestureListener{
});
//confirm button
table.button(Icon.ok, Styles.clearNonei, () -> {
for(BuildPlan plan : selectPlans){
Tile tile = plan.tile();
table.button(Icon.ok, Styles.clearNoneTogglei, () -> {
if(schematicMode){
rebuildMode = !rebuildMode;
}else{
for(BuildPlan plan : selectPlans){
Tile tile = plan.tile();
//actually place/break all selected blocks
if(tile != null){
if(!plan.breaking){
if(validPlace(plan.x, plan.y, plan.block, plan.rotation)){
BuildPlan other = getPlan(plan.x, plan.y, plan.block.size, null);
BuildPlan copy = plan.copy();
//actually place/break all selected blocks
if(tile != null){
if(!plan.breaking){
if(validPlace(plan.x, plan.y, plan.block, plan.rotation)){
BuildPlan other = getPlan(plan.x, plan.y, plan.block.size, null);
BuildPlan copy = plan.copy();
if(other == null){
player.unit().addBuild(copy);
}else if(!other.breaking && other.x == plan.x && other.y == plan.y && other.block.size == plan.block.size){
player.unit().plans().remove(other);
player.unit().addBuild(copy);
if(other == null){
player.unit().addBuild(copy);
}else if(!other.breaking && other.x == plan.x && other.y == plan.y && other.block.size == plan.block.size){
player.unit().plans().remove(other);
player.unit().addBuild(copy);
}
}
}
rotation = plan.rotation;
}else{
tryBreakBlock(tile.x, tile.y);
rotation = plan.rotation;
}else{
tryBreakBlock(tile.x, tile.y);
}
}
}
}
//move all current plans to removal array so they fade out
removals.addAll(selectPlans.select(r -> !r.breaking));
selectPlans.clear();
selecting = false;
}).visible(() -> !selectPlans.isEmpty()).name("confirmplace");
//move all current plans to removal array so they fade out
removals.addAll(selectPlans.select(r -> !r.breaking));
selectPlans.clear();
selecting = false;
}
}).visible(() -> !selectPlans.isEmpty() || schematicMode || rebuildMode).update(i -> {
i.getStyle().imageUp = schematicMode || rebuildMode ? Icon.wrench : Icon.ok;
i.setChecked(rebuildMode);
}).name("confirmplace");
}
boolean showCancel(){
@@ -369,6 +379,8 @@ public class MobileInput extends InputHandler implements GestureListener{
//draw schematic selection
if(mode == schematicSelect){
drawSelection(lineStartX, lineStartY, lastLineX, lastLineY, Vars.maxSchematicSize);
}else if(mode == rebuildSelect){
drawRebuildSelection(lineStartX, lineStartY, lastLineX, lastLineY);
}
drawCommanded();
@@ -443,6 +455,11 @@ public class MobileInput extends InputHandler implements GestureListener{
//endregion
//region input events, overrides
@Override
public boolean isRebuildSelecting(){
return rebuildMode;
}
@Override
protected int schemOriginX(){
Tmp.v1.setZero();
@@ -496,7 +513,8 @@ public class MobileInput extends InputHandler implements GestureListener{
//call tap events
if(pointer == 0 && !selecting){
if(schematicMode && block == null){
mode = schematicSelect;
mode = rebuildMode ? rebuildSelect : schematicSelect;
//engage schematic selection mode
int tileX = tileX(screenX);
int tileY = tileY(screenY);
@@ -546,6 +564,9 @@ public class MobileInput extends InputHandler implements GestureListener{
}
schematicMode = false;
mode = none;
}else if(mode == rebuildSelect){
rebuildArea(lineStartX, lineStartY, lastLineX, lastLineY);
mode = none;
}else{
Tile tile = tileAt(screenX, screenY);
@@ -780,11 +801,15 @@ public class MobileInput extends InputHandler implements GestureListener{
}
//stop select when not in schematic mode
if(!schematicMode && mode == schematicSelect){
if(!schematicMode && (mode == schematicSelect || mode == rebuildSelect)){
mode = none;
}
if(mode == schematicSelect){
if(!rebuildMode && mode == rebuildSelect){
mode = none;
}
if(mode == schematicSelect || mode == rebuildSelect){
lastLineX = rawTileX();
lastLineY = rawTileY();
autoPan();