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

More mobile input targeting fixes

Browse Source
This commit is contained in:
Anuken
2021-07-20 10:20:06 -04:00
parent c18ab184b7
commit 0e3bb40eb4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}else{ }else{
Building tile = world.buildWorld(x, y); Building tile = world.buildWorld(x, y);
if((tile != null && player.team().isEnemy(tile.team) && tile.team != Team.derelict) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){ if((tile != null && player.team().isEnemy(tile.team) && (tile.team != Team.derelict || state.rules.coreCapture)) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
player.unit().mineTile = null; player.unit().mineTile = null;
target = tile; target = tile;
} }
@@ -938,7 +938,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}else if(target == null){ }else if(target == null){
player.shooting = false; player.shooting = false;
if(Core.settings.getBool("autotarget") && !(player.unit() instanceof BlockUnitUnit u && u.tile() instanceof ControlBlock c && !c.shouldAutoTarget())){ if(Core.settings.getBool("autotarget") && !(player.unit() instanceof BlockUnitUnit u && u.tile() instanceof ControlBlock c && !c.shouldAutoTarget())){
target = Units.closestTarget(unit.team, unit.x, unit.y, range, u -> u.checkTarget(type.targetAir, type.targetGround), u -> u.team != Team.derelict && type.targetGround); target = Units.closestTarget(unit.team, unit.x, unit.y, range, u -> u.checkTarget(type.targetAir, type.targetGround), u -> type.targetGround);
if(allowHealing && target == null){ if(allowHealing && target == null){
target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(Team.sharded)); target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(Team.sharded));