From 97d3f6f63f2dc563072f44249849209675a8ffa9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 14 Dec 2025 19:25:39 -0500 Subject: [PATCH] UI sound effect rename --- core/assets/sounds/ui/{back.ogg => uiBack.ogg} | Bin core/assets/sounds/ui/{press.ogg => uiButton.ogg} | Bin .../sounds/ui/{chatMessage.ogg => uiChat.ogg} | Bin core/assets/sounds/ui/{message.ogg => uiNotify.ogg} | Bin core/assets/sounds/ui/{unlock.ogg => uiUnlock.ogg} | Bin core/src/mindustry/audio/SoundPriority.java | 1 + core/src/mindustry/core/NetClient.java | 4 ++-- core/src/mindustry/core/UI.java | 2 +- core/src/mindustry/ui/dialogs/BaseDialog.java | 2 +- core/src/mindustry/ui/dialogs/ResearchDialog.java | 2 +- core/src/mindustry/ui/fragments/HudFragment.java | 4 ++-- gradle.properties | 2 +- 12 files changed, 9 insertions(+), 8 deletions(-) rename core/assets/sounds/ui/{back.ogg => uiBack.ogg} (100%) rename core/assets/sounds/ui/{press.ogg => uiButton.ogg} (100%) rename core/assets/sounds/ui/{chatMessage.ogg => uiChat.ogg} (100%) rename core/assets/sounds/ui/{message.ogg => uiNotify.ogg} (100%) rename core/assets/sounds/ui/{unlock.ogg => uiUnlock.ogg} (100%) diff --git a/core/assets/sounds/ui/back.ogg b/core/assets/sounds/ui/uiBack.ogg similarity index 100% rename from core/assets/sounds/ui/back.ogg rename to core/assets/sounds/ui/uiBack.ogg diff --git a/core/assets/sounds/ui/press.ogg b/core/assets/sounds/ui/uiButton.ogg similarity index 100% rename from core/assets/sounds/ui/press.ogg rename to core/assets/sounds/ui/uiButton.ogg diff --git a/core/assets/sounds/ui/chatMessage.ogg b/core/assets/sounds/ui/uiChat.ogg similarity index 100% rename from core/assets/sounds/ui/chatMessage.ogg rename to core/assets/sounds/ui/uiChat.ogg diff --git a/core/assets/sounds/ui/message.ogg b/core/assets/sounds/ui/uiNotify.ogg similarity index 100% rename from core/assets/sounds/ui/message.ogg rename to core/assets/sounds/ui/uiNotify.ogg diff --git a/core/assets/sounds/ui/unlock.ogg b/core/assets/sounds/ui/uiUnlock.ogg similarity index 100% rename from core/assets/sounds/ui/unlock.ogg rename to core/assets/sounds/ui/uiUnlock.ogg diff --git a/core/src/mindustry/audio/SoundPriority.java b/core/src/mindustry/audio/SoundPriority.java index 4235cea9a2..4f9bbb7062 100644 --- a/core/src/mindustry/audio/SoundPriority.java +++ b/core/src/mindustry/audio/SoundPriority.java @@ -97,6 +97,7 @@ public class SoundPriority{ set(-2f, mechStep, mechStepHeavy, walkerStep, walkerStepSmall, walkerStepTiny, mechStepSmall); explosionCore.setFalloffOffset(100f); + blockExplodeElectricBig.setFalloffOffset(70f); } static void max(int max, Sound... sounds){ diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 3d8202e4fd..c584a92125 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -231,7 +231,7 @@ public class NetClient implements ApplicationListener{ public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){ if(Vars.ui != null){ Vars.ui.chatfrag.addMessage(message); - Sounds.chatMessage.play(); + Sounds.uiChat.play(); } if(playersender != null && unformatted != null){ @@ -248,7 +248,7 @@ public class NetClient implements ApplicationListener{ public static void sendMessage(String message){ if(Vars.ui != null){ Vars.ui.chatfrag.addMessage(message); - Sounds.chatMessage.play(); + Sounds.uiChat.play(); } } diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 58f4dfa5ab..daaa194524 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -138,7 +138,7 @@ public class UI implements ApplicationListener, Loadable{ Core.app.post(() -> showErrorMessage("Failed to access local storage.\nSettings will not be saved.")); }); - ClickListener.clicked = () -> Sounds.press.play(); + ClickListener.clicked = () -> Sounds.uiButton.play(); drillCursor = Core.graphics.newCursor("drill", Fonts.cursorScale()); unloadCursor = Core.graphics.newCursor("unload", Fonts.cursorScale()); diff --git a/core/src/mindustry/ui/dialogs/BaseDialog.java b/core/src/mindustry/ui/dialogs/BaseDialog.java index d6852be3b8..39973b04da 100644 --- a/core/src/mindustry/ui/dialogs/BaseDialog.java +++ b/core/src/mindustry/ui/dialogs/BaseDialog.java @@ -26,7 +26,7 @@ public class BaseDialog extends Dialog{ if(shouldPause && state.isGame() && !net.active() && !wasPaused){ state.set(State.playing); } - Sounds.back.play(); + Sounds.uiBack.play(); }); shown(() -> { diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index f1243d058f..244c04afc7 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -602,7 +602,7 @@ public class ResearchDialog extends BaseDialog{ treeLayout(); rebuild(); Core.scene.act(); - Sounds.unlock.play(); + Sounds.uiUnlock.play(); Events.fire(new ResearchEvent(node.content)); } diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index d0b20fc5a1..3bb78bab55 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -610,7 +610,7 @@ public class HudFragment{ if(state.isMenu()) return; scheduleToast(() -> { - Sounds.message.play(); + Sounds.uiNotify.play(); Table table = new Table(Tex.button); table.update(() -> { @@ -640,7 +640,7 @@ public class HudFragment{ //also don't play in the tutorial to prevent confusion if(state.isMenu()) return; - Sounds.message.play(); + Sounds.uiNotify.play(); //if there's currently no unlock notification... if(lastUnlockTable == null){ diff --git a/gradle.properties b/gradle.properties index 7100e59be2..ec30b14b41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=c10d68b7a1 +archash=bba30e2f12