diff --git a/games/ZumaBlitzRemake/config/levels/level_101.json b/games/ZumaBlitzRemake/config/levels/level_101.json index 60b1aab6..2d342113 100644 --- a/games/ZumaBlitzRemake/config/levels/level_101.json +++ b/games/ZumaBlitzRemake/config/levels/level_101.json @@ -1,7 +1,7 @@ { "map": "fossilfood_roots", - "music": "level", - "dangerMusic": "danger", + "music": "game3", + "dangerMusic": "danger2", "powerupFrequency": 15, "individualPowerupFrequencies": { "timeball": 16, diff --git a/games/ZumaBlitzRemake/config/levels/level_102.json b/games/ZumaBlitzRemake/config/levels/level_102.json index aec35eb2..ca5b41a1 100644 --- a/games/ZumaBlitzRemake/config/levels/level_102.json +++ b/games/ZumaBlitzRemake/config/levels/level_102.json @@ -1,7 +1,7 @@ { "map": "snakepit_bronze", - "music": "level", - "dangerMusic": "danger", + "music": "game3", + "dangerMusic": "danger2", "powerupFrequency": 15, "individualPowerupFrequencies": { "timeball": 16, diff --git a/games/ZumaBlitzRemake/config/levels/level_103.json b/games/ZumaBlitzRemake/config/levels/level_103.json index d8b9340b..f3e77c81 100644 --- a/games/ZumaBlitzRemake/config/levels/level_103.json +++ b/games/ZumaBlitzRemake/config/levels/level_103.json @@ -1,7 +1,7 @@ { "map": "kroakatoa_journey", - "music": "level", - "dangerMusic": "danger", + "music": "game3", + "dangerMusic": "danger2", "powerupFrequency": 15, "individualPowerupFrequencies": { "timeball": 16, diff --git a/games/ZumaBlitzRemake/config/levels/level_104.json b/games/ZumaBlitzRemake/config/levels/level_104.json index 847a5ac2..49c0b53c 100644 --- a/games/ZumaBlitzRemake/config/levels/level_104.json +++ b/games/ZumaBlitzRemake/config/levels/level_104.json @@ -1,7 +1,7 @@ { "map": "kroakatoa_crab", - "music": "level", - "dangerMusic": "danger", + "music": "game3", + "dangerMusic": "danger2", "powerupFrequency": 15, "individualPowerupFrequencies": { "timeball": 16, diff --git a/games/ZumaBlitzRemake/config/loadlist.json b/games/ZumaBlitzRemake/config/loadlist.json index 28d862b6..36d97dd7 100644 --- a/games/ZumaBlitzRemake/config/loadlist.json +++ b/games/ZumaBlitzRemake/config/loadlist.json @@ -22,7 +22,12 @@ "sound_events/button_hover.json" ], "music": [ - "music/Giza-Music-Menu.ogg" + "music/MenuMusic.ogg", + "music/GameMusic1.ogg", + "music/GameMusic2.ogg", + "music/GameMusic3.ogg", + "music/15toGoMusic_1.ogg", + "music/15toGoMusic_2.ogg" ], "colorPalettes": [ "images/powerups/fire_pal.png", diff --git a/games/ZumaBlitzRemake/config/music.json b/games/ZumaBlitzRemake/config/music.json index 9de1dffc..4f8ed2c3 100644 --- a/games/ZumaBlitzRemake/config/music.json +++ b/games/ZumaBlitzRemake/config/music.json @@ -1,5 +1,8 @@ { - "menu": "music/Giza-Music-Menu.ogg", - "level": "music/Giza-Music-Level.ogg", - "danger": "music/Giza-Music-Danger.ogg" + "menu": "music/MenuMusic.ogg", + "game1": "music/GameMusic1.ogg", + "game2": "music/GameMusic2.ogg", + "game3": "music/GameMusic3.ogg", + "danger1": "music/15toGoMusic_1.ogg", + "danger2": "music/15toGoMusic_2.ogg" } \ No newline at end of file diff --git a/games/ZumaBlitzRemake/music/15toGoMusic_1.ogg b/games/ZumaBlitzRemake/music/15toGoMusic_1.ogg index 0aa0a46f..90506e29 100644 Binary files a/games/ZumaBlitzRemake/music/15toGoMusic_1.ogg and b/games/ZumaBlitzRemake/music/15toGoMusic_1.ogg differ diff --git a/games/ZumaBlitzRemake/music/15toGoMusic_2.ogg b/games/ZumaBlitzRemake/music/15toGoMusic_2.ogg index 7d6eeed6..2e063802 100644 Binary files a/games/ZumaBlitzRemake/music/15toGoMusic_2.ogg and b/games/ZumaBlitzRemake/music/15toGoMusic_2.ogg differ diff --git a/games/ZumaBlitzRemake/music/GameEndMusic.ogg b/games/ZumaBlitzRemake/music/GameEndMusic.ogg index 8a61a838..08a52775 100644 Binary files a/games/ZumaBlitzRemake/music/GameEndMusic.ogg and b/games/ZumaBlitzRemake/music/GameEndMusic.ogg differ diff --git a/games/ZumaBlitzRemake/music/GameMusic1.ogg b/games/ZumaBlitzRemake/music/GameMusic1.ogg index 677bea8e..ea6c6cab 100644 Binary files a/games/ZumaBlitzRemake/music/GameMusic1.ogg and b/games/ZumaBlitzRemake/music/GameMusic1.ogg differ diff --git a/games/ZumaBlitzRemake/music/GameMusic2.ogg b/games/ZumaBlitzRemake/music/GameMusic2.ogg index 0cd39627..7843f331 100644 Binary files a/games/ZumaBlitzRemake/music/GameMusic2.ogg and b/games/ZumaBlitzRemake/music/GameMusic2.ogg differ diff --git a/games/ZumaBlitzRemake/music/GameMusic3.ogg b/games/ZumaBlitzRemake/music/GameMusic3.ogg index c7a127a8..d49739d9 100644 Binary files a/games/ZumaBlitzRemake/music/GameMusic3.ogg and b/games/ZumaBlitzRemake/music/GameMusic3.ogg differ diff --git a/games/ZumaBlitzRemake/music/Giza-Music-Danger.ogg b/games/ZumaBlitzRemake/music/Giza-Music-Danger.ogg deleted file mode 100644 index 860f2b12..00000000 Binary files a/games/ZumaBlitzRemake/music/Giza-Music-Danger.ogg and /dev/null differ diff --git a/games/ZumaBlitzRemake/music/Giza-Music-Level.ogg b/games/ZumaBlitzRemake/music/Giza-Music-Level.ogg deleted file mode 100644 index c54daa4f..00000000 Binary files a/games/ZumaBlitzRemake/music/Giza-Music-Level.ogg and /dev/null differ diff --git a/games/ZumaBlitzRemake/music/Giza-Music-Menu.ogg b/games/ZumaBlitzRemake/music/Giza-Music-Menu.ogg deleted file mode 100644 index 748d12f7..00000000 Binary files a/games/ZumaBlitzRemake/music/Giza-Music-Menu.ogg and /dev/null differ diff --git a/games/ZumaBlitzRemake/music/MainIntro.ogg b/games/ZumaBlitzRemake/music/MainIntro.ogg new file mode 100644 index 00000000..9227af8d Binary files /dev/null and b/games/ZumaBlitzRemake/music/MainIntro.ogg differ diff --git a/games/ZumaBlitzRemake/music/MenuMusic.ogg b/games/ZumaBlitzRemake/music/MenuMusic.ogg new file mode 100644 index 00000000..16a0491f Binary files /dev/null and b/games/ZumaBlitzRemake/music/MenuMusic.ogg differ diff --git a/games/ZumaBlitzRemake/ui/script.lua b/games/ZumaBlitzRemake/ui/script.lua index b73461fc..22a92b8b 100644 --- a/games/ZumaBlitzRemake/ui/script.lua +++ b/games/ZumaBlitzRemake/ui/script.lua @@ -43,7 +43,6 @@ function c.disclaimerEnd(f) f.getWidgetN("splash/Disclaimer"):clean() f.getWidgetN("splash/Main"):show() f.getWidgetN("splash/Main"):setActive() - f.musicVolume("menu", 1) end @@ -63,6 +62,7 @@ end function c.splashEnd(f) f.initSession() f.getWidgetN("root/Main"):show() + f.musicVolume("menu", 1) -- initSession() initializes all the UI, so from this point we can initialize all the modules. c.root = f.getWidgetN("root") diff --git a/src/Level.lua b/src/Level.lua index 37e10154..6b1afaff 100644 --- a/src/Level.lua +++ b/src/Level.lua @@ -471,6 +471,8 @@ end function Level:updateMusic() local music = _Game:getMusic(self.musicName) + local time = math.floor(math.max(self.objectives[1].target - self.objectives[1].progress, 0)) + if self.dangerMusicName then local dangerMusic = _Game:getMusic(self.dangerMusicName) @@ -481,7 +483,7 @@ function Level:updateMusic() dangerMusic:setVolume(0) else -- Play the music accordingly to the danger flag. - if self.danger then + if time < 15 then music:setVolume(0) dangerMusic:setVolume(1) else