From 728d60926885622e7d5b7586a027cdbbc1e33b1b Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 3 Apr 2024 02:38:56 +0900 Subject: [PATCH] more haptic sounds --- assets/audio/effects/haptic_bap.ogg | 3 +++ assets/audio/effects/haptic_bep.ogg | 3 +++ src/net/torvald/terrarum/App.java | 4 +++- src/net/torvald/terrarum/ui/UIItem.kt | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 assets/audio/effects/haptic_bap.ogg create mode 100644 assets/audio/effects/haptic_bep.ogg diff --git a/assets/audio/effects/haptic_bap.ogg b/assets/audio/effects/haptic_bap.ogg new file mode 100644 index 000000000..b9211ccd8 --- /dev/null +++ b/assets/audio/effects/haptic_bap.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25c8741d3fe0d12caa4a0677edade787f1e47e0cd3012a6b62b74d3a9e87b93e +size 4656 diff --git a/assets/audio/effects/haptic_bep.ogg b/assets/audio/effects/haptic_bep.ogg new file mode 100644 index 000000000..45ce1e76e --- /dev/null +++ b/assets/audio/effects/haptic_bep.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:236b4f376aebe132c59bff47e3eab6336289d206b8546c4d3fb3e2a1715a5faa +size 4583 diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 5124c99c2..688d6f36d 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -554,8 +554,10 @@ public class App implements ApplicationListener { CommonResourcePool.INSTANCE.addToLoadingList("title_health1", () -> new Texture(Gdx.files.internal("./assets/graphics/gui/health_take_a_break.tga"))); CommonResourcePool.INSTANCE.addToLoadingList("title_health2", () -> new Texture(Gdx.files.internal("./assets/graphics/gui/health_distance.tga"))); - CommonResourcePool.INSTANCE.addToLoadingList("sound:haptic_bop", () -> new MusicContainer("haptic_bop", Gdx.files.internal("./assets/audio/effects/haptic_bop.ogg").file(), false, true, (MusicContainer m) -> { return null; })); CommonResourcePool.INSTANCE.addToLoadingList("sound:haptic_bup", () -> new MusicContainer("haptic_bup", Gdx.files.internal("./assets/audio/effects/haptic_bup.ogg").file(), false, true, (MusicContainer m) -> { return null; })); + CommonResourcePool.INSTANCE.addToLoadingList("sound:haptic_bap", () -> new MusicContainer("haptic_bap", Gdx.files.internal("./assets/audio/effects/haptic_bap.ogg").file(), false, true, (MusicContainer m) -> { return null; })); + CommonResourcePool.INSTANCE.addToLoadingList("sound:haptic_bop", () -> new MusicContainer("haptic_bop", Gdx.files.internal("./assets/audio/effects/haptic_bop.ogg").file(), false, true, (MusicContainer m) -> { return null; })); + CommonResourcePool.INSTANCE.addToLoadingList("sound:haptic_bep", () -> new MusicContainer("haptic_bep", Gdx.files.internal("./assets/audio/effects/haptic_bep.ogg").file(), false, true, (MusicContainer m) -> { return null; })); CommonResourcePool.INSTANCE.addToLoadingList("sound:haptic_bip", () -> new MusicContainer("haptic_bip", Gdx.files.internal("./assets/audio/effects/haptic_bip.ogg").file(), false, true, (MusicContainer m) -> { highPrioritySoundPlaying = false; return null; })); // make loading list CommonResourcePool.INSTANCE.loadAll(); diff --git a/src/net/torvald/terrarum/ui/UIItem.kt b/src/net/torvald/terrarum/ui/UIItem.kt index 8ac4a0d5f..e221b1173 100644 --- a/src/net/torvald/terrarum/ui/UIItem.kt +++ b/src/net/torvald/terrarum/ui/UIItem.kt @@ -286,7 +286,7 @@ abstract class UIItem(var parentUI: UICanvas, val initialX: Int, val initialY: I object UIItemAccessibilityUtil { // TODO have multiple bop instances (num of copies equal to guiTracks), then play the track with its index according to getFreeGuiTrack() fun playHapticCursorHovered() { - App.playGUIsound(CommonResourcePool.getAs("sound:haptic_bop"), 0.25) + App.playGUIsound(CommonResourcePool.getAs("sound:haptic_bap"), 0.25) } fun playHapticPushedDown() { App.playGUIsoundHigh(CommonResourcePool.getAs("sound:haptic_bip"), 0.8)