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

Fixed #7033

Browse Source
This commit is contained in:
Anuken
2022-06-17 08:51:58 -04:00
parent 55e03635c6
commit 6409a96e45
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1682,6 +1682,8 @@ public class Blocks{
consumesPower = true; consumesPower = true;
conductivePower = true; conductivePower = true;
chanceDeflect = 8f;
health = 260 * wallHealthMultiplier * 4; health = 260 * wallHealthMultiplier * 4;
armor = 15f; armor = 15f;
size = 2; size = 2;

7
core/src/mindustry/type/UnitType.java
View File

@@ -857,8 +857,6 @@ public class UnitType extends UnlockableContent{
var toOutline = new Seq<TextureRegion>(); var toOutline = new Seq<TextureRegion>();
getRegionsToOutline(toOutline); getRegionsToOutline(toOutline);
boolean separateOutline = weapons.contains(w -> !w.top);
for(var region : toOutline){ for(var region : toOutline){
if(region instanceof AtlasRegion atlas){ if(region instanceof AtlasRegion atlas){
String regionName = atlas.name; String regionName = atlas.name;
@@ -890,9 +888,8 @@ public class UnitType extends UnlockableContent{
} }
for(Weapon weapon : weapons){ for(Weapon weapon : weapons){
if(!weapon.name.isEmpty() && (minfo.mod == null || weapon.name.startsWith(minfo.mod.name))){ if(!weapon.name.isEmpty() && (minfo.mod == null || weapon.name.startsWith(minfo.mod.name)) && !(!weapon.top && packer.isOutlined(weapon.name))){
//TODO makeNew isn't really necessary here is it makeOutline(PageType.main, packer, weapon.region, !weapon.top, outlineColor, outlineRadius);
makeOutline(PageType.main, packer, weapon.region, separateOutline, outlineColor, outlineRadius);
} }
} }
} }