From 353ec7db2a19cf9a6596948ef19aafb8c89bc60f Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 25 Aug 2017 17:57:04 -0400 Subject: [PATCH] Conveyors now can get clogged up at angles --- .../mindustry/world/blocks/Conveyor.java | 5 ++++- desktop/mindustry-saves/0.mins | Bin 1885 -> 3156 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/Conveyor.java index 0edbac4628..87893f2b2f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Conveyor.java @@ -90,7 +90,10 @@ public class Conveyor extends Block{ @Override public boolean accept(Item item, Tile dest, Tile source){ - return dest.entity().minitem > 0.05f; + int direction = source == null ? 0 : Math.abs(source.relativeTo(dest.x, dest.y) - dest.rotation); + float minitem = dest.entity().minitem; + return ((direction == 0) && minitem > 0.05f) || + ((direction %2 == 1) && minitem > 0.5f); } @Override diff --git a/desktop/mindustry-saves/0.mins b/desktop/mindustry-saves/0.mins index 26dc650f5b506dcc9ca887bb6c6cd235d4228bd9..c9487e3939b200a8a55e86123084c8e1bb126ee6 100644 GIT binary patch literal 3156 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