From bc78d1a5617c4a5ce683c73577c6790ad905b8e1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 29 May 2019 22:29:49 -0400 Subject: [PATCH] Balancing --- .../anuke/mindustry/world/blocks/distribution/Junction.java | 3 +-- .../anuke/mindustry/world/blocks/distribution/Sorter.java | 2 +- .../io/anuke/mindustry/world/blocks/sandbox/ItemSource.java | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java index de004f27f0..f2d2786fc7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java @@ -1,6 +1,5 @@ package io.anuke.mindustry.world.blocks.distribution; -import io.anuke.arc.util.Pack; import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.gen.BufferItem; @@ -41,7 +40,7 @@ public class Junction extends Block{ if(Time.time() >= time + speed || Time.time() < time){ - Item item = content.item(Pack.rightInt(l)); + Item item = content.item(BufferItem.item(l)); Tile dest = tile.getNearby(i); //skip blocks that don't want the item, keep waiting until they do diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java index 03cd674cbb..00d53f99df 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java @@ -21,7 +21,7 @@ public class Sorter extends Block{ private static Item lastItem; protected int bufferCapacity = 20; - protected float speed = 20f; + protected float speed = 45f; public Sorter(String name){ super(name); diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java index 3c9a29e3ec..00ae2dc845 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.world.blocks.sandbox; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; +import io.anuke.arc.Core; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.entities.type.Player; @@ -37,6 +38,11 @@ public class ItemSource extends Block{ } } + @Override + public void playerPlaced(Tile tile){ + Core.app.post(() -> Call.setItemSourceItem(null, tile, lastItem)); + } + @Override public void setBars(){ super.setBars();