This commit is contained in:
Anuken
2020-05-28 12:16:35 -04:00
parent fbc2d13435
commit c5c8d646f7
5 changed files with 6 additions and 9 deletions

View File

@@ -11,7 +11,7 @@ public class FlyingAI extends AIController{
@Override
public void update(){
if(!unit.vel().isZero(0.01f)){
if(unit.moving()){
unit.rotation(unit.vel().angle());
}

View File

@@ -34,7 +34,7 @@ public class FormationAI extends AIController implements FormationMember{
if(leader.isShooting()){
unit.aimLook(leader.aimX(), leader.aimY());
}else{
if(!unit.vel().isZero(0.001f)){
if(!unit.moving()){
unit.lookAt(unit.vel().angle());
}else{
unit.lookAt(leader.rotation());

View File

@@ -17,11 +17,6 @@ public class GroundAI extends AIController{
if(Units.invalidateTarget(target, unit.team(), unit.x(), unit.y(), Float.MAX_VALUE)){
target = null;
//TODO this is hacky, cleanup
if(unit instanceof Mechc && unit.moving()){
unit.lookAt(((Mechc)unit).baseRotation());
}
}
if(retarget()){
@@ -51,6 +46,8 @@ public class GroundAI extends AIController{
if(unit.type().hasWeapons()){
unit.aimLook(Predict.intercept(unit, target, unit.type().weapons.first().bullet.speed));
}
}else if(unit.moving()){
unit.lookAt(unit.vel().angle());
}
unit.controlWeapons(rotate, shoot);

View File

@@ -22,7 +22,7 @@ abstract class VelComp implements Posc{
}
boolean moving(){
return !vel.isZero(0.001f);
return !vel.isZero(0.01f);
}
void move(float cx, float cy){

View File

@@ -563,7 +563,7 @@ public class DesktopInput extends InputHandler{
if(aimCursor){
unit.lookAt(mouseAngle);
}else{
if(!unit.vel().isZero(0.01f)){
if(unit.moving()){
unit.lookAt(unit.vel().angle());
}
}