From 4cd411d5ee44e823587222531bc412e8c21c4690 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 2 Jun 2021 17:07:08 -0400
Subject: [PATCH] Duct consistency

---
 core/src/mindustry/content/Blocks.java                      | 5 +++--
 .../src/mindustry/world/blocks/distribution/DuctBridge.java | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 0f1a658539..db7a5fea65 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1034,16 +1034,17 @@ public class Blocks implements ContentList{
 
         duct = new Duct("duct"){{
             requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 5, Items.copper, 5));
-            speed = 5f;
+            speed = 4f;
         }};
 
         ductRouter = new DuctRouter("duct-router"){{
             requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 10, Items.copper, 5));
-            speed = 5f;
+            speed = 4f;
         }};
 
         ductBridge = new DuctBridge("duct-bridge"){{
             requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 20, Items.copper, 15));
+            speed = 4f;
         }};
 
         //endregion
diff --git a/core/src/mindustry/world/blocks/distribution/DuctBridge.java b/core/src/mindustry/world/blocks/distribution/DuctBridge.java
index e040f83879..10d3c287e6 100644
--- a/core/src/mindustry/world/blocks/distribution/DuctBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/DuctBridge.java
@@ -25,7 +25,7 @@ public class DuctBridge extends Block{
     public @Load("@-dir") TextureRegion dirRegion;
 
     public int range = 4;
-    public float moveDelay = 5f;
+    public float speed = 5f;
 
     public DuctBridge(String name){
         super(name);
@@ -116,12 +116,12 @@ public class DuctBridge extends Block{
                 link.occupied[rotation % 4] = this;
                 if(items.any() && link.items.total() < link.block.itemCapacity){
                     progress += edelta();
-                    while(progress > moveDelay){
+                    while(progress > speed){
                         Item next = items.take();
                         if(next != null && link.items.total() < link.block.itemCapacity){
                             link.handleItem(this, next);
                         }
-                        progress -= moveDelay;
+                        progress -= speed;
                     }
                 }
             }