Unit tweaks

core/src/mindustry/content/Blocks.java

@@ -77,7 +77,7 @@ public class Blocks implements ContentList{
     duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, segment,
 
     //units
-    groundFactory, airFactory, navalFactory, basicReconstructor, repairPoint,
+    groundFactory, airFactory, navalFactory, basicReconstructor, advancedReconstructor, repairPoint,
 
     //campaign
     launchPad, launchPadLarge, coreSilo, dataProcessor,
@@ -1722,8 +1722,6 @@ public class Blocks implements ContentList{
         //endregion
         //region units
 
-        //for testing only.
-
         groundFactory = new UnitFactory("ground-factory"){{
             requirements(Category.units, ItemStack.with(Items.copper, 30, Items.lead, 70));
             plans = new UnitPlan[]{
@@ -1768,12 +1766,29 @@ public class Blocks implements ContentList{
             constructTime = 60f * 5f;
 
             upgrades = new UnitType[][]{
+                {UnitTypes.tau, UnitTypes.oculon},
                 {UnitTypes.dagger, UnitTypes.titan},
                 {UnitTypes.crawler, UnitTypes.eruptor},
                 {UnitTypes.wraith, UnitTypes.ghoul},
             };
         }};
 
+        advancedReconstructor = new Reconstructor("advanced-reconstructor"){{
+            requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
+
+            size = 5;
+            consumes.power(6f);
+            consumes.items(ItemStack.with(Items.silicon, 60, Items.titanium, 60));
+            itemCapacity = 80;
+
+            constructTime = 60f * 15f;
+
+            upgrades = new UnitType[][]{
+                {UnitTypes.ghoul, UnitTypes.revenant},
+                {UnitTypes.titan, UnitTypes.fortress},
+            };
+        }};
+
         repairPoint = new RepairPoint("repair-point"){{
             requirements(Category.units, ItemStack.with(Items.lead, 15, Items.copper, 15, Items.silicon, 15));
             repairSpeed = 0.5f;

core/src/mindustry/content/UnitTypes.java

@@ -96,26 +96,26 @@ public class UnitTypes implements ContentList{
         }};
 
         tau = new UnitType("tau"){{
-                itemCapacity = 60;
-                canBoost = true;
-                boostMultiplier = 1.5f;
-                speed = 0.5f;
-                hitsize = 8f;
-                health = 100f;
-                buildSpeed = 0.8f;
+            itemCapacity = 60;
+            canBoost = true;
+            boostMultiplier = 1.5f;
+            speed = 0.5f;
+            hitsize = 8f;
+            health = 100f;
+            buildSpeed = 0.8f;
 
-                weapons.add(new Weapon("heal-weapon"){{
-                    shootY = 1.5f;
-                    reload = 24f;
-                    x = 1f;
-                    shootX = 3.5f;
-                    alternate = false;
-                    ejectEffect = Fx.none;
-                    recoil = 2f;
-                    bullet = Bullets.healBullet;
-                    shootSound = Sounds.pew;
-                }});
-            }
+            weapons.add(new Weapon("heal-weapon"){{
+                shootY = 1.5f;
+                reload = 24f;
+                x = 1f;
+                shootX = 3.5f;
+                alternate = false;
+                ejectEffect = Fx.none;
+                recoil = 2f;
+                bullet = Bullets.healBullet;
+                shootSound = Sounds.pew;
+            }});
+        }
 
             /*
 
@@ -145,6 +145,39 @@ public class UnitTypes implements ContentList{
             }*/
         };
 
+        oculon = new UnitType("oculon"){{
+            drillTier = 1;
+            hitsize = 9f;
+            boostMultiplier = 2f;
+            itemCapacity = 20;
+            health = 230f;
+            buildSpeed = 1.5f;
+            canBoost = true;
+
+            speed = 0.4f;
+            hitsize = 10f;
+
+            weapons.add(new Weapon("beam-weapon"){{
+                shake = 2f;
+                shootY = 4f;
+                shootX = 6f;
+                x = 0.25f;
+                reload = 50f;
+                alternate = true;
+                recoil = 4f;
+                shootSound = Sounds.laser;
+
+                bullet = new LaserBulletType(){{
+                    damage = 20f;
+                    recoil = 1f;
+                    sideAngle = 45f;
+                    sideWidth = 1f;
+                    sideLength = 70f;
+                    colors = new Color[]{Pal.heal.cpy().a(0.4f), Pal.heal, Color.white};
+                }};
+            }});
+        }};
+
         fortress = new UnitType("fortress"){{
             speed = 0.38f;
             hitsize = 13f;
@@ -252,6 +285,8 @@ public class UnitTypes implements ContentList{
             legLengthScl = 1f;
             rippleScale = 2f;
             legSpeed = 0.2f;
+            legSplashDamage = 32;
+            legSplashRange = 30;
 
             for(boolean b : Mathf.booleans){
                 weapons.add(
@@ -479,37 +514,6 @@ public class UnitTypes implements ContentList{
             hitsize = 8f;
         }};
 
-        oculon = new UnitType("oculon"){{
-            drillTier = -1;
-            speed = 0.6f;
-            hitsize = 9f;
-            boostMultiplier = 2f;
-            itemCapacity = 15;
-            health = 160f;
-            buildSpeed = 0.9f;
-            canBoost = true;
-
-            weapons.add(new Weapon("beam-weapon"){{
-                shake = 2f;
-                shootY = 1f;
-                x = 1f;
-                shootX = 3f;
-                reload = 50f;
-                alternate = true;
-                recoil = 4f;
-                shootSound = Sounds.laser;
-
-                bullet = new LaserBulletType(){{
-                    damage = 20f;
-                    recoil = 1f;
-                    sideAngle = 45f;
-                    sideWidth = 1f;
-                    sideLength = 70f;
-                    colors = new Color[]{Pal.heal.cpy().a(0.4f), Pal.heal, Color.white};
-                }};
-            }});
-        }};
-
         trident = new UnitType("trident"){{
 
             health = 500;