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

Fix hardcoded Pokémon Front, Back and Menu sprites

This commit is contained in:
JappaWakka 2022-07-31 19:35:26 +02:00
parent 6f5f992d6e
commit b6bb46ba6e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2527,15 +2527,15 @@ Public Class Pokemon
Case 1
Dim TextureImage As Texture2D = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName)
Dim TextureSize As Size = New Size(TextureImage.Width, TextureImage.Height)
Textures(index) = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName, New Rectangle(128, 0, CInt(TextureSize.Width / 2), CInt(TextureSize.Height / 2)), "")
Textures(index) = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName, New Rectangle(CInt(TextureSize.Width / 2), 0, CInt(TextureSize.Width / 2), CInt(TextureSize.Height / 2)), "")
Case 2
Dim TextureImage As Texture2D = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName)
Dim TextureSize As Size = New Size(TextureImage.Width, TextureImage.Height)
Textures(index) = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName, New Rectangle(0, 128, CInt(TextureSize.Width / 2), CInt(TextureSize.Height / 2)), "")
Textures(index) = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName, New Rectangle(0, CInt(TextureSize.Height / 2), CInt(TextureSize.Width / 2), CInt(TextureSize.Height / 2)), "")
Case 3
Dim TextureImage As Texture2D = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName)
Dim TextureSize As Size = New Size(TextureImage.Width, TextureImage.Height)
Textures(index) = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName, New Rectangle(128, 128, CInt(TextureSize.Width / 2), CInt(TextureSize.Height / 2)), "")
Textures(index) = P3D.TextureManager.GetTexture("Pokemon\Sprites\" & Me.AnimationName, New Rectangle(CInt(TextureSize.Width / 2), CInt(TextureSize.Height / 2), CInt(TextureSize.Width / 2), CInt(TextureSize.Height / 2)), "")
Case 4
Dim v As Vector2 = PokemonForms.GetMenuImagePosition(Me)
Dim s As Size = PokemonForms.GetMenuImageSize(Me)
@ -2546,12 +2546,14 @@ Public Class Pokemon
shinypos = 512
End If
Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu\" & sheet, New Rectangle(CInt(v.X) * 32 + shinypos, CInt(v.Y) * 32, s.Width, s.Height), "")
Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu\" & sheet, New Rectangle(CInt(v.X) * s.Width + shinypos, CInt(v.Y) * s.Height, s.Width, s.Height), "")
Case 5
If Me.Number = 490 Then
Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu\OtherForms", New Rectangle(64, 0, 32, 32), "")
Dim s As Size = PokemonForms.GetMenuImageSize(Me)
Textures(index) = P3D.TextureManager.GetTexture("GUI\PokemonMenu\OtherForms", New Rectangle(s.Width * 2, 0, s.Width, s.Height), "")
Else
Textures(index) = EggCreator.CreateEggSprite(Me, P3D.TextureManager.GetTexture("GUI\PokemonMenu\OtherForms", New Rectangle(32, 0, 32, 32), ""), P3D.TextureManager.GetTexture("Pokemon\Egg\Templates\Menu"))
Dim s As Size = PokemonForms.GetMenuImageSize(Me)
Textures(index) = EggCreator.CreateEggSprite(Me, P3D.TextureManager.GetTexture("GUI\PokemonMenu\OtherForms", New Rectangle(s.Width, 0, s.Width, s.Height), ""), P3D.TextureManager.GetTexture("Pokemon\Egg\Templates\Menu"))
End If
Case 6
If Me.Number = 490 Then

4
P3D/Pokemon/Monster/Resource/PokemonForms.vb
View File

@ -277,7 +277,9 @@ Public Class PokemonForms
End Function
Public Overridable Function GetMenuImageSize(ByVal P As Pokemon) As Size
Return New Size(32, 32)
Dim sheet As String = GetSheetName(P)
Dim _size As Integer = CInt(TextureManager.GetTexture(sheet).Width / 32)
Return New Size(_size, _size)
End Function
Public Overridable Function GetOverworldAddition(ByVal P As Pokemon) As String