From 497dcf17749385bb6ff7df936cd3d63241356df3 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 23 Jul 2023 22:40:36 +1000 Subject: [PATCH] Added volume to music, response is slow --- Box | 2 +- assets/scripts/init.toy | 4 +++- assets/scripts/scene.toy | 12 +++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Box b/Box index a2382c1..2eabe14 160000 --- a/Box +++ b/Box @@ -1 +1 @@ -Subproject commit a2382c19b4caf5750cdf27422749c37b66d5c582 +Subproject commit 2eabe1407063c49e575e5938d0717a8407ec57cc diff --git a/assets/scripts/init.toy b/assets/scripts/init.toy index 86d96ae..dd766d1 100644 --- a/assets/scripts/init.toy +++ b/assets/scripts/init.toy @@ -26,7 +26,9 @@ mapInputEventToKeyUp("character_right", "right"); //event, keysym mapInputEventToKeyDown("character_attack", "space"); //event, keysym -mapInputEventToKeyDown("trigger_music", "m"); //event, keysym +mapInputEventToKeyDown("music_toggle", "m"); //event, keysym +mapInputEventToKeyDown("music_up", "."); //event, keysym +mapInputEventToKeyDown("music_down", ","); //event, keysym //TODO: escape to kill the game diff --git a/assets/scripts/scene.toy b/assets/scripts/scene.toy index 5b784d5..a6b7298 100644 --- a/assets/scripts/scene.toy +++ b/assets/scripts/scene.toy @@ -63,7 +63,7 @@ fn onFree(node: opaque) { //debugging fn onKeyDown(node: opaque, event: string) { //test the music - if (event == "trigger_music") { + if (event == "music_toggle") { if (checkMusicPaused() == false) { pauseMusic(); } @@ -71,6 +71,16 @@ fn onKeyDown(node: opaque, event: string) { unpauseMusic(); } } + + if (event == "music_up") { + setMusicVolume(getMusicVolume() + 16); + } + + if (event == "music_down") { + setMusicVolume(getMusicVolume() - 16); + } + + print getMusicVolume(); }