From 89e1c5afc0d1bf9a961dd48cf6018b09c42fabbc Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 28 Jan 2020 00:21:05 -0500 Subject: [PATCH] Conveyor tweaks --- core/src/mindustry/world/blocks/distribution/Conveyor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 51798b8837..983db90810 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -190,7 +190,7 @@ public class Conveyor extends Block implements Autotiler{ if(e.ys[i] > nextMax) e.ys[i] = nextMax; if(e.ys[i] > 0.5 && i > 0) e.mid = i - 1; - e.xs[i] = Mathf.approachDelta(e.xs[i], 0, 0.1f); + e.xs[i] = Mathf.approachDelta(e.xs[i], 0, speed*2); if(e.ys[i] >= 1f && offloadDir(tile, e.ids[i])){ //align X position if passing forwards @@ -205,7 +205,7 @@ public class Conveyor extends Block implements Autotiler{ } } - if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.5f : 0f)){ + if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.3f : 0f)){ e.clogHeat = Mathf.lerpDelta(e.clogHeat, 1f, 0.02f); }else{ e.clogHeat = 0f; @@ -281,7 +281,7 @@ public class Conveyor extends Block implements Autotiler{ ConveyorEntity e = tile.ent(); if(e.len >= capacity) return false; int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation()); - return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.5f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); + return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.7f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); } @Override