Better black hole sounds

Author: MEEPofFaith

src/progressed/content/PMSounds.java

@@ -18,8 +18,6 @@ public class PMSounds{
     pixelShoot = new Sound(),
     pixelHit = new Sound(),
     rockExplode = new Sound(),
-    harbingerCharge = new Sound(),
-    harbingerBlast = new Sound(),
     nuclearExplosion = new Sound(),
     pulseBeam = new Sound(),
     funiBoom = new Sound(),
@@ -31,8 +29,6 @@ public static void load() {
         pixelShoot = Vars.tree.loadSound("pixel-shoot");
         pixelHit = Vars.tree.loadSound("pixel-hit");
         rockExplode = Vars.tree.loadSound("rock-explode");
-        harbingerCharge = Vars.tree.loadSound("harbinger-charge");
-        harbingerBlast = Vars.tree.loadSound("harbinger-blast");
         nuclearExplosion = Vars.tree.loadSound("nuclear-explosion");
         pulseBeam = Vars.tree.loadSound("pulse-beam");
         funiBoom = Vars.tree.loadSound("funi-boom");

src/progressed/content/blocks/PMBlocks.java

@@ -771,7 +771,7 @@ public void setStats(){
             recoilTime = 240f;
             cooldownTime = 300f;
             shootY = 0f;
-            shootSound = Sounds.release;
+            shootSound = Sounds.dullExplosion;
             shootType = PMBullets.blackHole;
 
             consumePower(35f);

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

@@ -1,11 +1,13 @@
 package progressed.entities.bullet.energy;
 
+import arc.audio.*;
 import arc.graphics.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import blackhole.graphics.*;
+import mindustry.audio.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
@@ -15,6 +17,8 @@
 import progressed.entities.*;
 import progressed.entities.bullet.pseudo3d.*;
 
+import static mindustry.Vars.*;
+
 public class BlackHoleBulletType extends BulletType{
     static Seq<Class<?>> immuneTypes = Seq.with(
         ArcBulletType.class, //TODO Maybe implement a special case for these 3D bullets? Make suction radius spherical.
@@ -28,6 +32,8 @@ public class BlackHoleBulletType extends BulletType{
 
     public Color color = Color.black;
     public Effect swirlEffect = EnergyFx.blackHoleSwirl;
+    public Sound loopSound = Sounds.spellLoop;
+    public float loopSoundVolume = 2f;
     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;
@@ -60,6 +66,15 @@ public float continuousDamage(){
         return damage / 2f * 60f; //Damage every 2 ticks
     }
 
+    @Override
+    public void init(Bullet b){
+        super.init(b);
+
+        if(loopSound != null){
+            b.data = new SoundLoop(loopSound, loopSoundVolume);
+        }
+    }
+
     @Override
     public void update(Bullet b){
         if(b.timer(1, 2f)){
@@ -98,6 +113,10 @@ public void update(Bullet b){
             });
         }
 
+        if(!headless && b.data instanceof SoundLoop loop){
+            loop.update(b.x, b.y, b.isAdded(), fout(b));
+        }
+
         super.update(b);
     }
 
@@ -145,6 +164,14 @@ public void despawned(Bullet b){
         }
     }
 
+    @Override
+    public void removed(Bullet b){
+        super.removed(b);
+        if(b.data instanceof SoundLoop loop){
+            loop.stop();
+        }
+    }
+
     public static boolean checkType(BulletType type){ //Returns true for bullets immune to suction.
         return immuneTypes.contains(c -> c.isAssignableFrom(type.getClass()));
     }