From 58cd1852f15b4b187fb179a15bcb9eee834f2540 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 16 Jun 2023 13:19:52 -0400 Subject: [PATCH] Conduit junction replacement fix --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/world/blocks/liquid/Conduit.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a50bb826ac..e545cbe9c8 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1861,7 +1861,7 @@ onset.crusher = Use \uF74D [accent]cliff crushers[] to mine sand. onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uF6A2 [accent]tank fabricator[]. onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements. onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uF6EB [accent]Breach[] turret.\nTurrets require \uF748 [accent]ammo[]. -onset.turretammo = Supply the turret with [accent]beryllium ammo.[] +onset.turretammo = Supply the turret with [accent]beryllium[] as ammo, using ducts. onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uF6EE [accent]beryllium walls[] around the turret. onset.enemies = Enemy incoming, prepare to defend. onset.attack = The enemy is vulnerable. Counter-attack. diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 011662d43e..63bd247e67 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -118,7 +118,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ public Block getReplacement(BuildPlan req, Seq plans){ if(junctionReplacement == null) return this; - Boolf cont = p -> plans.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && o.rotation == req.rotation && (req.block instanceof Conduit || req.block instanceof LiquidJunction)); + Boolf cont = p -> plans.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && (req.block instanceof Conduit || req.block instanceof LiquidJunction)); return cont.get(Geometry.d4(req.rotation)) && cont.get(Geometry.d4(req.rotation - 2)) && req.tile() != null &&