New charge effect

Author: MEEPofFaith

src/progressed/content/bullets/PMBullets.java

@@ -3,6 +3,7 @@
 import arc.graphics.*;
 import mindustry.content.*;
 import mindustry.entities.bullet.*;
+import mindustry.entities.effect.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import progressed.content.*;
@@ -11,6 +12,7 @@
 import progressed.entities.bullet.energy.*;
 import progressed.entities.bullet.physical.*;
 import progressed.entities.bullet.unit.*;
+import progressed.entities.effect.*;
 
 public class PMBullets{
     public static BulletType
@@ -110,7 +112,13 @@ public static void load(){
             backMove = false;
             lightRadius = 8f;
             lightOpacity = 0.7f;
-            chargeEffect = EnergyFx.kugelblitzGrow;
+            int times = 25;
+            float life = EnergyFx.kugelblitzGrow.lifetime;
+            chargeEffect = new MultiEffect(
+                new WrapEffect(new RepeatEffect(EnergyFx.kugelblitzCharge, (life - EnergyFx.kugelblitzCharge.lifetime - 1f) / times, times), Color.black, 48f),
+                EnergyFx.kugelblitzGrow
+            );
+            chargeEffect.lifetime = life;
         }};
 
         excaliburLaser = new CrossLaserBulletType(1500f){{

src/progressed/content/effects/EnergyFx.java

@@ -7,7 +7,7 @@
 import mindustry.entities.*;
 import mindustry.graphics.*;
 import progressed.graphics.*;
-import progressed.graphics.renders.*;
+import progressed.util.*;
 
 import static arc.graphics.g2d.Draw.*;
 import static arc.graphics.g2d.Lines.*;
@@ -57,24 +57,34 @@ public class EnergyFx{
     }),
 
     kugelblitzGrow = new Effect(80f, e -> {
-        float in = 6f, out = 160f;
-        float fin = e.fin(Interp.sineOut);
-        PMRenders.blackHole(e.x, e.y, in * fin, out / 2f * fin, e.color);
+        int sides = 20 * 4;
+        float space = 360f / sides;
+        float fin = e.fin(Interp.circleOut);
+        float rX = 20 * fin, rY = 10 * fin;
+        float in = Color.whiteFloatBits, out = e.color.toFloatBits();
+
+        for(int i = 0; i < sides; i++){
+            float t1 = i * space, t2 = (i + 1) * space;
+            Tmp.v1.trns(t1, PMMathf.circleStarPoint(t1)).scl(rX, rY).add(e.x, e.y);
+            Tmp.v2.trns(t2, PMMathf.circleStarPoint(t2)).scl(rX, rY).add(e.x, e.y);
+            Fill.quad(
+                e.x, e.y, in,
+                e.x, e.y, in,
+                Tmp.v1.x, Tmp.v1.y, out,
+                Tmp.v2.x, Tmp.v2.y, out
+            );
+        }
     }),
 
+    kugelblitzCharge = makeSwirlEffect(30f, 8, 2f, 15f, 90f, false).layer(Layer.bullet - 0.03f),
+
     blackHoleSwirl = makeSwirlEffect(90f, 8, 3f, 90f, 720f, true).layer(Layer.effect + 0.005f),
 
     blackHoleDespawn = new Effect(40f, e -> {
         Lines.stroke(2f * e.fout(), Color.black);
         Lines.circle(e.x, e.y, 18f * e.fin(Interp.pow3Out));
     }).layer(Layer.effect + 0.03f),
 
-    blackHoleAbsorb = new Effect(20f, e -> {
-        color(Color.black);
-        stroke(2f * e.fout(Interp.pow3In));
-        Lines.circle(e.x, e.y, 8f * e.fout(Interp.pow3In));
-    }),
-
     sentinelBlast = new Effect(80f, 150f, e -> {
         color(Pal.missileYellow);
 

src/progressed/entities/bullet/energy/BlackHoleBulletType.java

@@ -27,10 +27,11 @@ public class BlackHoleBulletType extends BulletType{
     );
 
     public Color color = Color.black;
-    public Effect absorbEffect = EnergyFx.blackHoleAbsorb, swirlEffect = EnergyFx.blackHoleSwirl;
+    public Effect swirlEffect = EnergyFx.blackHoleSwirl;
     public float suctionRadius = 160f, size = 6f, lensEdge = -1f, damageRadius = 17f;
     public float force = 10f, scaledForce = 800f, bulletForce = 0.1f, bulletScaledForce = 1f;
     public float bulletDamage = 10f;
+    public float growTime = 10f, shrinkTime = -1f;
     public float swirlInterval = 3f;
     public int swirlEffects = 4;
     public boolean repel;
@@ -49,6 +50,7 @@ public BlackHoleBulletType(float speed, float damage){
     public void init(){
         super.init();
         if(lensEdge < 0f) lensEdge = suctionRadius / 2f;
+        if(shrinkTime < 0f) shrinkTime = swirlEffect.lifetime;
 
         drawSize = Math.max(drawSize, lensEdge * 2f);
     }
@@ -105,9 +107,8 @@ public void updateTrailEffects(Bullet b){
 
         if(swirlInterval > 0f && b.time <= b.lifetime - swirlEffect.lifetime){
             if(b.timer(0, swirlInterval)){
-                int sign = Mathf.sign(Mathf.randomSeed(b.id, -1, 0));
                 for(int i = 0; i < swirlEffects; i++){
-                    swirlEffect.at(b.x, b.y, suctionRadius * sign, b.team.color, b);
+                    swirlEffect.at(b.x, b.y, suctionRadius, b.team.color, b);
                 }
             }
         }
@@ -125,7 +126,10 @@ public void drawLight(Bullet b){
     }
 
     public float fout(Bullet b){
-        return Interp.sineOut.apply(1 - Mathf.curve(b.time, b.lifetime - swirlEffect.lifetime, b.lifetime));
+        return Interp.sineOut.apply(
+            Mathf.curve(b.time, 0f, growTime)
+                - Mathf.curve(b.time, b.lifetime - shrinkTime, b.lifetime)
+        );
     }
 
     @Override

src/progressed/util/PMMathf.java

@@ -95,6 +95,13 @@ public static Vec2 randomCirclePoint(Vec2 v, float radius){
         return v;
     }
 
+    public static float circleStarPoint(float theta){
+        theta = mod(theta, 90f);
+        theta *= degRad;
+        float b = -2 * sqrt2 * cos(theta - pi / 4f);
+        return (-b - sqrt(b * b - 4)) / 2;
+    }
+
     /** Pulled out of {@link Angles#moveToward(float, float, float)} */
     public static int angleMoveDirection(float from, float to){
         from = Mathf.mod(from, 360f);