diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0a947143f8..80ce096bc6 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1673,7 +1673,7 @@ public class Blocks{ }}; shieldedWall = new ShieldWall("shielded-wall"){{ - requirements(Category.defense, ItemStack.with(Items.phaseFabric, 20, Items.surgeAlloy, 12)); + requirements(Category.defense, ItemStack.with(Items.phaseFabric, 20, Items.surgeAlloy, 12, Items.beryllium, 12)); consumePower(3f / 60f); outputsPower = false; @@ -2554,7 +2554,7 @@ public class Blocks{ explodeEffect = new MultiEffect(Fx.bigShockwave, new WrapEffect(Fx.titanSmoke, Liquids.neoplasm.color), Fx.neoplasmSplat); explodeSound = Sounds.explosionbig; - powerProduction = 100f; + powerProduction = 140f; rebuildable = false; explosionPuddles = 80; diff --git a/core/src/mindustry/world/blocks/defense/ShieldWall.java b/core/src/mindustry/world/blocks/defense/ShieldWall.java index 5fc190c099..b7878e6af4 100644 --- a/core/src/mindustry/world/blocks/defense/ShieldWall.java +++ b/core/src/mindustry/world/blocks/defense/ShieldWall.java @@ -87,6 +87,11 @@ public class ShieldWall extends Wall{ return breakTimer > 0 || !canConsume(); } + @Override + public void pickedUp(){ + shieldRadius = 0f; + } + @Override public void damage(float damage){ float shieldTaken = broken() ? 0f : Math.min(shield, damage);