Skip to content
This repository has been archived by the owner on May 6, 2024. It is now read-only.

Commit

Permalink
Incomplete time-dynamic music
Browse files Browse the repository at this point in the history
This has to be revamped. Right now it's only using the more advanced portions of the tracks.

Zuma Blitz's ingame tracks progress as you play longer, including for how long you've been in the 15-minute danger mark.

The music one-offs for the time running out and the game launching will probably be done soon.
  • Loading branch information
ShamblesSM committed Feb 15, 2023
1 parent 1b27737 commit 21b98aa
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 14 deletions.
4 changes: 2 additions & 2 deletions games/ZumaBlitzRemake/config/levels/level_101.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"map": "fossilfood_roots",
"music": "level",
"dangerMusic": "danger",
"music": "game3",
"dangerMusic": "danger2",
"powerupFrequency": 15,
"individualPowerupFrequencies": {
"timeball": 16,
Expand Down
4 changes: 2 additions & 2 deletions games/ZumaBlitzRemake/config/levels/level_102.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"map": "snakepit_bronze",
"music": "level",
"dangerMusic": "danger",
"music": "game3",
"dangerMusic": "danger2",
"powerupFrequency": 15,
"individualPowerupFrequencies": {
"timeball": 16,
Expand Down
4 changes: 2 additions & 2 deletions games/ZumaBlitzRemake/config/levels/level_103.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"map": "kroakatoa_journey",
"music": "level",
"dangerMusic": "danger",
"music": "game3",
"dangerMusic": "danger2",
"powerupFrequency": 15,
"individualPowerupFrequencies": {
"timeball": 16,
Expand Down
4 changes: 2 additions & 2 deletions games/ZumaBlitzRemake/config/levels/level_104.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"map": "kroakatoa_crab",
"music": "level",
"dangerMusic": "danger",
"music": "game3",
"dangerMusic": "danger2",
"powerupFrequency": 15,
"individualPowerupFrequencies": {
"timeball": 16,
Expand Down
7 changes: 6 additions & 1 deletion games/ZumaBlitzRemake/config/loadlist.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 6 additions & 3 deletions games/ZumaBlitzRemake/config/music.json
Original file line number Diff line number Diff line change
@@ -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"
}
Binary file modified games/ZumaBlitzRemake/music/15toGoMusic_1.ogg
Binary file not shown.
Binary file modified games/ZumaBlitzRemake/music/15toGoMusic_2.ogg
Binary file not shown.
Binary file modified games/ZumaBlitzRemake/music/GameEndMusic.ogg
Binary file not shown.
Binary file modified games/ZumaBlitzRemake/music/GameMusic1.ogg
Binary file not shown.
Binary file modified games/ZumaBlitzRemake/music/GameMusic2.ogg
Binary file not shown.
Binary file modified games/ZumaBlitzRemake/music/GameMusic3.ogg
Binary file not shown.
Binary file removed games/ZumaBlitzRemake/music/Giza-Music-Danger.ogg
Binary file not shown.
Binary file removed games/ZumaBlitzRemake/music/Giza-Music-Level.ogg
Binary file not shown.
Binary file removed games/ZumaBlitzRemake/music/Giza-Music-Menu.ogg
Binary file not shown.
Binary file added games/ZumaBlitzRemake/music/MainIntro.ogg
Binary file not shown.
Binary file added games/ZumaBlitzRemake/music/MenuMusic.ogg
Binary file not shown.
2 changes: 1 addition & 1 deletion games/ZumaBlitzRemake/ui/script.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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")
Expand Down
4 changes: 3 additions & 1 deletion src/Level.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down

0 comments on commit 21b98aa

Please sign in to comment.