From d897a00276682e500366f712afe810bc44818af8 Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Wed, 14 Dec 2016 10:41:40 -0500 Subject: [PATCH] Fixed center healing script. Added constructor and @music.forceplay command --- .../2.5DHero/Resources/Sound/MusicManager.vb | 6 +++++- .../ActionScript/V2/ScriptCommands/DoMusic.vb | 3 +++ .../V2/ScriptConstructs/DoLevel.vb | 3 +++ .../2.5DHeroContent/Scripts/center_script.dat | Bin 5612 -> 5678 bytes 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb index 997f76755..22bda5596 100644 --- a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb +++ b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb @@ -200,7 +200,11 @@ MediaPlayer.Stop() currentSong = "nomusic" End Sub - + Public Shared Sub IgnoreLastSong() + currentSong = "nomusic" + SongList.Add("nomusic") + IntroStarted = False + End Sub Public Shared Sub PlayMusic(ByVal Song As String, ByVal SearchForIntro As Boolean, ByVal NewFadeInSpeed As Single, ByVal NewFadeOutSpeed As Single) Dim lastSong As String = "nomusic" diff --git a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoMusic.vb b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoMusic.vb index b53474006..3037b2f7a 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoMusic.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoMusic.vb @@ -17,6 +17,9 @@ If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then Screen.Level.MusicLoop = argument End If + Case "forceplay" + MusicManager.IgnoreLastSong() + MusicManager.PlayMusic(argument) Case "setmusicloop" If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then Screen.Level.MusicLoop = argument diff --git a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptConstructs/DoLevel.vb b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptConstructs/DoLevel.vb index f87c23b79..ce754ff07 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptConstructs/DoLevel.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptConstructs/DoLevel.vb @@ -20,6 +20,9 @@ Return ReturnBoolean(Screen.Level.Riding) Case "surfing" Return ReturnBoolean(Screen.Level.Surfing) + Case "musicloop" + Dim musicloop As String = System.IO.Path.GetFileNameWithoutExtension(Screen.Level.MusicLoop) + Return musicloop End Select Return DEFAULTNULL diff --git a/2.5DHero/2.5DHeroContent/Scripts/center_script.dat b/2.5DHero/2.5DHeroContent/Scripts/center_script.dat index 850bd382e2b2f1a39082f22e3e7ca3e9c9791bcc..052f29ee33bc8a1b5668570e72c3d1998ef5c5d5 100644 GIT binary patch delta 236 zcmaE(y-sIC6xZY)5gztph7yK+hJwlZBAS!e@vu#<;Zm4v#A`PB1J^$GG=@Zm9ERe_ z4+VoKJMd~u*5lcQCiV=CuQ7QUAEv%1{OI~LCd&yTtDDaWwTmHjvaX2qBq5&7>xAww zPHqs9FiiuxuZSU;A(f#3=$b@^N(K!E8z3u{p$v#~81xu&8A=(788U%ta)4@qzG1MN NyirJc^8pbZMgZ>PM6dt= delta 166 zcmZ3d^G16^6xU=Q5t+$(0&J7#a4Ad<;u7I3U`S*rWhiDyoxGdtD{Bcu5ku+Z^#awC zjd*q;@$z{0A@SDnA@knxLsf2GFJQ?CRrX$RK0DYjpux5x(vurRxHj(*y2m&