Fixed center healing script. Added <level.musicloop> constructor and @music.forceplay command

This commit is contained in:
CaptainSegis 2016-12-14 10:41:40 -05:00
parent 9cccf5cc32
commit d897a00276
4 changed files with 11 additions and 1 deletions

View File

@ -200,7 +200,11 @@
MediaPlayer.Stop() MediaPlayer.Stop()
currentSong = "nomusic" currentSong = "nomusic"
End Sub 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) 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" Dim lastSong As String = "nomusic"

View File

@ -17,6 +17,9 @@
If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
Screen.Level.MusicLoop = argument Screen.Level.MusicLoop = argument
End If End If
Case "forceplay"
MusicManager.IgnoreLastSong()
MusicManager.PlayMusic(argument)
Case "setmusicloop" Case "setmusicloop"
If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
Screen.Level.MusicLoop = argument Screen.Level.MusicLoop = argument

View File

@ -20,6 +20,9 @@
Return ReturnBoolean(Screen.Level.Riding) Return ReturnBoolean(Screen.Level.Riding)
Case "surfing" Case "surfing"
Return ReturnBoolean(Screen.Level.Surfing) Return ReturnBoolean(Screen.Level.Surfing)
Case "musicloop"
Dim musicloop As String = System.IO.Path.GetFileNameWithoutExtension(Screen.Level.MusicLoop)
Return musicloop
End Select End Select
Return DEFAULTNULL Return DEFAULTNULL