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

Fixed #9520

Browse Source
This commit is contained in:
Anuken
2024-02-05 21:19:16 -05:00
parent 8d36c7710c
commit f2c267fd75
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/UnitTypes.java
View File

@@ -4063,6 +4063,8 @@ public class UnitTypes{
isEnemy = false; isEnemy = false;
envDisabled = 0; envDisabled = 0;
range = 60f;
faceTarget = true;
targetPriority = -2; targetPriority = -2;
lowAltitude = false; lowAltitude = false;
mineWalls = true; mineWalls = true;
@@ -4127,8 +4129,10 @@ public class UnitTypes{
isEnemy = false; isEnemy = false;
envDisabled = 0; envDisabled = 0;
range = 60f;
targetPriority = -2; targetPriority = -2;
lowAltitude = false; lowAltitude = false;
faceTarget = true;
mineWalls = true; mineWalls = true;
mineFloor = false; mineFloor = false;
mineHardnessScaling = false; mineHardnessScaling = false;
@@ -4204,6 +4208,8 @@ public class UnitTypes{
isEnemy = false; isEnemy = false;
envDisabled = 0; envDisabled = 0;
range = 65f;
faceTarget = true;
targetPriority = -2; targetPriority = -2;
lowAltitude = false; lowAltitude = false;
mineWalls = true; mineWalls = true;

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

@@ -766,7 +766,7 @@ public class MobileInput extends InputHandler implements GestureListener{
renderer.scaleCamera(Core.input.axisTap(Binding.zoom)); renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
} }
if(!Core.settings.getBool("keyboard") && !locked){ if(!Core.settings.getBool("keyboard") && !locked && !scene.hasKeyboard()){
//move camera around //move camera around
float camSpeed = 6f; float camSpeed = 6f;
Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta * camSpeed)); Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta * camSpeed));
@@ -967,7 +967,6 @@ public class MobileInput extends InputHandler implements GestureListener{
boolean allowHealing = type.canHeal; boolean allowHealing = type.canHeal;
boolean validHealTarget = allowHealing && target instanceof Building b && b.isValid() && target.team() == unit.team && b.damaged() && target.within(unit, type.range); boolean validHealTarget = allowHealing && target instanceof Building b && b.isValid() && target.team() == unit.team && b.damaged() && target.within(unit, type.range);
boolean boosted = (unit instanceof Mechc && unit.isFlying()); boolean boosted = (unit instanceof Mechc && unit.isFlying());
//reset target if: //reset target if:
// - in the editor, or... // - in the editor, or...
// - it's both an invalid standard target and an invalid heal target // - it's both an invalid standard target and an invalid heal target