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

cleanup

Browse Source
This commit is contained in:
Anuken
2020-06-08 10:57:52 -04:00
parent 4537c4ea57
commit 5c6a155d75
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/UnitTypes.java
+1 -1
View File
@@ -212,7 +212,7 @@ public class UnitTypes implements ContentList{
immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting); immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
legCount = 4; legCount = 4;
legLength = 9f; legLength = 9f;
legTrns = 0.8f; legTrns = 0.6f;
legMoveSpace = 1.4f; legMoveSpace = 1.4f;
legBend = 1f; legBend = 1f;
core/src/mindustry/entities/comp/LegsComp.java
+1 -4
View File
@@ -49,11 +49,9 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc, Elevatio
float moveSpeed = type.legSpeed; float moveSpeed = type.legSpeed;
int div = Math.max(legs.length / type.legGroupSize, 2); int div = Math.max(legs.length / type.legGroupSize, 2);
moveSpace = legLength / 1.6f / (div / 2f) * type.legMoveSpace; moveSpace = legLength / 1.6f / (div / 2f) * type.legMoveSpace;
totalLength += Mathf.dst(deltaX(), deltaY()); totalLength += Mathf.dst(deltaX(), deltaY());
float trns = vel().len() * 12.5f * div/1.5f * type.legTrns; float trns = moveSpace * 0.85f * type.legTrns;
trns = moveSpace * 0.85f * type.legTrns;
//rotation + offset vector //rotation + offset vector
Tmp.v4.trns(rot, trns); 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++){ for(int i = 0; i < legs.length; i++){
float dstRot = legAngle(rot, 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); 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]; Leg l = legs[i];
float stageF = (totalLength + i*type.legPairOffset) / moveSpace; float stageF = (totalLength + i*type.legPairOffset) / moveSpace;