mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-23 22:28:08 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/types/FlyingAI.java
View File

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

2
core/src/mindustry/ai/types/FormationAI.java
View File

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

7
core/src/mindustry/ai/types/GroundAI.java
View File

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

2
core/src/mindustry/entities/comp/VelComp.java
View File

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

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

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