From 93d2f60b568e8abb77553c0c59bf2e690fdae1a6 Mon Sep 17 00:00:00 2001 From: Cubical box <67639725+BlueTheCube@users.noreply.github.com> Date: Thu, 20 Jun 2024 22:50:01 +0800 Subject: [PATCH] Boss music for non-wave guardians (#9964) * why do I hear guardian music * Update contributors * format * switch up * switch up * why * no traces left behind --- core/assets/contributors | 1 + core/src/mindustry/audio/SoundControl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 676853d30d..a07a13aadc 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -167,3 +167,4 @@ Redstonneur1256 ApsZoldat hexagon-recursion JasonP01 +BlueTheCube diff --git a/core/src/mindustry/audio/SoundControl.java b/core/src/mindustry/audio/SoundControl.java index 980166227a..b003ebec94 100644 --- a/core/src/mindustry/audio/SoundControl.java +++ b/core/src/mindustry/audio/SoundControl.java @@ -213,7 +213,9 @@ public class SoundControl{ /** Plays a random track.*/ public void playRandom(){ - if(isDark()){ + if(state.boss() != null){ + playOnce(bossMusic.random(lastRandomPlayed)); + }else if(isDark()){ playOnce(darkMusic.random(lastRandomPlayed)); }else{ playOnce(ambientMusic.random(lastRandomPlayed));