tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the music gap between BattleIntroScreen and BattleScreen 

Also replaced the johto_wild music with a well-looped one
This commit is contained in:
JappaWakka 2021-10-17 22:13:18 +02:00
parent a85849a52c
commit 4132bbe1c0
6 changed files with 96 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -189,20 +189,6 @@
PlayerStatistics.Track("Wild battles", 1)
If CustomBattleMusic = "" OrElse MusicManager.SongExists(CustomBattleMusic) = False Then
If RoamingBattle = True AndAlso RoamingPokemonStorage.MusicLoop <> "" AndAlso MusicManager.SongExists(RoamingPokemonStorage.MusicLoop) = True Then
MusicManager.Play(RoamingPokemonStorage.MusicLoop, True, 0.0F)
Else
If MusicManager.SongExists(SavedOverworld.Level.CurrentRegion.Split(CChar(","))(0) & "_wild") = True Then
MusicManager.Play(SavedOverworld.Level.CurrentRegion.Split(CChar(","))(0) & "_wild", True, 0.0F)
Else
MusicManager.Play("johto_wild", True, 0.0F)
End If
End If
Else
MusicManager.Play(CustomBattleMusic, True, 0.0F)
End If
Me.defaultMapType = defaultMapType
Me.OppPokemon = WildPokemon
@ -331,12 +317,6 @@
PlayerStatistics.Track("Trainer battles", 1)
End If
If IsPVPBattle = True Then
MusicManager.Play("pvp", True, 0.0F)
Else
MusicManager.Play(Trainer.GetBattleMusicName(), True, 0.0F)
End If
Me.defaultMapType = defaultMapType
Me.OppPokemon = Trainer.Pokemons(0)
@ -479,12 +459,6 @@
PlayerStatistics.Track("Safari battles", 1)
If MusicManager.SongExists(SavedOverworld.Level.CurrentRegion.Split(CChar(","))(0) & "_wild") = True Then
MusicManager.Play(SavedOverworld.Level.CurrentRegion.Split(CChar(","))(0) & "_wild", True, 0.0F)
Else
MusicManager.Play("johto_wild", True, 0.0F)
End If
Me.defaultMapType = defaultMapType
Me.OppPokemon = WildPokemon
@ -596,12 +570,6 @@
PlayerStatistics.Track("Bug-Catching contest battles", 1)
If MusicManager.SongExists(SavedOverworld.Level.CurrentRegion.Split(CChar(","))(0) & "_wild") = True Then
MusicManager.Play(SavedOverworld.Level.CurrentRegion.Split(CChar(","))(0) & "_wild", True, 0.0F)
Else
MusicManager.Play("johto_wild", True, 0.0F)
End If
Me.defaultMapType = defaultMapType
Me.OppPokemon = WildPokemon

BIN
P3D/Content/Songs/intro/johto_wild.ogg
View File

Binary file not shown.

BIN
P3D/Content/Songs/johto_wild.ogg
View File

Binary file not shown.

BIN
P3D/Content/Songs/johto_wild_intro.ogg
View File

Binary file not shown.

90
P3D/Resources/Sound/MusicManager.vb
View File

@ -45,33 +45,63 @@ Public Class LoopStream
_sourceStream.Position = 0
Else
If Not _sourceStream.Position = 0 Then
If MusicManager._isIntroStarted = True Then
Dim IntroContinueSong As SongContainer = MusicManager.GetSong(MusicManager._introContinueSong)
If IntroContinueSong IsNot Nothing Then
Logger.Debug($"Play song [{IntroContinueSong.Name}]")
If IntroContinueSong.AudioType = ".ogg" Then
_sourceStream = New VorbisWaveReader(IntroContinueSong.Song)
ElseIf IntroContinueSong.AudioType = ".mp3" Then
_sourceStream = New Mp3FileReader(IntroContinueSong.Song)
ElseIf IntroContinueSong.AudioType = ".wma" Then
_sourceStream = New MediaFoundationReader(IntroContinueSong.Song)
If MusicManager._afterBattleIntroSong IsNot Nothing Then
Dim IntroSongName As String = "intro\" & MusicManager._afterBattleIntroSong.Name
Dim IntroSong As SongContainer = MusicManager.GetSong(IntroSongName)
If IntroSong IsNot Nothing Then
If IntroSong.AudioType = ".ogg" Then
_sourceStream = New VorbisWaveReader(IntroSong.Song)
ElseIf IntroSong.AudioType = ".mp3" Then
_sourceStream = New Mp3FileReader(IntroSong.Song)
ElseIf IntroSong.AudioType = ".wma" Then
_sourceStream = New MediaFoundationReader(IntroSong.Song)
End If
_enableLooping = True
_enableLooping = False
_sourceStream.Position = 0
MusicManager._introContinueSong = MusicManager._afterBattleIntroSong.Name
MusicManager._isIntroStarted = True
Else
If MusicManager.GetSong("silence").AudioType = ".ogg" Then
_sourceStream = New VorbisWaveReader(MusicManager.GetSong("silence").Song)
ElseIf MusicManager.GetSong("silence").AudioType = ".mp3" Then
_sourceStream = New Mp3FileReader(MusicManager.GetSong("silence").Song)
ElseIf MusicManager.GetSong("silence").AudioType = ".wma" Then
_sourceStream = New MediaFoundationReader(MusicManager.GetSong("silence").Song)
If MusicManager._afterBattleIntroSong.AudioType = ".ogg" Then
_sourceStream = New VorbisWaveReader(MusicManager._afterBattleIntroSong.Song)
ElseIf IntroSong.AudioType = ".mp3" Then
_sourceStream = New Mp3FileReader(MusicManager._afterBattleIntroSong.Song)
ElseIf IntroSong.AudioType = ".wma" Then
_sourceStream = New MediaFoundationReader(MusicManager._afterBattleIntroSong.Song)
End If
_enableLooping = True
_sourceStream.Position = 0
MusicManager._isIntroStarted = False
End If
MusicManager._fadeIntoIntro = False
MusicManager._afterBattleIntroSong = Nothing
Else
Exit While
If MusicManager._isIntroStarted = True Then
Dim IntroContinueSong As SongContainer = MusicManager.GetSong(MusicManager._introContinueSong)
If IntroContinueSong IsNot Nothing Then
Logger.Debug($"Play song [{IntroContinueSong.Name}]")
If IntroContinueSong.AudioType = ".ogg" Then
_sourceStream = New VorbisWaveReader(IntroContinueSong.Song)
ElseIf IntroContinueSong.AudioType = ".mp3" Then
_sourceStream = New Mp3FileReader(IntroContinueSong.Song)
ElseIf IntroContinueSong.AudioType = ".wma" Then
_sourceStream = New MediaFoundationReader(IntroContinueSong.Song)
End If
_enableLooping = True
_sourceStream.Position = 0
Else
If MusicManager.GetSong("silence").AudioType = ".ogg" Then
_sourceStream = New VorbisWaveReader(MusicManager.GetSong("silence").Song)
ElseIf MusicManager.GetSong("silence").AudioType = ".mp3" Then
_sourceStream = New Mp3FileReader(MusicManager.GetSong("silence").Song)
ElseIf MusicManager.GetSong("silence").AudioType = ".wma" Then
_sourceStream = New MediaFoundationReader(MusicManager.GetSong("silence").Song)
End If
_enableLooping = True
_sourceStream.Position = 0
End If
MusicManager._fadeIntoIntro = False
Else
Exit While
End If
End If
End If
End If
@ -99,6 +129,7 @@ Public Class MusicManager
' if the song in _currentSong is an actual existing song
Private Shared _currentSongExists As Boolean = False
Private Shared _currentSong As SongContainer = Nothing
Public Shared _afterBattleIntroSong As SongContainer = Nothing
' time until music playback is paused for sound effect
Private Shared _pausedUntil As Date
@ -202,6 +233,7 @@ Public Class MusicManager
_currentSongExists = False
_currentSong = Nothing
_currentSongName = NO_MUSIC
_afterBattleIntroSong = Nothing
_isIntroStarted = False
End Sub
@ -304,7 +336,6 @@ Public Class MusicManager
Public Shared Sub [Stop]()
If Not outputDevice Is Nothing Then
outputDevice.Stop()
outputDevice.Dispose()
End If
_isIntroStarted = False
End Sub
@ -325,7 +356,7 @@ Public Class MusicManager
End Sub
Private Shared Sub Play(song As SongContainer, Optional ByVal introSong As SongContainer = Nothing)
Private Shared Sub Play(song As SongContainer)
If Not song Is Nothing Then
Logger.Debug($"Play song [{song.Name}]")
If Not outputDevice Is Nothing Then
@ -376,17 +407,28 @@ Public Class MusicManager
Return Play(song, playIntro, DEFAULT_FADE_SPEED, loopSong)
End Function
Public Shared Function Play(song As String, playIntro As Boolean, fadeSpeed As Single, Optional loopSong As Boolean = True) As SongContainer
Public Shared Function Play(song As String, playIntro As Boolean, fadeSpeed As Single, Optional loopSong As Boolean = True, Optional AfterBattleIntroSong As String = "") As SongContainer
Dim playedSong As SongContainer = Nothing
' get the current song, only play if it's different
Dim currentSong = GetCurrentSong().ToLowerInvariant()
Dim songName = GetSongName(song)
Dim AfterBattleIntroSongName As String = GetSongName(AfterBattleIntroSong)
If currentSong = NO_MUSIC OrElse currentSong <> songName Then
If AfterBattleIntroSongName <> "" Then
_isLooping = False
If playIntro = True Then
Dim battleIntroSong = GetSong(songName)
If battleIntroSong IsNot Nothing Then
Play(battleIntroSong)
_afterBattleIntroSong = GetSong(AfterBattleIntroSongName)
End If
playedSong = battleIntroSong
ElseIf playIntro = True Then
_isLooping = False
Dim introSong = GetSong("intro\" + songName)
If Not introSong Is Nothing Then
@ -421,7 +463,7 @@ Public Class MusicManager
End If
' intro was not requested or does not exist
If Not _isIntroStarted AndAlso Not _fadeIntoIntro Then
If Not _isIntroStarted AndAlso Not _fadeIntoIntro AndAlso AfterBattleIntroSongName = "" Then
If loopSong = True Then
_isLooping = True
Else

33
P3D/Screens/BattleIntroScreen.vb
View File

@ -504,10 +504,37 @@
Player.Temp.BeforeBattlePosition = Screen.Camera.Position
Player.Temp.BeforeBattleLevelFile = Screen.Level.LevelFile
Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection()
MusicManager.Play(MusicLoop, False, 0F, False)
Dim b As BattleSystem.BattleScreen = CType(Me.NewScreen, BattleSystem.BattleScreen)
If Not MusicManager.CurrentSong Is Nothing Then
Me.duration = MusicManager.CurrentSong.Duration
If b.IsPVPBattle = True Then
MusicManager.Play(MusicLoop, False, 0.0F, False, "pvp")
Else
If b.IsTrainerBattle = True Then
MusicManager.Play(MusicLoop, False, 0.0F, False, Trainer.GetBattleMusicName())
ElseIf Screen.Level.IsSafariZone = True Or Screen.Level.IsBugCatchingContest = True Then
If MusicManager.SongExists(Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild") = True Then
MusicManager.Play(MusicLoop, False, 0.0F, False, Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild")
Else
MusicManager.Play(MusicLoop, False, 0.0F, False, "johto_wild")
End If
Else
If BattleSystem.BattleScreen.CustomBattleMusic = "" OrElse MusicManager.SongExists(BattleSystem.BattleScreen.CustomBattleMusic) = False Then
If BattleSystem.BattleScreen.RoamingBattle = True AndAlso BattleSystem.BattleScreen.RoamingPokemonStorage.MusicLoop <> "" AndAlso MusicManager.SongExists(BattleSystem.BattleScreen.RoamingPokemonStorage.MusicLoop) = True Then
MusicManager.Play(MusicLoop, True, 0.0F, False, BattleSystem.BattleScreen.RoamingPokemonStorage.MusicLoop)
Else
If MusicManager.SongExists(Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild") = True Then
MusicManager.Play(MusicLoop, False, 0.0F, False, Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild")
Else
MusicManager.Play(MusicLoop, False, 0.0F, False, "johto_wild")
End If
End If
Else
MusicManager.Play(MusicLoop, True, 0.0F, False, BattleSystem.BattleScreen.CustomBattleMusic)
End If
End If
End If
If Not MusicLoop Is Nothing Then
Me.duration = MusicManager.GetSong(MusicLoop).Duration
Else
Me.duration = New TimeSpan(0)
End If