diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 6ab0b23cee..2ce1f2e24e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1682,6 +1682,8 @@ public class Blocks{ consumesPower = true; conductivePower = true; + chanceDeflect = 8f; + health = 260 * wallHealthMultiplier * 4; armor = 15f; size = 2; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index ba5c81a6ef..bfae830600 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -857,8 +857,6 @@ public class UnitType extends UnlockableContent{ var toOutline = new Seq(); getRegionsToOutline(toOutline); - boolean separateOutline = weapons.contains(w -> !w.top); - for(var region : toOutline){ if(region instanceof AtlasRegion atlas){ String regionName = atlas.name; @@ -890,9 +888,8 @@ public class UnitType extends UnlockableContent{ } for(Weapon weapon : weapons){ - if(!weapon.name.isEmpty() && (minfo.mod == null || weapon.name.startsWith(minfo.mod.name))){ - //TODO makeNew isn't really necessary here is it - makeOutline(PageType.main, packer, weapon.region, separateOutline, outlineColor, outlineRadius); + if(!weapon.name.isEmpty() && (minfo.mod == null || weapon.name.startsWith(minfo.mod.name)) && !(!weapon.top && packer.isOutlined(weapon.name))){ + makeOutline(PageType.main, packer, weapon.region, !weapon.top, outlineColor, outlineRadius); } } }