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

Building cleanup

Browse Source
This commit is contained in:
Anuken
2020-12-17 11:38:03 -05:00
parent 0d81681af5
commit 9f5183b36f
6 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ public class DesktopInput extends InputHandler{
drawArrow(sreq.block, sreq.x, sreq.y, sreq.rotation, valid);
}
sreq.block.drawRequest(sreq, allRequests(), valid);
sreq.block.drawPlan(sreq, allRequests(), valid);
drawSelected(sreq.x, sreq.y, sreq.block, getRequest(sreq.x, sreq.y, sreq.block.size, sreq) != null ? Pal.remove : Pal.accent);
}

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

@@ -759,14 +759,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
protected void drawRequest(BuildPlan request){
request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
request.block.drawPlan(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
}
/** Draws a placement icon for a specific block. */
protected void drawRequest(int x, int y, Block block, int rotation){
brequest.set(x, y, rotation, block);
brequest.animScale = 1f;
block.drawRequest(brequest, allRequests(), validPlace(x, y, block, rotation));
block.drawPlan(brequest, allRequests(), validPlace(x, y, block, rotation));
}
/** Remove everything from the queue in a selection. */
@@ -1048,7 +1048,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
public boolean canShoot(){
return block == null && !onConfigurable() && !isDroppingItem() && !player.unit().activelyBuilding() &&
!(player.unit() instanceof Mechc && player.unit().isFlying());
!(player.unit() instanceof Mechc && player.unit().isFlying()) && !player.unit().mining();
}
public boolean onConfigurable(){

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

@@ -292,7 +292,7 @@ public class MobileInput extends InputHandler implements GestureListener{
if(request.breaking){
drawSelected(request.x, request.y, tile.block(), Pal.remove);
}else{
request.block.drawRequest(request, allRequests(), true);
request.block.drawPlan(request, allRequests(), true);
}
}
@@ -311,7 +311,7 @@ public class MobileInput extends InputHandler implements GestureListener{
if(i == lineRequests.size - 1 && request.block.rotate){
drawArrow(block, request.x, request.y, request.rotation);
}
request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
request.block.drawPlan(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
drawSelected(request.x, request.y, request.block, Pal.accent);
}
}else if(mode == breaking){
@@ -391,7 +391,7 @@ public class MobileInput extends InputHandler implements GestureListener{
if(request.breaking){
drawSelected(request.x, request.y, request.tile().block(), Pal.remove);
}else{
request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
request.block.drawPlan(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
drawSelected(request.x, request.y, request.block, Pal.accent);
}
}
@@ -736,6 +736,10 @@ public class MobileInput extends InputHandler implements GestureListener{
i--;
}
}
if(player.shooting && (player.unit().activelyBuilding() || player.unit().mining())){
player.shooting = false;
}
}
protected void autoPan(){
@@ -913,7 +917,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}
//update shooting if not building + not mining
if(!player.unit().isBuilding() && player.unit().mineTile == null){
if(!player.unit().activelyBuilding() && player.unit().mineTile == null){
//autofire targeting
if(manualShooting){