Erekir vanquish rework + misc rebalance

core/assets/bundles/bundle.properties

@@ -1079,6 +1079,8 @@ stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
+stat.rotateSpeedMultiplier = Rotate Speed Multiplier
+stat.weaponRotateMultiplier = Weapon Rotate Speed Multiplier
 stat.reloadmultiplier = Reload Multiplier
 stat.buildspeedmultiplier = Build Speed Multiplier
 stat.reactive = Reacts
@@ -1115,6 +1117,8 @@ ability.spawndeath = Death Spawns
 ability.spawndeath.description = Releases units on death
 ability.liquidexplode = Death Spillage
 ability.liquidexplode.description = Spills liquid on death
+ability.laststand = Last Stand
+ability.laststand.description = Increases its stats the lower its health is
 
 ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
 ability.stat.regen = [stat]{0}[lightgray] health/sec
@@ -1130,6 +1134,12 @@ ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
 ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
 ability.stat.duration = [stat]{0} sec[lightgray] duration
 ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+ability.stat.minhealthboost = [stat]{0}[lightgray] minimum health for max boost
+ability.stat.maxboosteffect = [lightgray] effect at max boost
+ability.stat.maxdamagemultiplier = [stat]{0}%[lightgray] max damage
+ability.stat.maxreloadmultiplier = [stat]{0}%[lightgray] max reload
+ability.stat.maxspeedmultiplier = [stat]{0}%[lightgray] max speed
+ability.stat.maxrotatespeedmultiplier = [stat]{0}%[lightgray] max rotation speed
 
 bar.displaytoolarge = Dimensions too large\n(Max: {0}x{0})
 bar.onlycoredeposit = Only Core Depositing Allowed
@@ -2478,9 +2488,9 @@ unit.navanax.description = Fires explosive EMP projectiles, dealing significant
 #Erekir
 unit.stell.description = Fires standard bullets at enemy targets.
 unit.locus.description = Fires alternating bullets at enemy targets.
-unit.precept.description = Fires piercing cluster bullets at enemy targets. Less affected by harmful terrain.
-unit.vanquish.description = Fires large piercing splitting bullets at enemy targets. Less affected by harmful terrain.
-unit.conquer.description = Fires large piercing cascades of bullets at enemy targets. Less affected by harmful terrain.
+unit.precept.description = Fires piercing cluster bullets at enemy targets. Less affected by liquid drag.
+unit.vanquish.description = Fires railgun shells and bullets at enemy targets. Less affected by liquid drag.
+unit.conquer.description = Fires large piercing cascades of bullets at enemy targets. Significantly less affected by liquid drag.
 unit.merui.description = Fires long-range artillery at enemy ground targets. Can step over most terrain.
 unit.cleroi.description = Fires dual shells at enemy targets. Targets enemy projectiles with point defense turrets. Can step over most terrain.
 unit.anthicus.description = Fires long-range homing missiles at enemy targets. Can step over most terrain.

core/src/mindustry/content/Blocks.java

@@ -5144,6 +5144,7 @@ Items.carbide, new BulletType(0f, 0f){{
                     speed = 4.6f;
                     maxRange = 6f;
                     lifetime = 60f * 5.5f;
+                    hitSize = 10f;
                     outlineColor = Pal.darkOutline;
                     engineColor = trailColor = Pal.redLight;
                     engineLayer = Layer.effect;
@@ -5224,13 +5225,14 @@ Items.phaseFabric, new BulletType(0f, 0f){{
                 shootEffect = Fx.shootBig;
                 smokeEffect = Fx.shootSmokeMissileColor;
                 hitColor = Color.valueOf("ffd37f");
-                ammoMultiplier = 3f;
+                ammoMultiplier = 5f;
                 reloadMultiplier = 0.8f;
 
                 spawnUnit = new MissileUnitType("scathe-missile-phase"){{
-                    speed = 4f;
+                    speed = 2.5f;
                     maxRange = 6f;
-                    lifetime = 60f * 6.1f;
+                    lifetime = 60f * 9.77f;
+                    hitSize = 10f;
                     outlineColor = Pal.darkOutline;
                     engineColor = trailColor = Color.valueOf("ffd37f");
                     engineLayer = Layer.effect;
@@ -5268,10 +5270,9 @@ Items.phaseFabric, new BulletType(0f, 0f){{
                         deathExplosionEffect = Fx.massiveExplosion;
                         shootOnDeath = true;
                         shake = 10f;
-                        bullet = new ExplosionBulletType(400f, 120f){{
-                            //stats must be mirrored to the bullet that the unit uses
+                        bullet = new ExplosionBulletType(320f, 120f){{
                             reloadMultiplier = 0.8f;
-                            ammoMultiplier = 3f;
+                            ammoMultiplier = 5f;
 
                             hitColor = engineColor;
                             shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosion, Fx.scatheLight, new WaveEffect(){{
@@ -5295,7 +5296,7 @@ Items.phaseFabric, new BulletType(0f, 0f){{
                                 width = height = 18f;
                                 collidesTiles = false;
                                 splashDamageRadius = 56f;
-                                splashDamage = 164f;
+                                splashDamage = 120f;
                                 backColor = trailColor = hitColor = engineColor;
                                 frontColor = Color.white;
                                 smokeEffect = Fx.shootBigSmoke2;
@@ -5316,10 +5317,10 @@ Items.phaseFabric, new BulletType(0f, 0f){{
                         rotation = 180f;
                         y = -9f;
                         color = Color.grays(0.6f).lerp(Pal.redLight, 0.5f).a(0.4f);
-                        interval = 7f;
+                        interval = 15f;
                     }});
 
-                    abilities.add(new ForceFieldAbility(90f, 0f, 2000f, 999999999f));
+                    abilities.add(new ForceFieldAbility(120f, 0f, 3000f, 999999999f));
 
                 }};
             }},
@@ -5330,13 +5331,13 @@ Items.surgeAlloy, new BulletType(0f, 0f){{
                 hitColor = Color.valueOf("f7e97e");
 
                 ammoMultiplier = 1f;
-                rangeChange = -8f*9f;
                 reloadMultiplier = 0.9f;
 
                 spawnUnit = new MissileUnitType("scathe-missile-surge"){{
                     speed = 4.4f;
                     maxRange = 6f;
                     lifetime = 60f * 1.4f;
+                    hitSize = 10f;
                     outlineColor = Pal.darkOutline;
                     engineColor = trailColor = Color.valueOf("f7e97e");
                     engineLayer = Layer.effect;
@@ -5367,7 +5368,6 @@ Items.surgeAlloy, new BulletType(0f, 0f){{
                         bullet = new ExplosionBulletType(1800f, 40f){{
                             //mirror stats
                             ammoMultiplier = 1f;
-                            rangeChange = -8f*9f;
                             reloadMultiplier = 0.9f;
                             lightning = 10;
                             lightningDamage = 45f;
@@ -5392,7 +5392,7 @@ Items.surgeAlloy, new BulletType(0f, 0f){{
                                 spawnUnit = new MissileUnitType("scathe-missile-surge-split"){{
                                     speed = 4.8f;
                                     maxRange = 6f;
-                                    lifetime = 60f * 3.5f;
+                                    lifetime = 60f * 3.7f;
                                     outlineColor = Pal.darkOutline;
                                     engineColor = trailColor = Color.valueOf("f7e97e");
                                     engineLayer = Layer.effect;
@@ -6400,14 +6400,14 @@ Items.surgeAlloy, new BasicBulletType(7f, 250){{
             regionSuffix = "-dark";
             size = 5;
             plans.add(
-            new AssemblerUnitPlan(UnitTypes.vanquish, 60f * 50f, PayloadStack.list(UnitTypes.stell, 4, Blocks.tungstenWallLarge, 10)),
+            new AssemblerUnitPlan(UnitTypes.vanquish, 60f * 70f, PayloadStack.list(UnitTypes.stell, 4, Blocks.tungstenWallLarge, 12)),
             new AssemblerUnitPlan(UnitTypes.conquer, 60f * 60f * 3f, PayloadStack.list(UnitTypes.locus, 6, Blocks.carbideWallLarge, 20))
             );
             areaSize = 13;
             researchCostMultiplier = 0.4f;
 
-            consumePower(2.5f);
-            consumeLiquid(Liquids.cyanogen, 9f / 60f);
+            consumePower(3f);
+            consumeLiquid(Liquids.cyanogen, 12f / 60f);
         }};
 
         shipAssembler = new UnitAssembler("ship-assembler"){{

core/src/mindustry/content/UnitTypes.java

@@ -2698,92 +2698,150 @@ public static void load(){
             armor = 20f;
             itemCapacity = 0;
             crushDamage = 13f / 5f;
+            crushDamageRadius = 4f;
+            rotateSpeed = 1.2f;
             floorMultiplier = 0.5f;
             drownTimeMultiplier = 1.25f;
             immunities.addAll(StatusEffects.burning, StatusEffects.melting);
             treadRects = new Rect[]{new Rect(22 - 154f/2f, 16 - 154f/2f, 28, 130)};
 
+            abilities.add(new LastStandAbility(){{
+                speedMultiplier = 1.5f;
+                rotateSpeedMultiplier = 2.5f;
+                exponent = 1.5f;
+                minHealth = 0.3f;
+            }});
+
             weapons.add(new Weapon("vanquish-weapon"){{
-                shootSound = Sounds.mediumCannon;
+                shootSound = Sounds.mediumRailgun;
                 layerOffset = 0.0001f;
-                reload = 70f;
-                shootY = 71f / 4f;
+                reload = 180f;
                 shake = 5f;
                 recoil = 4f;
                 rotate = true;
                 rotateSpeed = 1f;
+                shootCone = 0f;
                 mirror = false;
-                x = 0f;
-                y = 0;
+                x = y = 0f;
                 shadow = 28f;
                 heatColor = Color.valueOf("f9350f");
-                cooldownTime = 80f;
+                cooldownTime = 160f;
 
-                bullet = new BasicBulletType(8f, 190){{
-                    sprite = "missile-large";
-                    width = 9.5f;
-                    height = 13f;
+                bullet = new RailBulletType(){{
+                    length = 230f;
+                    damage = 90f;
+                    splashDamageRadius = 32f;
+                    splashDamage = 30f;
                     lifetime = 18f;
                     hitSize = 6f;
-                    shootEffect = Fx.shootTitan;
-                    smokeEffect = Fx.shootSmokeTitan;
-                    pierceCap = 2;
-                    pierce = true;
+                    pierceCap = 1;
+                    pierce = false;
                     pierceBuilding = true;
-                    hitColor = backColor = trailColor = Color.valueOf("feb380");
-                    frontColor = Color.white;
-                    trailWidth = 3.1f;
-                    trailLength = 8;
-                    hitEffect = despawnEffect = Fx.blastExplosion;
-                    splashDamageRadius = 20f;
-                    splashDamage = 50f;
+                    setDefaults = false;
+                    hitColor = Color.valueOf("feb380");
+                    pointEffectSpace = 1f;
+                    knockback = -20f;
+
+                    pointEffect = new ParticleEffect(){{
+                        colorTo = colorFrom = Color.valueOf("feb380");
+                        line = cap = true;
+                        particles = 1;
+                        cone = length = 0f;
+                        baseLength = 2f;
+                        lifetime = Mathf.random(25f, 50f);
+                        strokeFrom = Mathf.random(2f, 6f);
+                        strokeTo = 0f;
+                        lenFrom = lenTo = 4f;
+                    }};
+
+                    shootEffect = Fx.shootTitan;
+                    smokeEffect = new ParticleEffect(){{
+                        colorTo = colorFrom = Color.valueOf("fea480");
+                        particles = Mathf.random(4, 10);
+                        length = Mathf.random(30f, 50f);
+                        lifetime = 35f;
+                        lenFrom = Mathf.random(7f, 14f);
+                        lenTo = strokeTo = 0f;
+                        strokeFrom = 2f;
+                        cone = 10f;
+                        line = true;
+                        interp = Interp.fade;
+                        interp = Interp.pow2Out;
+                        sizeInterp = Interp.pow2In;
+                    }};
+
+                    hitEffect = endEffect = new ParticleEffect(){{
+                        colorTo = Color.valueOf("feb380");
+                        particles = 8;
+                        length = 60f;
+                        lifetime = 30f;
+                        lenFrom = 10f;
+                        lenTo = strokeTo = 0f;
+                        strokeFrom = 2f;
+                        cone = 40f;
+                        line = true;
+                        interp = Interp.pow2Out;
+                        sizeInterp = Interp.pow2In;
+                    }};  
 
-                    fragOnHit = false;
                     fragRandomSpread = 0f;
                     fragSpread = 10f;
                     fragBullets = 5;
                     fragVelocityMin = 1f;
                     despawnSound = Sounds.dullExplosion;
 
-                    fragBullet = new BasicBulletType(8f, 35){{
+                    fragBullet = new BasicBulletType(8f, 35f){{
                         sprite = "missile-large";
+                        pierce = true;
+                        pierceBuilding = true;
+                        splashDamageRadius = 20f;
+                        splashDamage = 15f;
+                        pierceCap = 2;
                         width = 8f;
                         height = 12f;
-                        lifetime = 15f;
+                        lifetime = 10f;
                         hitSize = 4f;
                         hitColor = backColor = trailColor = Color.valueOf("feb380");
                         frontColor = Color.white;
                         trailWidth = 2.8f;
                         trailLength = 6;
                         hitEffect = despawnEffect = Fx.blastExplosion;
-                        splashDamageRadius = 10f;
-                        splashDamage = 20f;
                     }};
                 }};
             }});
 
             int i = 0;
-            for(float f : new float[]{34f / 4f, -36f / 4f}){
+            for(float f : new float[] { 34f / 4f, -36f / 4f }){
                 int fi = i ++;
                 weapons.add(new Weapon("vanquish-point-weapon"){{
-                    reload = 35f + fi * 5;
+                    reload = 22f;
                     x = 48f / 4f;
                     y = f;
                     shootY = 5.5f;
                     recoil = 2f;
                     rotate = true;
-                    rotateSpeed = 2f;
+                    rotateSpeed = 3f;
+                    shootCone = 30f;
+                    shootSound = Sounds.shoot;
+                    layerOffset = 0.00001f;
+                    mirror = true;
+                    alternate = true;
+                    minWarmup = fi / 2f;
 
-                    bullet = new BasicBulletType(4.5f, 25){{
-                        width = 6.5f;
-                        height = 11f;
+                    bullet = new BasicBulletType(12f, 50f){{
+                        sprite = "missile-large";
+                        width = 9.5f;
+                        height = 13f;
+                        lifetime = 10f;
+                        hitSize = 6f;
                         shootEffect = Fx.sparkShoot;
                         smokeEffect = Fx.shootBigSmoke;
                         hitColor = backColor = trailColor = Color.valueOf("feb380");
                         frontColor = Color.white;
-                        trailWidth = 1.5f;
-                        trailLength = 4;
-                        hitEffect = despawnEffect = Fx.hitBulletColor;
+                        trailWidth = 3.1f;
+                        trailLength = 8;
+                        hitEffect = Fx.blastExplosion;
+                        despawnEffect = Fx.hitBulletColor;
                     }};
                 }});
             }
@@ -3162,7 +3220,7 @@ public static void load(){
             drag = 0.1f;
             hitSize = 21f;
             rotateSpeed = 3f;
-            health = 2900;
+            health = 2700;
             armor = 7f;
             fogRadius = 40f;
             stepShake = 0f;
@@ -3273,7 +3331,7 @@ public static void load(){
                         trailColor = engineColor = Pal.techBlue;
                         engineSize = 1.75f;
                         engineLayer = Layer.effect;
-                        speed = 3.7f;
+                        speed = 3.35f;
                         maxRange = 6f;
                         lifetime = 60f * 1.5f;
                         outlineColor = Pal.darkOutline;
@@ -3834,7 +3892,7 @@ public static void load(){
             health = 6000f;
             armor = 4f;
             hitSize = 36f;
-            payloadCapacity = Mathf.sqr(3f) * tilePayload;
+            payloadCapacity = Mathf.sqr(4f) * tilePayload;
             researchCostMultiplier = 0f;
             targetAir = false;