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

Fixed shielded wall being available on Serpulo

Browse Source
This commit is contained in:
Anuken
2022-08-03 16:09:05 -04:00
parent 8a19582377
commit 58246747ee
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -1673,7 +1673,7 @@ public class Blocks{
}}; }};
shieldedWall = new ShieldWall("shielded-wall"){{ 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); consumePower(3f / 60f);
outputsPower = false; outputsPower = false;
@@ -2554,7 +2554,7 @@ public class Blocks{
explodeEffect = new MultiEffect(Fx.bigShockwave, new WrapEffect(Fx.titanSmoke, Liquids.neoplasm.color), Fx.neoplasmSplat); explodeEffect = new MultiEffect(Fx.bigShockwave, new WrapEffect(Fx.titanSmoke, Liquids.neoplasm.color), Fx.neoplasmSplat);
explodeSound = Sounds.explosionbig; explodeSound = Sounds.explosionbig;
powerProduction = 100f; powerProduction = 140f;
rebuildable = false; rebuildable = false;
explosionPuddles = 80; explosionPuddles = 80;

5
core/src/mindustry/world/blocks/defense/ShieldWall.java
View File

@@ -87,6 +87,11 @@ public class ShieldWall extends Wall{
return breakTimer > 0 || !canConsume(); return breakTimer > 0 || !canConsume();
} }
@Override
public void pickedUp(){
shieldRadius = 0f;
}
@Override @Override
public void damage(float damage){ public void damage(float damage){
float shieldTaken = broken() ? 0f : Math.min(shield, damage); float shieldTaken = broken() ? 0f : Math.min(shield, damage);