Drone repair cleanup / Percentage-based repair

core/src/io/anuke/mindustry/entities/bullet/Bullet.java

@@ -209,7 +209,7 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
                 if(tile == null) return false;
                 tile = tile.target();
 
-                if(tile.entity != null && tile.entity.collide(this) && !tile.entity.isDead() && (type.collidesTeam || tile.getTeam() != team)){
+                if(tile.entity != null && tile.entity.collide(this) && type.collides(this, tile) && !tile.entity.isDead() && (type.collidesTeam || tile.getTeam() != team)){
                     if(tile.getTeam() != team){
                         tile.entity.collision(this);
                     }

core/src/io/anuke/mindustry/entities/bullet/BulletType.java

@@ -55,6 +55,10 @@ public abstract class BulletType extends Content implements BaseBulletType<Bulle
         despawneffect = BulletFx.hitBulletSmall;
     }
 
+    public boolean collides(Bullet bullet, Tile tile){
+        return true;
+    }
+
     public void hitTile(Bullet b, Tile tile){
         hit(b);
     }

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

@@ -1,19 +0,0 @@
-package io.anuke.mindustry.entities.traits;
-
-import io.anuke.ucore.entities.trait.HealthTrait;
-
-//TODO implement
-public interface RepairTrait extends TeamTrait{
-
-    HealthTrait getRepairing();
-
-    void setRepairing(HealthTrait trait);
-
-    default void drawRepair(){
-        if(getRepairing() == null) return;
-    }
-
-    default void updateRepair(){
-        if(getRepairing() == null) return;
-    }
-}

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

@@ -1,14 +1,11 @@
 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.Player;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.traits.BuilderTrait;
-import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.entities.units.BaseUnit;
 import io.anuke.mindustry.entities.units.FlyingUnit;
 import io.anuke.mindustry.entities.units.UnitCommand;
@@ -16,7 +13,6 @@ import io.anuke.mindustry.entities.units.UnitState;
 import io.anuke.mindustry.game.EventType.BuildSelectEvent;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Palette;
-import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.ItemType;
@@ -24,13 +20,11 @@ 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;
-import io.anuke.ucore.graphics.Draw;
-import io.anuke.ucore.graphics.Shapes;
-import io.anuke.ucore.util.*;
+import io.anuke.ucore.util.Geometry;
+import io.anuke.ucore.util.Mathf;
+import io.anuke.ucore.util.Structs;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -117,12 +111,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
             if(target.distanceTo(Drone.this) > type.range){
                 circle(type.range*0.9f);
             }else{
-                TileEntity entity = (TileEntity) target;
-                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);
-                }
+                getWeapon().update(Drone.this, target.getX(), target.getY());
             }
         }
     },
@@ -317,16 +306,6 @@ public class Drone extends FlyingUnit implements BuilderTrait{
             target = null;
         }
 
-        if(Net.client() && state.is(repair) && target instanceof TileEntity && target.distanceTo(this) < type.range){
-            TileEntity entity = (TileEntity) target;
-            entity.health += type.healSpeed * Timers.delta();
-            entity.health = Mathf.clamp(entity.health, 0, entity.tile.block().health);
-
-            if(timer.get(timerRepairEffect, 30)){
-                Effects.effect(BlockFx.healBlockFull, Palette.heal, entity.x, entity.y, entity.tile.block().size);
-            }
-        }
-
         updateBuilding(this);
     }
 
@@ -355,19 +334,6 @@ public class Drone extends FlyingUnit implements BuilderTrait{
     @Override
     public void drawOver(){
         trail.draw(Palette.lightTrail, 3f);
-
-        TargetTrait entity = target;
-
-        if(entity instanceof TileEntity && state.is(repair) && target.distanceTo(this) < type.range){
-            float len = 5f;
-            Draw.color(Color.BLACK, Color.WHITE, 0.95f + Mathf.absin(Timers.time(), 0.8f, 0.05f));
-            Shapes.laser("beam", "beam-end",
-                    x + Angles.trnsx(rotation, len),
-                    y + Angles.trnsy(rotation, len),
-                    entity.getX(), entity.getY());
-            Draw.color();
-        }
-
         drawBuilding(this);
     }