Core launch/land SFX

core/src/mindustry/world/blocks/LaunchAnimator.java

@@ -1,6 +1,7 @@
 package mindustry.world.blocks;
 
 import arc.audio.*;
+import arc.util.*;
 import mindustry.gen.*;
 
 public interface LaunchAnimator{
@@ -17,13 +18,9 @@ public interface LaunchAnimator{
 
     float launchDuration();
 
-    default Music landMusic(){
+    default @Nullable Music landMusic(){
         return Musics.land;
     }
 
-    default Music launchMusic(){
-        return Musics.launch;
-    }
-
     float zoomLaunch();
 }

core/src/mindustry/world/blocks/campaign/Accelerator.java

@@ -40,9 +40,8 @@ public class Accelerator extends Block{
     /** Override for planets that this block can launch to. If null, the planet's launch candidates are used. */
     public @Nullable Seq<Planet> launchCandidates;
 
-    public Music launchMusic = Musics.coreLaunch;
     public Sound lightningSound = new RandomSound(Sounds.acceleratorLightning1, Sounds.acceleratorLightning2, Sounds.shootArc);
-    public float lightningSoundVolume = 0.9f;
+    public float lightningSoundVolume = 0.85f;
     public Sound chargeSound = Sounds.acceleratorCharge;
     public Sound launchSound = Sounds.acceleratorLaunch;
     public Sound constructSound = Sounds.acceleratorConstruct;
@@ -311,13 +310,7 @@ public class Accelerator extends Block{
 
         @Override
         public Music landMusic(){
-            //unused
-            return launchMusic;
-        }
-
-        @Override
-        public Music launchMusic(){
-            return launchMusic;
+            return null;
         }
 
         @Override

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -56,7 +56,9 @@ public class CoreBlock extends StorageBlock{
     public UnitType unitType = UnitTypes.alpha;
     public float landDuration = 160f;
     public Music landMusic = Musics.land;
-    public Music launchMusic = Musics.coreLaunch;
+    public float launchSoundVolume = 1f, landSoundVolume = 1f;
+    public Sound launchSound = Sounds.coreLaunch;
+    public Sound landSound = Sounds.coreLand;
     public Effect launchEffect = Fx.launch;
 
     public Interp landZoomInterp = Interp.pow3;
@@ -303,11 +305,6 @@ public class CoreBlock extends StorageBlock{
             return landMusic;
         }
 
-        @Override
-        public Music launchMusic(){
-            return launchMusic;
-        }
-
         @Override
         public void beginLaunch(boolean launching){
             cloudSeed = Mathf.random(1f);
@@ -316,6 +313,7 @@ public class CoreBlock extends StorageBlock{
             }
 
             if(!headless){
+                (launching ? launchSound : landSound).play(launchSoundVolume);
                 // Add fade-in and fade-out foreground when landing or launching.
                 if(renderer.isLaunching()){
                     float margin = 30f;

core/src/mindustry/world/blocks/units/UnitFactory.java

@@ -51,6 +51,7 @@ public class UnitFactory extends UnitBlock{
         regionRotated1 = 1;
         commandable = true;
         ambientSound = Sounds.loopUnitBuilding;
+        ambientSoundVolume = 0.09f;
 
         config(Integer.class, (UnitFactoryBuild build, Integer i) -> {
             if(!configurable) return;