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

Even less wall hugging

Browse Source
This commit is contained in:
Anuken
2018-09-26 18:15:16 -04:00
parent 720e1a038e
commit 87b47b3042
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/io/anuke/mindustry/entities/units/GroundUnit.java
View File

@@ -29,6 +29,7 @@ public abstract class GroundUnit extends BaseUnit{
protected static Translator vec = new Translator(); protected static Translator vec = new Translator();
protected float walkTime; protected float walkTime;
protected float stuckTime;
protected float baseRotation; protected float baseRotation;
protected Weapon weapon; protected Weapon weapon;
@@ -80,12 +81,16 @@ public abstract class GroundUnit extends BaseUnit{
public void update(){ public void update(){
target = getClosestCore(); target = getClosestCore();
if(target != null){ if(target != null){
vec.trns(baseRotation, type.speed); if(distanceTo(target) > 400f){
velocity.add(vec.x, vec.y); moveAwayFromCore();
vec.trns(baseRotation, type.hitsizeTile); }else{
Tile tile = world.tileWorld(x + vec.x, y + vec.y); vec.trns(baseRotation, type.speed);
if((tile == null || tile.solid()) || distanceTo(target) > 400f + Mathf.randomSeed(id)*350f){ velocity.add(vec.x, vec.y);
baseRotation += Mathf.sign(id % 2 - 0.5f) * Timers.delta() * 3f; vec.trns(baseRotation, type.hitsizeTile);
Tile tile = world.tileWorld(x + vec.x, y + vec.y);
if((tile == null || tile.solid() || tile.floor().drownTime > 0) || stuckTime > 10f){
baseRotation += Mathf.sign(id % 2 - 0.5f) * Timers.delta() * 3f;
}
} }
} }
} }
@@ -144,6 +149,8 @@ public abstract class GroundUnit extends BaseUnit{
public void update(){ public void update(){
super.update(); super.update();
stuckTime = !vec.set(x, y).sub(lastPosition().x, lastPosition().y).isZero(0.0001f) ? 0f : stuckTime + Timers.delta();
if(!velocity.isZero(0.0001f) && (Units.invalidateTarget(target, this) || (distanceTo(target) > getWeapon().getAmmo().getRange()))){ if(!velocity.isZero(0.0001f) && (Units.invalidateTarget(target, this) || (distanceTo(target) > getWeapon().getAmmo().getRange()))){
rotation = Mathf.slerpDelta(rotation, velocity.angle(), 0.2f); rotation = Mathf.slerpDelta(rotation, velocity.angle(), 0.2f);
} }