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

Show shiny in dex if caught

This commit is contained in:
JappaWakka 2023-07-26 14:26:56 +02:00
parent 02475bb24a
commit 1c27620e13
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/Pokemon/Monster/Pokemon.vb
View File

@ -2757,12 +2757,12 @@ Public Class Pokemon
''' Returns the display texture of this Pokémon. ''' Returns the display texture of this Pokémon.
''' </summary> ''' </summary>
''' <param name="FrontView">If this Pokémon should be viewed from the front.</param> ''' <param name="FrontView">If this Pokémon should be viewed from the front.</param>
Public Function GetTexture(ByVal FrontView As Boolean) As Texture2D Public Function GetTexture(ByVal FrontView As Boolean, Optional forceShiny As Boolean = False) As Texture2D
If FrontView = True Then If FrontView = True Then
If Me.IsEgg() = True Then If Me.IsEgg() = True Then
Return GetTexture(6) Return GetTexture(6)
Else Else
If IsShiny = True Then If IsShiny = True OrElse forceShiny = True Then
Return GetTexture(2) Return GetTexture(2)
Else Else
Return GetTexture(0) Return GetTexture(0)
@ -2772,7 +2772,7 @@ Public Class Pokemon
If Me.IsEgg() = True Then If Me.IsEgg() = True Then
Return GetTexture(7) Return GetTexture(7)
Else Else
If IsShiny = True Then If IsShiny = True OrElse forceShiny = True Then
Return GetTexture(3) Return GetTexture(3)
Else Else
Return GetTexture(1) Return GetTexture(1)

26
P3D/Screens/Pokedex/PokedexScreen.vb
View File

@ -752,6 +752,10 @@ Public Class PokedexScreen
Core.SpriteBatch.DrawString(FontManager.MainFont, p.PokedexEntry.Text.CropStringToWidth(FontManager.MainFont, 448), New Vector2(688, 490), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, p.PokedexEntry.Text.CropStringToWidth(FontManager.MainFont, 448), New Vector2(688, 490), Color.Black)
Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 160, 10, 10), ""), New Rectangle(992, 242, 20, 20), Color.White) Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 160, 10, 10), ""), New Rectangle(992, 242, 20, 20), Color.White)
If entryType > 2 Then
SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\PokemonInfo"), New Rectangle(1033, 243, 18, 18), New Rectangle(16, 0, 9, 9), Color.White)
End If
Else Else
Core.SpriteBatch.DrawString(FontManager.MainFont, "??? Pokémon", New Vector2(850, 310), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, "??? Pokémon", New Vector2(850, 310), Color.Black)
Core.SpriteBatch.DrawString(FontManager.MainFont, "???", New Vector2(850, 350), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, "???", New Vector2(850, 350), Color.Black)
@ -1324,6 +1328,7 @@ Public Class PokedexViewScreen
Dim yOffset As Integer = 0 Dim yOffset As Integer = 0
Dim FrontView As Boolean = True Dim FrontView As Boolean = True
Dim ShinyView As Boolean = False
Dim EvolutionLineConnections As New List(Of PokemonEvolutionLine) Dim EvolutionLineConnections As New List(Of PokemonEvolutionLine)
@ -1606,7 +1611,7 @@ Public Class PokedexViewScreen
End Sub End Sub
Private Sub GetYOffset() Private Sub GetYOffset()
Dim t As Texture2D = Pokemon.GetTexture(FrontView) Dim t As Texture2D = Pokemon.GetTexture(FrontView, ShinyView)
Me.yOffset = -1 Me.yOffset = -1
Dim cArr(t.Width * t.Height - 1) As Color Dim cArr(t.Width * t.Height - 1) As Color
@ -1670,6 +1675,9 @@ Public Class PokedexViewScreen
Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 170, 10, 10), ""), New Rectangle(64 * 6 + 40, 42, 20, 20), Color.White) Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 170, 10, 10), ""), New Rectangle(64 * 6 + 40, 42, 20, 20), Color.White)
ElseIf EntryType > 1 Then ElseIf EntryType > 1 Then
Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 160, 10, 10), ""), New Rectangle(64 * 6 + 40, 42, 20, 20), Color.White) Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\pokedexhabitat", New Rectangle(160, 160, 10, 10), ""), New Rectangle(64 * 6 + 40, 42, 20, 20), Color.White)
If EntryType > 2 Then
SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\PokemonInfo"), New Rectangle(64 * 6 - 1, 42, 18, 18), New Rectangle(16, 0, 9, 9), Color.White)
End If
End If End If
If Me.mLineLength = 100 Then If Me.mLineLength = 100 Then
@ -1709,7 +1717,7 @@ Public Class PokedexViewScreen
Dim playedCry As Boolean = False Dim playedCry As Boolean = False
Private Sub DrawPage1() Private Sub DrawPage1()
Dim v As Vector2 = Core.GetMiddlePosition(New Size(MathHelper.Min(Pokemon.GetTexture(True).Width * 4, 512), MathHelper.Min(Pokemon.GetTexture(True).Height * 4, 512))) Dim v As Vector2 = Core.GetMiddlePosition(New Size(MathHelper.Min(Pokemon.GetTexture(Me.FrontView, ShinyView).Width * 4, 512), MathHelper.Min(Pokemon.GetTexture(Me.FrontView, ShinyView).Height * 4, 512)))
Dim textureColor As Color = Color.White Dim textureColor As Color = Color.White
Dim pForms As List(Of String) = PokemonForms.GetAdditionalDataForms(Pokemon.Number) Dim pForms As List(Of String) = PokemonForms.GetAdditionalDataForms(Pokemon.Number)
@ -1717,7 +1725,7 @@ Public Class PokedexViewScreen
textureColor = New Color(0, 0, 0, 0) textureColor = New Color(0, 0, 0, 0)
End If End If
Core.SpriteBatch.Draw(Pokemon.GetTexture(Me.FrontView), New Rectangle(CInt(v.X), CInt(v.Y) - yOffset * 2 + 32, MathHelper.Min(Pokemon.GetTexture(True).Width * 4, 512), MathHelper.Min(Pokemon.GetTexture(True).Height * 4, 512)), New Color(textureColor.R, textureColor.G, textureColor.B, textureColor.A)) Core.SpriteBatch.Draw(Pokemon.GetTexture(Me.FrontView, ShinyView), New Rectangle(CInt(v.X), CInt(v.Y) - yOffset * 2 + 32, MathHelper.Min(Pokemon.GetTexture(Me.FrontView, ShinyView).Width * 4, 512), MathHelper.Min(Pokemon.GetTexture(Me.FrontView, ShinyView).Height * 4, 512)), New Color(textureColor.R, textureColor.G, textureColor.B, textureColor.A))
If fadeMainImage = 255 Then If fadeMainImage = 255 Then
Dim mV As Vector2 = Core.GetMiddlePosition(New Size(0, 0)) Dim mV As Vector2 = Core.GetMiddlePosition(New Size(0, 0))
@ -2093,7 +2101,17 @@ Public Class PokedexViewScreen
Private Sub UpdatePage1() Private Sub UpdatePage1()
If Controls.Accept(True, True, True) = True Then If Controls.Accept(True, True, True) = True Then
SoundManager.PlaySound("select") SoundManager.PlaySound("select")
Me.FrontView = Not Me.FrontView
If EntryType > 2 Then
If Me.FrontView = False Then
Me.ShinyView = Not Me.ShinyView
End If
Me.FrontView = Not Me.FrontView
Else
Me.FrontView = Not Me.FrontView
End If
Me.GetYOffset() Me.GetYOffset()
End If End If
End Sub End Sub