diff --git a/core/assets/music/coreLaunch.ogg b/core/assets/music/coreLaunch.ogg new file mode 100644 index 0000000000..b4a1b55a68 Binary files /dev/null and b/core/assets/music/coreLaunch.ogg differ diff --git a/core/assets/music/land.ogg b/core/assets/music/land.ogg index 4cfd914673..ef81ccc90a 100644 Binary files a/core/assets/music/land.ogg and b/core/assets/music/land.ogg differ diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 3eb3b169b0..ae3ae07e38 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -2,6 +2,7 @@ package mindustry.core; import arc.*; import arc.assets.loaders.TextureLoader.*; +import arc.audio.*; import arc.files.*; import arc.graphics.*; import arc.graphics.Texture.*; @@ -554,6 +555,11 @@ public class Renderer implements ApplicationListener{ landTime = landCore.landDuration(); launchCoreType = coreType; + Music music = landCore.launchMusic(); + music.stop(); + music.play(); + music.setVolume(settings.getInt("musicvol") / 100f); + landCore.beginLaunch(coreType); } diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 184523e3be..e4a2a02672 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -51,6 +51,7 @@ 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 Effect launchEffect = Fx.launch; public Interp landZoomInterp = Interp.pow3; @@ -333,6 +334,10 @@ public class CoreBlock extends StorageBlock{ return landMusic; } + public Music launchMusic(){ + return launchMusic; + } + @Override public void draw(){ //draw thrusters when just landed