mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1355

Browse Source
This commit is contained in:
Anuken 2020-01-11 12:47:54 -05:00
parent 647ae27020
commit 35835cacd3
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/content/Blocks.java
View File

@ -883,18 +883,21 @@ public class Blocks implements ContentList{
requirements(Category.distribution, ItemStack.with(Items.copper, 1), true); requirements(Category.distribution, ItemStack.with(Items.copper, 1), true);
health = 45; health = 45;
speed = 0.03f; speed = 0.03f;
displayedSpeed = 4.2f;
}}; }};
titaniumConveyor = new Conveyor("titanium-conveyor"){{ titaniumConveyor = new Conveyor("titanium-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 1, Items.lead, 1, Items.titanium, 1)); requirements(Category.distribution, ItemStack.with(Items.copper, 1, Items.lead, 1, Items.titanium, 1));
health = 65; health = 65;
speed = 0.08f; speed = 0.08f;
displayedSpeed = 10f;
}}; }};
armoredConveyor = new ArmoredConveyor("armored-conveyor"){{ armoredConveyor = new ArmoredConveyor("armored-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1)); requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1));
health = 180; health = 180;
speed = 0.08f; speed = 0.08f;
displayedSpeed = 10f;
}}; }};
junction = new Junction("junction"){{ junction = new Junction("junction"){{

4
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@ -33,6 +33,7 @@ public class Conveyor extends Block implements Autotiler{
private TextureRegion[][] regions = new TextureRegion[7][4]; private TextureRegion[][] regions = new TextureRegion[7][4];
public float speed = 0f; public float speed = 0f;
public float displayedSpeed = 0f;
protected Conveyor(String name){ protected Conveyor(String name){
super(name); super(name);
@ -59,7 +60,8 @@ public class Conveyor extends Block implements Autotiler{
@Override @Override
public void setStats(){ public void setStats(){
super.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 @Override

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=3121916c9e580d298879e016929f0a9cb73fca67 archash=b20e64361b2ad86850bb9d6f4d0c842bd1af83e5