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

Various tweaks

Browse Source
This commit is contained in:
Anuken
2020-03-25 23:28:20 -04:00
parent e7ffb0214f
commit f966489298
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/entities/def/FlyingComp.java
View File

@@ -40,11 +40,6 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
Vec2 t = Tmp.v3.set(vector).scl(floorSpeedMultiplier()); //target vector
Tmp.v1.set(t).sub(vel).limit(acceleration * vector.len()); //delta vector
vel.add(Tmp.v1);
//float mag = Tmp.v3.len() * acceleration;
//vel.lerp(t, Tmp.v3.len() * acceleration);
//vel.x = Mathf.approach(vel.x, t.x, mag);
//vel.y = Mathf.approach(vel.y, t.y, mag);
}
float floorSpeedMultiplier(){
@@ -56,10 +51,6 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
public void update(){
Floor floor = floorOn();
if(isFlying() && !net.client()){
wobble();
}
if(isGrounded() && floor.isLiquid){
if((splashTimer += Mathf.dst(deltaX(), deltaY())) >= 7f){
floor.walkEffect.at(x, y, 0, floor.mapColor);