Bullet pierceCap fix + Malis + Other fixes

core/src/mindustry/content/Blocks.java

@@ -2987,7 +2987,7 @@ public class Blocks{
 
         //TODO these may work in space, but what's the point?
         lancer = new PowerTurret("lancer"){{
-            requirements(Category.turret, with(Items.copper, 60, Items.lead, 70, Items.silicon, 50));
+            requirements(Category.turret, with(Items.copper, 70, Items.lead, 70, Items.silicon, 70));
             range = 165f;
 
             shoot.firstShotDelay = 40f;
@@ -3020,6 +3020,8 @@ public class Blocks{
                 collidesAir = false;
                 length = 173f;
                 ammoMultiplier = 1f;
+
+                pierceCap = 4;
             }};
         }};
 
@@ -3751,6 +3753,7 @@ public class Blocks{
                 damage = 90f;
                 length = r;
                 knockback = 1f;
+                pierceCap = 3;
 
                 colors = new Color[]{Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white};
             }},
@@ -3759,6 +3762,7 @@ public class Blocks{
                 rangeChange = 70f;
                 length = r + rangeChange;
                 knockback = 2f;
+                pierceCap = 4;
 
                 colors = new Color[]{Color.valueOf("465ab8").a(0.55f), Color.valueOf("66a6d2").a(0.7f), Color.valueOf("89e8b6").a(0.8f), Color.valueOf("cafcbe"), Color.white};
                 flareColor = Color.valueOf("89e8b6");

core/src/mindustry/content/ErekirTechTree.java

@@ -225,7 +225,7 @@ public class ErekirTechTree{
                 });
             });
 
-            node(radar, Seq.with(new Research(beamNode), new Research(turbineCondenser)), () -> {
+            node(radar, Seq.with(new Research(beamNode), new Research(turbineCondenser), new Research(fabricator)), () -> {
                 node(breach, Seq.with(new Research(siliconArcFurnace), new OnSector(two)), () -> {
                     node(berylliumWall, () -> {
                         node(berylliumWallLarge, () -> {

core/src/mindustry/content/Planets.java

@@ -122,6 +122,8 @@ public class Planets{
             allowSectorInvasion = true;
             allowLaunchSchematics = true;
             ruleSetter = r -> {
+                //TODO this planet is crux, need to update all maps.
+                //r.waveTeam = Team.crux;
                 r.placeRangeCheck = false;
                 r.attributes.clear();
                 r.showSpawns = false;

core/src/mindustry/content/StatusEffects.java

@@ -161,7 +161,7 @@ public class StatusEffects{
         }};
 
         boss = new StatusEffect("boss"){{
-            color = Team.crux.color;
+            color = Team.malis.color;
             permanent = true;
             damageMultiplier = 1.3f;
             healthMultiplier = 1.5f;

core/src/mindustry/content/TeamEntries.java

@@ -8,6 +8,7 @@ public class TeamEntries{
         //TODO
         //new TeamEntry(Team.derelict);
         //new TeamEntry(Team.sharded);
+        //new TeamEntry(Team.malis);
         //new TeamEntry(Team.crux);
     }
 }

core/src/mindustry/content/UnitTypes.java

@@ -110,9 +110,9 @@ public class UnitTypes{
         }};
 
         mace = new UnitType("mace"){{
-            speed = 0.45f;
+            speed = 0.5f;
             hitSize = 10f;
-            health = 540;
+            health = 550;
             armor = 4f;
             ammoType = new ItemAmmoType(Items.coal);
 
@@ -125,11 +125,13 @@ public class UnitTypes{
                 reload = 11f;
                 recoil = 1f;
                 ejectEffect = Fx.none;
-                bullet = new BulletType(4.1f, 35f){{
+                bullet = new BulletType(4.2f, 37f){{
                     ammoMultiplier = 3f;
                     hitSize = 7f;
                     lifetime = 13f;
                     pierce = true;
+                    pierceBuilding = true;
+                    pierceCap = 2;
                     statusDuration = 60f * 4;
                     shootEffect = Fx.shootSmallFlame;
                     hitEffect = Fx.hitFlameSmall;