From d863c971c2bd5110320fd159c355ee35170e920d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 4 Mar 2021 13:40:50 -0500 Subject: [PATCH] Gradle update / Mech animation fixes / Formation movement tweaks --- core/src/mindustry/ai/types/FormationAI.java | 2 +- core/src/mindustry/entities/comp/MechComp.java | 6 +++--- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java index 49ca55c68b..7a465bf3cf 100644 --- a/core/src/mindustry/ai/types/FormationAI.java +++ b/core/src/mindustry/ai/types/FormationAI.java @@ -48,7 +48,7 @@ public class FormationAI extends AIController implements FormationMember{ Vec2 realtarget = vec.set(target).add(leader.vel); - float speed = unit.realSpeed() * unit.floorSpeedMultiplier() * Time.delta; + float speed = unit.realSpeed() * Time.delta; unit.approach(Mathf.arrive(unit.x, unit.y, realtarget.x, realtarget.y, unit.vel, speed, 0f, speed, 1f).scl(1f / Time.delta)); if(unit.canMine() && leader.canMine()){ diff --git a/core/src/mindustry/entities/comp/MechComp.java b/core/src/mindustry/entities/comp/MechComp.java index 6d99f368cb..e8ed72974d 100644 --- a/core/src/mindustry/entities/comp/MechComp.java +++ b/core/src/mindustry/entities/comp/MechComp.java @@ -78,16 +78,16 @@ abstract class MechComp implements Posc, Flyingc, Hitboxc, Unitc, Mechc, Elevati @Override public void moveAt(Vec2 vector, float acceleration){ + //mark walking state when moving in a controlled manner if(!vector.isZero()){ - //mark walking state when moving in a controlled manner walked = true; } } @Override public void approach(Vec2 vector){ - if(!vector.isZero(0.09f)){ - //mark walking state when moving in a controlled manner + //mark walking state when moving in a controlled manner + if(!vector.isZero(0.001f)){ walked = true; } } diff --git a/gradle.properties b/gradle.properties index f5c6485e88..8d7da5a740 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=9f6d0e3a7fd5defa2c3fe1cf47a22aaba423427e +archash=e270ac561e10cbc1dc1f13907d75d614e2d51be0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f9e7..442d9132ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists