Bullet cleanup

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

@@ -109,6 +109,10 @@ public abstract class BulletType extends Content{
         despawnEffect = Fx.hitBulletSmall;
     }
 
+    public BulletType(){
+        this(1f, 1f);
+    }
+
     /** Returns maximum distance the bullet this bullet type has can travel. */
     public float range(){
         return speed * lifetime * (1f - drag);
@@ -153,7 +157,7 @@ public abstract class BulletType extends Content{
         }
 
         for(int i = 0; i < lightning; i++){
-            Lightning.create(b.team, Pal.surge, lightningDamage < 0 ? damage : lightningDamage, b.x, b.y, Mathf.random(360f), lightningLength);
+            Lightning.create(b, Pal.surge, lightningDamage < 0 ? damage : lightningDamage, b.x, b.y, Mathf.random(360f), lightningLength);
         }
     }
 

core/src/mindustry/entities/bullet/LightningBulletType.java

@@ -32,6 +32,6 @@ public class LightningBulletType extends BulletType{
 
     @Override
     public void init(Bullet b){
-        Lightning.create(b.team, lightningColor, damage, b.x, b.y, b.rotation(), lightningLength + Mathf.random(lightningLengthRand));
+        Lightning.create(b, lightningColor, damage, b.x, b.y, b.rotation(), lightningLength + Mathf.random(lightningLengthRand));
     }
 }

core/src/mindustry/entities/bullet/ShrapnelBulletType.java

@@ -0,0 +1,47 @@
+package mindustry.entities.bullet;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+public class ShrapnelBulletType extends BulletType{
+    public float length = 100f;
+    public float width = 20f;
+    public Color fromColor = Color.white, toColor = Pal.lancerLaser;
+
+    public int serrations = 7;
+    public float serrationLenScl = 10f, serrationWidth = 4f, serrationSpacing = 8f, serrationSpaceOffset = 80f;
+
+    public ShrapnelBulletType(){
+        speed = 0.01f;
+        hitEffect = Fx.hitLancer;
+        shootEffect = smokeEffect = Fx.lightningShoot;
+        lifetime = 10f;
+        despawnEffect = Fx.none;
+        pierce = true;
+    }
+
+    @Override
+    public void init(Bullet b){
+        Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), length);
+    }
+
+    @Override
+    public void draw(Bullet b){
+        Draw.color(fromColor, toColor, b.fin());
+        for(int i = 0; i < serrations; i++){
+            Tmp.v1.trns(b.rotation(), i * serrationSpacing);
+            float sl = Mathf.clamp(b.fout() - 0.5f) * (serrationSpaceOffset - i * serrationLenScl);
+            Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, serrationWidth, sl, b.rotation() + 90);
+            Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, serrationWidth, sl, b.rotation() - 90);
+        }
+        Drawf.tri(b.x, b.y, width * b.fout(), (length + 50), b.rotation());
+        Drawf.tri(b.x, b.y, width * b.fout(), 10f, b.rotation() + 180f);
+        Draw.reset();
+    }
+}