From 83da0ee4bf909e014ada745dfca5cb45ed6dc48d Mon Sep 17 00:00:00 2001 From: RedEnchilada Date: Wed, 18 May 2016 00:40:00 -0500 Subject: [PATCH] Load in pre-boss cutscene music Nothing like staying up past midnight on a work night to sync cutscene lengths to music like a nerd --- data/CutsceneDatabase.js | 11 ++++++----- main/Music.js | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/data/CutsceneDatabase.js b/data/CutsceneDatabase.js index c6675b0..9aab80d 100644 --- a/data/CutsceneDatabase.js +++ b/data/CutsceneDatabase.js @@ -19,11 +19,12 @@ CutsceneDatabase.intro = { CutsceneDatabase.boss = { music: "preboss", lines: [ - {pic: "boss1", "text": "HEHEHE... SO YOU\nDECIDED TO SHOW UP\nAFTER ALL, I SEE."}, - {pic: "boss1", "text": "UNFORTUNATELY FOR\nYOU, YOU'RE TOO LATE.\nTHE PRINCESS IS MINE."}, - {pic: "boss2", "text": "AND NONE OF YOU\nFILTHY SEA CREATURES\nCAN SAVE HER."}, - {pic: "boss2", "text": "YOUR ENTIRE KINGDOM\nWILL TREMBLE IN MY\nPRESENCE."}, - {pic: "boss3", "text": "BUT ENOUGH TALK.\nHAVE AT THEE!"}, + {pic: "boss1", "text": "HEHEHE... SO YOU\nDECIDED TO SHOW UP\nAFTER ALL, I SEE. "}, + {pic: "boss1", "text": "UNFORTUNATELY FOR\nYOU, YOU'RE TOO LATE.\nTHE PRINCESS IS MINE. "}, + {pic: "boss2", "text": "AND NONE OF YOU\nFILTHY SEA CREATURES\nCAN SAVE HER. "}, + {pic: "boss2", "text": "YOUR ENTIRE KINGDOM\nWILL TREMBLE IN MY\nPRESENCE. "}, + {pic: "boss3", "text": "SURELY YOU ARE NOT\nSO FOOLISH AS TO\nATTEMPT TO DEFY ME. "}, + {pic: "boss3", "text": "NOT LIKE YOU HAVE A\nCHANCE. YOUR ERA AS\nRULERS ENDS HERE! "}, ], end: function() { return Level("Boss 1"); diff --git a/main/Music.js b/main/Music.js index 93ce1fa..92accd1 100644 --- a/main/Music.js +++ b/main/Music.js @@ -6,6 +6,7 @@ Music = (function() { "ocean", "new-ocean", "cavern", + "preboss", "boss", "ending", ];