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

added flexibility to the night theme system, removed metadata from the night themes, added night themes to the project files

This commit is contained in:
Max Rigout 2025-02-20 16:40:55 -05:00
parent 644d2c64ef
commit e6d78d1d3b
6 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
P3D/Content/Songs/johto_wild_intro_night.ogg Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

9
P3D/P3D.vbproj
View File

@ -17885,6 +17885,9 @@
<Content Include="Content\Songs\intro\johto_wild.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Songs\intro\johto_wild_night.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Songs\intro\kanto_leader.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -18071,6 +18074,12 @@
<Content Include="Content\Songs\johto_wild_intro.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Songs\johto_wild_intro_night.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Songs\johto_wild_night.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Songs\kanto_leader.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

32
P3D/Screens/BattleIntroScreen.vb
View File

@ -42,8 +42,8 @@
End If
End If
If ShouldPlayNightTheme() Then
musicLoop = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night_intro"
If ShouldPlayNightTheme(musicLoop) Then
musicLoop = musicLoop & "_night"
'musicLoop = "kanto_wild_intro"
End If
@ -65,8 +65,8 @@
End If
End If
If ShouldPlayNightTheme() Then
MusicLoop = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night_intro"
If ShouldPlayNightTheme(MusicLoop) Then
MusicLoop = MusicLoop & "_night"
End If
If MusicManager.SongExists(MusicLoop) = False Then
@ -297,7 +297,7 @@
Dim t1 As Texture2D = TextureManager.GetTexture("GUI\Intro\VSIntro", New Rectangle(CInt(barPosition.X), CInt(barPosition.Y), 128, 64), "")
Dim t2 As Texture2D = TextureManager.GetTexture("GUI\Intro\VSIntro", New Rectangle(CInt(VSPosition.X), CInt(VSPosition.Y), 64, 64), "")
Dim t3 As Texture2D = TextureManager.GetTexture(TrainerTexture1, New Rectangle(0, Trainer1FrameSize.Height * 2, Trainer1FrameSize.Width, Trainer1FrameSize.Height))
If Trainer.GameJoltID <> "" Then
If GameJolt.Emblem.HasDownloadedSprite(Trainer.GameJoltID) = True Then
@ -615,6 +615,7 @@
'bug catching contest
'roaming battle
'wild pokemon
Dim fallbackLoopSong = "johto_wild"
Dim loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
If battleType = BattleIntroScreen.BattleType.PVP Then
@ -625,17 +626,9 @@
ElseIf battleType = BattleIntroScreen.BattleType.SAFARI Then
fallbackLoopSong = "johto_wild"
loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
If ShouldPlayNightTheme() Then
loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night"
fallbackLoopSong = "johto_wild_night"
End If
ElseIf battleType = BattleIntroScreen.BattleType.BUG_CATCHING Then
fallbackLoopSong = "johto_wild"
loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
If ShouldPlayNightTheme() Then
loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night"
fallbackLoopSong = "johto_wild_night"
End If
ElseIf battleType = BattleIntroScreen.BattleType.ROAMING Then
If BattleSystem.BattleScreen.RoamingPokemonStorage.MusicLoop <> "" Then
loopSong = BattleSystem.BattleScreen.RoamingPokemonStorage.MusicLoop
@ -643,14 +636,15 @@
ElseIf battleType = BattleIntroScreen.BattleType.WILD Then
fallbackLoopSong = "johto_wild"
loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
If ShouldPlayNightTheme() Then
loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night"
fallbackLoopSong = "johto_wild_night"
End If
Else
Console.WriteLine("Unknown Battle Type: " & battleType)
End If
If ShouldPlayNightTheme(loopSong) Then
loopSong = loopSong & "_night"
fallbackLoopSong = "johto_wild_night"
End If
If MusicManager.SongExists(loopSong) = True Then
Return loopSong
End If
@ -661,8 +655,8 @@
Return startTime + duration < Date.Now
End Function
Private Function ShouldPlayNightTheme() As Boolean
Return World.IsNight() And Screen.Level.CurrentRegion = "Johto"
Private Function ShouldPlayNightTheme(dayThemeName As String) As Boolean
Return World.IsNight() And MusicManager.SongExists(dayThemeName & "_night")
End Function
'Protected Overrides Sub Finalize()