diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index ecbeb7c1c8..35ac946dfa 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -883,18 +883,21 @@ public class Blocks implements ContentList{ requirements(Category.distribution, ItemStack.with(Items.copper, 1), true); health = 45; speed = 0.03f; + displayedSpeed = 4.2f; }}; titaniumConveyor = new Conveyor("titanium-conveyor"){{ requirements(Category.distribution, ItemStack.with(Items.copper, 1, Items.lead, 1, Items.titanium, 1)); health = 65; speed = 0.08f; + displayedSpeed = 10f; }}; armoredConveyor = new ArmoredConveyor("armored-conveyor"){{ requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1)); health = 180; speed = 0.08f; + displayedSpeed = 10f; }}; junction = new Junction("junction"){{ diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 23f564df04..ea81cdbb48 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -33,6 +33,7 @@ public class Conveyor extends Block implements Autotiler{ private TextureRegion[][] regions = new TextureRegion[7][4]; public float speed = 0f; + public float displayedSpeed = 0f; protected Conveyor(String name){ super(name); @@ -59,7 +60,8 @@ public class Conveyor extends Block implements Autotiler{ @Override public void setStats(){ super.setStats(); - stats.add(BlockStat.itemsMoved, speed * 60 / itemSpace, StatUnit.itemsSecond); + //have to add a custom calculated speed, since the actual movement speed is apparently not linear + stats.add(BlockStat.itemsMoved, displayedSpeed, StatUnit.itemsSecond); } @Override diff --git a/gradle.properties b/gradle.properties index 960dcb95f3..000eca165a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=3121916c9e580d298879e016929f0a9cb73fca67 +archash=b20e64361b2ad86850bb9d6f4d0c842bd1af83e5