Implemented dirium, finished new turret, multiple bugfixes

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

@@ -4,11 +4,19 @@ import com.badlogic.gdx.graphics.Color;
 
 import io.anuke.ucore.core.Draw;
 import io.anuke.ucore.core.Effects;
+import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.entities.BaseBulletType;
+import io.anuke.ucore.util.Angles;
+import io.anuke.ucore.util.Mathf;
 
 public abstract class BulletType  extends BaseBulletType<Bullet>{
 	public static final BulletType 
 	
+	none = new BulletType(0f, 0){
+		public void draw(Bullet b){
+			
+		}
+	},
 	stone = new BulletType(1.5f, 2){
 		public void draw(Bullet b){
 			Draw.color("gray");
@@ -30,6 +38,52 @@ public abstract class BulletType  extends BaseBulletType<Bullet>{
 			Draw.reset();
 		}
 	},
+	shell = new BulletType(1.1f, 110){
+		{
+			lifetime = 110f;
+		}
+		public void draw(Bullet b){
+			float rad = 8f;
+			Draw.color(Color.GRAY);
+			Draw.rect("circle", b.x, b.y, rad, rad);
+			rad += Mathf.sin(Timers.time(), 3f, 1f);
+			Draw.color(Color.ORANGE);
+			Draw.rect("circle", b.x, b.y, rad/1.7f, rad/1.7f);
+			Draw.reset();
+		}
+		
+		public void update(Bullet b){
+			if(Timers.get(b, "smoke", 7)){
+				Effects.effect("smoke", b.x + Mathf.range(2), b.y + Mathf.range(2));
+			}
+		}
+		
+		public void despawned(Bullet b){
+			removed(b);
+		}
+		
+		public void removed(Bullet b){
+			Effects.shake(3f, 3f, b);
+			
+			Effects.effect("shellsmoke", b);
+			Effects.effect("shellexplosion", b);
+			
+			Angles.circle(20, f->{
+				Angles.translation(f, 5f);
+				new Bullet(shellshot, b.owner, b.x + Angles.x(), b.y + Angles.y(), f).add();
+			});
+		}
+	},
+	shellshot = new BulletType(1.5f, 5){
+		{
+			lifetime = 7f;
+		}
+		public void draw(Bullet b){
+		//	Draw.color("orange");
+		//	Draw.rect("bullet", b.x, b.y, b.angle());
+		//	Draw.reset();
+		}
+	},
 	small = new BulletType(1.5f, 1){
 		public void draw(Bullet b){
 			Draw.color("orange");

core/src/io/anuke/mindustry/entities/Player.java

@@ -33,7 +33,7 @@ public class Player extends DestructibleEntity{
 	public void onDeath(){
 		remove();
 		Effects.effect("explosion", this);
-		Effects.shake(4f, 5f);
+		Effects.shake(4f, 5f, this);
 		Effects.sound("die", this);
 		
 		Vars.control.setRespawnTime(respawnduration);

core/src/io/anuke/mindustry/entities/TileEntity.java

@@ -49,7 +49,7 @@ public class TileEntity extends Entity{
 		}
 		
 		tile.setBlock(Blocks.air);
-		Effects.shake(4f, 4f);
+		Effects.shake(4f, 4f, this);
 		Effects.effect("explosion", this);
 		
 		Effects.sound("break", this);

core/src/io/anuke/mindustry/entities/enemies/Enemy.java

@@ -104,7 +104,7 @@ public class Enemy extends DestructibleEntity{
 	@Override
 	public void onDeath(){
 		Effects.effect("explosion", this);
-		Effects.shake(3f, 4f);
+		Effects.shake(3f, 4f, this);
 		Effects.sound("explosion", this);
 		remove();
 		dead = true;