Revenant sprite / Training mode / Mine transfer range / Drone heal buff

core/src/io/anuke/mindustry/content/Recipes.java

@@ -35,7 +35,7 @@ public class Recipes implements ContentList{
         new Recipe(defense, DefenseBlocks.surgeWallLarge, new ItemStack(Items.surgealloy, 12 * 4));
 
         //projectors
-        new Recipe(defense, DefenseBlocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 50), new ItemStack(Items.silicon, 250));
+        new Recipe(defense, DefenseBlocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 50), new ItemStack(Items.silicon, 180));
         new Recipe(defense, DefenseBlocks.overdriveProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250));
         new Recipe(defense, DefenseBlocks.forceProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250));
 
@@ -54,8 +54,8 @@ public class Recipes implements ContentList{
         new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120));
         new Recipe(weapon, TurretBlocks.cyclone, new ItemStack(Items.copper, 400), new ItemStack(Items.densealloy, 400), new ItemStack(Items.surgealloy, 200), new ItemStack(Items.plastanium, 150));
         new Recipe(weapon, TurretBlocks.fuse, new ItemStack(Items.copper, 450), new ItemStack(Items.densealloy, 450), new ItemStack(Items.surgealloy, 250));
-        new Recipe(weapon, TurretBlocks.spectre, new ItemStack(Items.copper, 700), new ItemStack(Items.densealloy, 600), new ItemStack(Items.surgealloy, 400), new ItemStack(Items.plastanium, 350), new ItemStack(Items.thorium, 400));
-        new Recipe(weapon, TurretBlocks.meltdown, new ItemStack(Items.copper, 500), new ItemStack(Items.lead, 700), new ItemStack(Items.densealloy, 500), new ItemStack(Items.surgealloy, 600), new ItemStack(Items.silicon, 550));
+        new Recipe(weapon, TurretBlocks.spectre, new ItemStack(Items.copper, 700), new ItemStack(Items.densealloy, 600), new ItemStack(Items.surgealloy, 500), new ItemStack(Items.plastanium, 350), new ItemStack(Items.thorium, 500));
+        new Recipe(weapon, TurretBlocks.meltdown, new ItemStack(Items.copper, 500), new ItemStack(Items.lead, 700), new ItemStack(Items.densealloy, 600), new ItemStack(Items.surgealloy, 650), new ItemStack(Items.silicon, 650));
 
         //DISTRIBUTION
         new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1));

core/src/io/anuke/mindustry/content/UnitTypes.java

@@ -8,7 +8,7 @@ import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.type.ContentType;
 
 public class UnitTypes implements ContentList{
-    public static UnitType drone, alphaDrone, dagger, interceptor, monsoon, titan, fortress, fabricator;
+    public static UnitType drone, alphaDrone, dagger, wraith, monsoon, revenant, titan, fortress, fabricator;
 
     @Override
     public void load(){
@@ -18,7 +18,7 @@ public class UnitTypes implements ContentList{
             speed = 0.2f;
             maxVelocity = 0.8f;
             range = 50f;
-            healSpeed = 0.05f;
+            healSpeed = 0.25f;
             health = 60;
         }};
 
@@ -46,7 +46,7 @@ public class UnitTypes implements ContentList{
             drag = 0.4f;
             range = 40f;
             weapon = Weapons.chainBlaster;
-            health = 180;
+            health = 150;
         }};
 
         titan = new UnitType("titan", Titan.class, Titan::new){{
@@ -55,7 +55,7 @@ public class UnitTypes implements ContentList{
             drag = 0.4f;
             range = 10f;
             weapon = Weapons.flamethrower;
-            health = 500;
+            health = 440;
         }};
 
         fortress = new UnitType("fortress", Fortress.class, Fortress::new){{
@@ -63,11 +63,11 @@ public class UnitTypes implements ContentList{
             speed = 0.18f;
             drag = 0.4f;
             range = 10f;
-            weapon = Weapons.flamethrower;
+            weapon = Weapons.artillery;
             health = 500;
         }};
 
-        interceptor = new UnitType("interceptor", Interceptor.class, Interceptor::new){{
+        wraith = new UnitType("wraith", Wraith.class, Wraith::new){{
             speed = 0.3f;
             maxVelocity = 1.9f;
             drag = 0.01f;
@@ -85,6 +85,15 @@ public class UnitTypes implements ContentList{
             weapon = Weapons.bomber;
         }};
 
+        revenant = new UnitType("revenant", Revenant.class, Revenant::new){{
+            health = 250;
+            speed = 0.2f;
+            maxVelocity = 1.4f;
+            drag = 0.01f;
+            isFlying = true;
+            weapon = Weapons.bomber;
+        }};
+
         fabricator = new UnitType("fabricator", Fabricator.class, Fabricator::new){{
             isFlying = true;
             drag = 0.01f;
@@ -95,7 +104,7 @@ public class UnitTypes implements ContentList{
             health = 220;
             buildPower = 0.9f;
             minePower = 1.1f;
-            healSpeed = 0.09f;
+            healSpeed = 0.55f;
             toMine = ObjectSet.with(Items.lead, Items.copper, Items.titanium);
         }};
     }

core/src/io/anuke/mindustry/content/Weapons.java

@@ -7,7 +7,8 @@ import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Weapon;
 
 public class Weapons implements ContentList{
-    public static Weapon blaster, blasterSmall, glaiveBlaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles;
+    public static Weapon blaster, blasterSmall, glaiveBlaster, droneBlaster, healBlaster, chainBlaster, shockgun,
+    sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles, artillery;
 
     @Override
     public void load(){
@@ -119,6 +120,15 @@ public class Weapons implements ContentList{
             ammo = AmmoTypes.flamerThermite;
         }};
 
+        artillery = new Weapon("artillery"){{
+            length = 1f;
+            reload = 60f;
+            roundrobin = true;
+            recoil = 1f;
+            ejectEffect = ShootFx.shellEjectMedium;
+            ammo = AmmoTypes.artilleryExplosive;
+        }};
+
         sapper = new Weapon("sapper"){{
             length = 1.5f;
             reload = 12f;

core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java

@@ -12,7 +12,7 @@ public class StorageBlocks extends BlockList implements ContentList{
     @Override
     public void load(){
         core = new CoreBlock("core"){{
-            health = 800;
+            health = 1400;
         }};
 
         vault = new Vault("vault"){{

core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java

@@ -30,8 +30,8 @@ public class UnitBlocks extends BlockList implements ContentList{
             consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)});
         }};
 
-        interceptorPad = new UnitPad("interceptor-pad"){{
-            type = UnitTypes.interceptor;
+        interceptorPad = new UnitPad("wraith-pad"){{
+            type = UnitTypes.wraith;
             produceTime = 1800;
             size = 2;
             consumes.power(0.1f);