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 zcmZuzTWnNS6kXGIj5BkF&P;C~Q~RK$v?Z;yls@D`Y@`Ar3Mit0^^p)kG{*P?re`o3 zqM`{=LrBoXM3I;n`O)}+2?hxdMIIFqC>GQYG4aD_3?C-$eb^_Reec|llXcf#YwdmR zJ$G6Fr9f;${n*3}041Yi*QZ7^FIC^QbHP!%e-dR>t~^b!VowR9nA{SB18>nX2`sGU zI|B@+86<##jDXH811fdC%ODB#cxIr684`Ey6);jKpf4vN`JRB@_XX6n3TX2n+vZCi z)P5+;d=HvGVurgrKurhRnW4dQ`=!+6L5~BZ>7BzR0_`0PNL+tFnA}_e^<4rQJ`vE- z&49#p^MslEsW6Sb!c-p=kn^B-J~K37Vu66<=b}k};h8}JeM3?*!@@M*A)smz1L{8O zkT7Y-P;#vYIbZ7cOzT(Ts<=~JDF-Mgdss>X9t=A`f$6VfRIBGYKcLKFzRmLDo>vU} zEU`}1NF>_0Hv`yNez{%MwPEJM4iu zCQQq50YmpNpo!y4*&5JC=$>x;gt|@WYC>0&x|-BgqpRj-mE$|ywExjNUP^avie*f> zPuRUQYr~(=NpqcN&U7pWlg+*5$m3jO+fx~(1 z+YY;nx`gdz)MZ7qi=zs<&^+dp?ox)$7LyhSEp}N-4qHeazb~5ny-umX5{p*yTTEGe zY4HwcIiGGHU+Ijz_*WG_9ib9YRU)cNMpenE%0yM>rmEm@JZI6d9p&3_?Nuz_%o}){ zH{hLln0c^RIyn6@}%@d{h+=d!j0GnN)A@-=XVS2}j)fvDb`)h$XfY>~CNXeqyl zJ_zY4d5At_cbd(rBKhZZei@#y(qcEaC}Igh77913izH9#d?s=VC&OaV$i@z*R zS-i;&3S1NtgbYMAo~MO>PkJ2SSN+gTCn}jAb(2zTvS@crkSdU}imxD~C(5kVi5GNY z467`SszpIaL@^^5XyH-K!#eLLomYyL7XMg$%&A%$grt;b*6FZ|I;;dYUPt8+C23s{ z(os^wI$GR(kLbutI@1|5OO<(d6kLrlaIwFR}mdskzaM_#JYx9&gmtd>K zG4_Xa8?^0;w#D!_d$g$eito8mn|}_Qo7t>IO&h)WF>RjKW>TfJqHUU;^v|Uk*Uqa^ zr&i>~*-3{e`?!EE50bwKGslDYQ_Rpe(dWV7Z^GQRi2+T}|GO~54p4H{bzyFQTEH!T V2Vpfk#TW4l2<8*` zAn1!AT3ql&K|~QmaqD75MX};z5f@y(f_Tp5T;cYa#*yHH ze-8loybAzc=GJ`w+PeU*XJNAspzbYV-Dv|)tLPR>y!H=twt90v&SEhRhF7;<_2w!k z#meW6HU9RFfBqv@06z)N1N5B3EBFE0aUXz2fW$>sN-jgPiA#k`tYlgkx-JvoV95kS z+Z6)LDJ>9Sa(9ZA<{b>_s|=xQ1n3D%C|+kJaf3aPo2(Rb3~rl*4hHi!gCikwhm~lF zp-Dn)Co6@!1UP)KivVX1Nhsc9#lBB~6K;P%K;|+-!!Cx90BkoOvf}m+8CB_=(kj?aF)HKL^w+v9T;STDF6qu2NkEiEH)#T{QMl%kzeKr{|bXWq(-dh z5vn6T#GNS-K@Zcg%o$n5#i= z4Szx>xVu||JE>X?s7GJoJ^PXpQj?_Mm}v>YDfYx9xKnBt)}0S*at~-VbDC?G0Q_mO z)}(t{bGrvMDe+O-XS7=L4AtmkJ*3qNpSad?m;>yitmKZdl9v!(XC);7rwn`{1*2Of zM81-OC0jybo|UvzG7>sO3ENZO*pn52&%(Cvq+lt3f&i7W095LKNrnFWs8oMSz+YsZ Bpz{C#