Implemented 'railgun' turret / Hierarchy split / Color refactoring

This commit is contained in:
Anuken
2018-04-04 16:44:32 -04:00
parent 641a4b87c6
commit 1956fccbe9
19 changed files with 449 additions and 307 deletions
@@ -1,5 +1,6 @@
package io.anuke.mindustry.entities;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.IntSet;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Tile;
@@ -11,6 +12,8 @@ import io.anuke.ucore.util.Timer;
import static io.anuke.mindustry.Vars.*;
public class Bullet extends BulletEntity{
private static Vector2 vector = new Vector2();
public IntSet collided;
public Timer timer = new Timer(3);
public Team team;
@@ -68,6 +71,11 @@ public class Bullet extends BulletEntity{
super.collision(other, x, y);
if(type.pierce)
collided.add(other.id);
if(other instanceof Unit){
float k = ((BulletType)type).knockback;
((Unit) other).velocity.add(vector.set(other.x, other.y).sub(x, y).setLength(k));
}
}
@Override
@@ -5,6 +5,7 @@ import io.anuke.ucore.core.Effects;
import io.anuke.ucore.entities.BaseBulletType;
public abstract class BulletType extends BaseBulletType<Bullet>{
public float knockback;
public BulletType(float speed, int damage){
this.speed = speed;