From 08e36aca98e82f5eb57d6f8356aa333e2d35da35 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 23 Feb 2021 10:47:54 -0500 Subject: [PATCH] Crafter progress modulo / Segment buff --- core/src/mindustry/content/Blocks.java | 4 ++-- .../world/blocks/distribution/ItemBridge.java | 10 ++++------ .../world/blocks/production/GenericCrafter.java | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 78d27b61a2..e7d5915653 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1606,12 +1606,12 @@ public class Blocks implements ContentList{ requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phaseFabric, 40)); health = 250 * size * size; - range = 160f; + range = 180f; hasPower = true; consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null); size = 2; shootLength = 5f; - bulletDamage = 25f; + bulletDamage = 30f; reloadTime = 9f; }}; diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index b674de28b7..f4c67825eb 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -172,12 +172,10 @@ public class ItemBridge extends Block{ public void playerPlaced(Object config){ super.playerPlaced(config); - //if(config == null){ - Tile link = findLink(tile.x, tile.y); - if(linkValid(tile, link) && !proximity.contains(link.build)){ - link.build.configure(tile.pos()); - } - //} + Tile link = findLink(tile.x, tile.y); + if(linkValid(tile, link) && !proximity.contains(link.build)){ + link.build.configure(tile.pos()); + } lastBuild = this; } diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java index 25021ad20d..11b6c37bc0 100644 --- a/core/src/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java @@ -119,7 +119,7 @@ public class GenericCrafter extends Block{ } craftEffect.at(x, y); - progress = 0f; + progress %= 1f; } if(outputItem != null && timer(timerDump, dumpTime)){