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

core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java

@@ -24,10 +24,7 @@ import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.graphics.Fill;
 import io.anuke.ucore.graphics.Lines;
 import io.anuke.ucore.graphics.Shapes;
-import io.anuke.ucore.util.Angles;
-import io.anuke.ucore.util.Geometry;
-import io.anuke.ucore.util.Mathf;
-import io.anuke.ucore.util.Translator;
+import io.anuke.ucore.util.*;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -246,12 +243,18 @@ public interface BuilderTrait extends Entity{
             Item item = tile.floor().drops.item;
             unit.rotation = Mathf.slerpDelta(unit.rotation, unit.angleTo(tile.worldx(), tile.worldy()), 0.4f);
 
-            if(core.items.get(item) < core.tile.block().getMaximumAccepted(core.tile, item) &&
-                    Mathf.chance(Timers.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){
+            if(Mathf.chance(Timers.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){
 
-                Call.transferItemTo(item, 1,
-                tile.worldx() + Mathf.range(tilesize / 2f),
-                tile.worldy() + Mathf.range(tilesize / 2f), core.tile);
+                if(unit.distanceTo(core) < mineTransferRange && core.items.get(item) < core.tile.block().getMaximumAccepted(core.tile, item)){
+                    Call.transferItemTo(item, 1,
+                        tile.worldx() + Mathf.range(tilesize / 2f),
+                        tile.worldy() + Mathf.range(tilesize / 2f), core.tile);
+                }else if(unit.inventory.canAcceptItem(item)){
+                    Call.transferItemToUnit(item,
+                        tile.worldx() + Mathf.range(tilesize / 2f),
+                        tile.worldy() + Mathf.range(tilesize / 2f),
+                        unit);
+                }
             }
 
             if(Mathf.chance(0.06 * Timers.delta())){

core/src/io/anuke/mindustry/entities/units/UnitType.java

@@ -41,7 +41,7 @@ public class UnitType extends UnlockableContent{
     public float carryWeight = 1f;
     public int itemCapacity = 30;
     public ObjectSet<Item> toMine = ObjectSet.with(Items.lead, Items.copper);
-    public float buildPower = 0.3f, minePower = 0.7f, healSpeed = 0.1f;
+    public float buildPower = 0.3f, minePower = 0.7f, healSpeed = 2f;
     public Weapon weapon = Weapons.blaster;
     public float weaponOffsetX, weaponOffsetY;
     public Color trailColor = Color.valueOf("ffa665");

core/src/io/anuke/mindustry/entities/units/types/Drone.java

@@ -3,6 +3,7 @@ package io.anuke.mindustry.entities.units.types;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.utils.Queue;
 import io.anuke.mindustry.content.blocks.Blocks;
+import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.effect.ItemDrop;
@@ -23,6 +24,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BuildBlock;
 import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
 import io.anuke.mindustry.world.meta.BlockFlag;
+import io.anuke.ucore.core.Effects;
 import io.anuke.ucore.core.Events;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.entities.EntityGroup;
@@ -43,6 +45,7 @@ import static io.anuke.mindustry.Vars.*;
 public class Drone extends FlyingUnit implements BuilderTrait{
     protected static float discoverRange = 120f;
     protected static boolean initialized;
+    protected static int timerRepairEffect = timerIndex++;
 
     protected Item targetItem;
     protected Tile mineTile;
@@ -116,8 +119,11 @@ public class Drone extends FlyingUnit implements BuilderTrait{
                 circle(type.range);
             }else{
                 TileEntity entity = (TileEntity) target;
-                entity.health += type.healSpeed * Timers.delta();
-                entity.health = Mathf.clamp(entity.health, 0, entity.tile.block().health);
+                entity.healBy(type.healSpeed * entity.tile.block().health / 100f * Timers.delta());
+
+                if(timer.get(timerRepairEffect, 30)){
+                    Effects.effect(BlockFx.healBlockFull, Palette.heal, entity.x, entity.y, entity.tile.block().size);
+                }
             }
         }
     },

core/src/io/anuke/mindustry/entities/units/types/Revenant.java

@@ -0,0 +1,6 @@
+package io.anuke.mindustry.entities.units.types;
+
+import io.anuke.mindustry.entities.units.FlyingUnit;
+
+public class Revenant extends FlyingUnit{
+}

core/src/io/anuke/mindustry/entities/units/types/Wraith.java

@@ -2,6 +2,6 @@ package io.anuke.mindustry.entities.units.types;
 
 import io.anuke.mindustry.entities.units.FlyingUnit;
 
-public class Interceptor extends FlyingUnit{
+public class Wraith extends FlyingUnit{
 
 }