From 5c6a155d755e5b3733afb319db4e7c78ef87ecaf Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 8 Jun 2020 10:57:52 -0400 Subject: [PATCH] cleanup --- core/src/mindustry/content/UnitTypes.java | 2 +- core/src/mindustry/entities/comp/LegsComp.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b2a6156c4d..b096bbdbbf 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -212,7 +212,7 @@ public class UnitTypes implements ContentList{ immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting); legCount = 4; legLength = 9f; - legTrns = 0.8f; + legTrns = 0.6f; legMoveSpace = 1.4f; legBend = 1f; diff --git a/core/src/mindustry/entities/comp/LegsComp.java b/core/src/mindustry/entities/comp/LegsComp.java index c3992e9593..a7ef199e4b 100644 --- a/core/src/mindustry/entities/comp/LegsComp.java +++ b/core/src/mindustry/entities/comp/LegsComp.java @@ -49,11 +49,9 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc, Elevatio float moveSpeed = type.legSpeed; int div = Math.max(legs.length / type.legGroupSize, 2); moveSpace = legLength / 1.6f / (div / 2f) * type.legMoveSpace; - totalLength += Mathf.dst(deltaX(), deltaY()); - float trns = vel().len() * 12.5f * div/1.5f * type.legTrns; - trns = moveSpace * 0.85f * type.legTrns; + float trns = moveSpace * 0.85f * type.legTrns; //rotation + offset vector Tmp.v4.trns(rot, trns); @@ -61,7 +59,6 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc, Elevatio for(int i = 0; i < legs.length; i++){ float dstRot = legAngle(rot, i); float rot2 = Angles.moveToward(dstRot, rot + (Angles.angleDist(dstRot, rot) < 90f ? 180f : 0), type.legBend * 360f / legs.length / 4f); - boolean side = i < legs.length/2; Leg l = legs[i]; float stageF = (totalLength + i*type.legPairOffset) / moveSpace;