From 8f1869672db739f53025edc09fd5fc5fe7507401 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Fri, 2 Oct 2020 21:16:45 -0700 Subject: [PATCH 1/3] Variable fits limit. --- core/src/mindustry/world/blocks/payloads/Payload.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java index 2caadf8eb6..00364fd5af 100644 --- a/core/src/mindustry/world/blocks/payloads/Payload.java +++ b/core/src/mindustry/world/blocks/payloads/Payload.java @@ -26,8 +26,8 @@ public interface Payload{ } /** @return whether this payload fits on a standard 3x3 conveyor. */ - default boolean fits(){ - return size() / tilesize <= 2.5f; + default boolean fits(float s){ + return size() / tilesize <= s; } /** writes the payload for saving. */ From f6d805638c46317a296bcd90487f882509fd0cae Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Fri, 2 Oct 2020 21:19:53 -0700 Subject: [PATCH 2/3] Then apply flexibility to the Payload Conveyor Modding :D --- .../mindustry/world/blocks/distribution/PayloadConveyor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 6c6c61c474..7c0bbb7821 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -20,6 +20,7 @@ public class PayloadConveyor extends Block{ public @Load("@-top") TextureRegion topRegion; public @Load("@-edge") TextureRegion edgeRegion; public Interp interp = Interp.pow5; + public float payloadLimit = 2.5f; public PayloadConveyor(String name){ super(name); @@ -216,10 +217,10 @@ public class PayloadConveyor extends Block{ @Override public boolean acceptPayload(Building source, Payload payload){ if(source == this){ - return this.item == null && payload.fits(); + return this.item == null && payload.fits(payloadLimit); } //accepting payloads from units isn't supported - return this.item == null && progress <= 5f && payload.fits(); + return this.item == null && progress <= 5f && payload.fits(payloadLimit); } @Override From 8d4dff2481f6530a0a15ed1d394b718d8f6e8ff8 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Fri, 2 Oct 2020 21:22:11 -0700 Subject: [PATCH 3/3] Change the comment. --- core/src/mindustry/world/blocks/payloads/Payload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java index 00364fd5af..21b073d56e 100644 --- a/core/src/mindustry/world/blocks/payloads/Payload.java +++ b/core/src/mindustry/world/blocks/payloads/Payload.java @@ -25,7 +25,7 @@ public interface Payload{ return false; } - /** @return whether this payload fits on a standard 3x3 conveyor. */ + /** @return whether this payload fits in a given size. 2.5 is the max for a standard 3x3 conveyor. */ default boolean fits(float s){ return size() / tilesize <= s; }