Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Duct consistency

Browse Source
This commit is contained in:
Anuken
2021-06-02 17:07:08 -04:00
parent 9aae443e72
commit 4cd411d5ee
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+3 -2
View File
@@ -1034,16 +1034,17 @@ public class Blocks implements ContentList{
duct = new Duct("duct"){{ duct = new Duct("duct"){{
requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 5, Items.copper, 5)); requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 5, Items.copper, 5));
speed = 5f; speed = 4f;
}}; }};
ductRouter = new DuctRouter("duct-router"){{ ductRouter = new DuctRouter("duct-router"){{
requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 10, Items.copper, 5)); requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 10, Items.copper, 5));
speed = 5f; speed = 4f;
}}; }};
ductBridge = new DuctBridge("duct-bridge"){{ ductBridge = new DuctBridge("duct-bridge"){{
requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 20, Items.copper, 15)); requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 20, Items.copper, 15));
speed = 4f;
}}; }};
//endregion //endregion
core/src/mindustry/world/blocks/distribution/DuctBridge.java
+3 -3
View File
@@ -25,7 +25,7 @@ public class DuctBridge extends Block{
public @Load("@-dir") TextureRegion dirRegion; public @Load("@-dir") TextureRegion dirRegion;
public int range = 4; public int range = 4;
public float moveDelay = 5f; public float speed = 5f;
public DuctBridge(String name){ public DuctBridge(String name){
super(name); super(name);
@@ -116,12 +116,12 @@ public class DuctBridge extends Block{
link.occupied[rotation % 4] = this; link.occupied[rotation % 4] = this;
if(items.any() && link.items.total() < link.block.itemCapacity){ if(items.any() && link.items.total() < link.block.itemCapacity){
progress += edelta(); progress += edelta();
while(progress > moveDelay){ while(progress > speed){
Item next = items.take(); Item next = items.take();
if(next != null && link.items.total() < link.block.itemCapacity){ if(next != null && link.items.total() < link.block.itemCapacity){
link.handleItem(this, next); link.handleItem(this, next);
} }
progress -= moveDelay; progress -= speed;
} }
} }
} }