diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index b8de9bd9..7a25467a 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -209,11 +209,7 @@ class MarbleWorld extends Scheduler { public function postInit() { this._ready = true; this.playGui.init(this.scene2d); - var musicFileName = [ - 'data/sound/groovepolice.ogg', - 'data/sound/classic vibe.ogg', - 'data/sound/beach party.ogg' - ][(mission.index + 1) % 3]; + var musicFileName = 'data/sound/' + this.mission.missionInfo.music; AudioManager.playMusic(ResourceLoader.getResource(musicFileName, ResourceLoader.getAudio, this.soundResources)); MarbleGame.canvas.clearContent(); this.endPad.generateCollider(); diff --git a/src/gui/PlayGui.hx b/src/gui/PlayGui.hx index 64e1ae87..f2ce0786 100644 --- a/src/gui/PlayGui.hx +++ b/src/gui/PlayGui.hx @@ -152,6 +152,12 @@ class PlayGui { timerCtrl.position = new Vector(215, 1); timerCtrl.extent = new Vector(234, 58); + var timerTransparency = new GuiImage(ResourceLoader.getResource('data/ui/game/transparency.png', ResourceLoader.getImage, this.imageResources) + .toTile()); + timerTransparency.position = new Vector(14, -7); + timerTransparency.extent = new Vector(228, 71); + timerCtrl.addChild(timerTransparency); + timerNumbers[0].position = new Vector(23, 0); timerNumbers[0].extent = new Vector(43, 55); @@ -314,7 +320,7 @@ class PlayGui { helpTextCtrl.horizSizing = Width; helpTextBackground = new GuiText(bfont); - helpTextBackground.text.textColor = 0x000000; + helpTextBackground.text.textColor = 0x777777; helpTextBackground.position = new Vector(1, 1); helpTextBackground.extent = new Vector(640, 14); helpTextBackground.vertSizing = Height; @@ -333,13 +339,13 @@ class PlayGui { helpTextCtrl.addChild(helpTextForeground); var alertTextCtrl = new GuiControl(); - alertTextCtrl.position = new Vector(0, 418); - alertTextCtrl.extent = new Vector(640, 58); + alertTextCtrl.position = new Vector(0, 371); + alertTextCtrl.extent = new Vector(640, 105); alertTextCtrl.vertSizing = Top; alertTextCtrl.horizSizing = Width; alertTextBackground = new GuiText(bfont); - alertTextBackground.text.textColor = 0x000000; + alertTextBackground.text.textColor = 0x776622; alertTextBackground.position = new Vector(1, 1); alertTextBackground.extent = new Vector(640, 32); alertTextBackground.vertSizing = Height; @@ -347,7 +353,7 @@ class PlayGui { alertTextBackground.justify = Center; alertTextForeground = new GuiText(bfont); - alertTextForeground.text.textColor = 0xFFFF00; + alertTextForeground.text.textColor = 0xffEE99; alertTextForeground.position = new Vector(0, 0); alertTextForeground.extent = new Vector(640, 32); alertTextForeground.vertSizing = Height; diff --git a/src/mis/MissionElement.hx b/src/mis/MissionElement.hx index 26bd34fe..93e351b8 100644 --- a/src/mis/MissionElement.hx +++ b/src/mis/MissionElement.hx @@ -52,6 +52,7 @@ class MissionElementScriptObject extends MissionElementBase { var level:String; var artist:String; var goldtime:String; + var music:String; public function new() { _type = MissionElementType.ScriptObject;