From 2f6846d8c386144789172adb46f7064c1a55f031 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 14 Jul 2021 15:12:00 -0400 Subject: [PATCH] Conveyor tweaks --- core/src/mindustry/world/blocks/distribution/Conveyor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index a5608bd1f6..1714e038df 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -14,7 +14,6 @@ import mindustry.gen.*; import mindustry.graphics.*; import mindustry.input.*; import mindustry.type.*; -import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.*; import mindustry.world.meta.*; @@ -247,7 +246,7 @@ public class Conveyor extends Block implements Autotiler{ if(ys[i] > nextMax) ys[i] = nextMax; if(ys[i] > 0.5 && i > 0) mid = i - 1; - xs[i] = Mathf.approachDelta(xs[i], 0, speed*2); + xs[i] = Mathf.approach(xs[i], 0, moved*2); if(ys[i] >= 1f && pass(ids[i])){ //align X position if passing forwards @@ -263,7 +262,7 @@ public class Conveyor extends Block implements Autotiler{ } if(minitem < itemSpace + (blendbits == 1 ? 0.3f : 0f)){ - clogHeat = Mathf.lerpDelta(clogHeat, 1f, 0.02f); + clogHeat = Mathf.approachDelta(clogHeat, 1f, 1f / 60f); }else{ clogHeat = 0f; }