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

Party display improvements 

* Positions and rotation origins of Pokémon icons improved in Party Screen
* Pokémon in Main Menu now display their correct form (e.g. Unown showing the correct letter)
This commit is contained in:
JappaWakka 2022-04-16 18:24:26 +02:00
parent 5cda771e81
commit e187747ef8
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P3D/Screens/MainMenu/PressStartScreen.vb
View File

@ -1149,7 +1149,7 @@ Public Class NewMainMenuScreen
_gameModeExists = True _gameModeExists = True
GameModeManager.SetGameModePointer(_gameMode) GameModeManager.SetGameModePointer(_gameMode)
PokemonForms.Initialize()
Dim pokemonData As String() = pokedata.SplitAtNewline() Dim pokemonData As String() = pokedata.SplitAtNewline()
For Each line As String In pokemonData For Each line As String In pokemonData
If line.StartsWith("{") Then If line.StartsWith("{") Then

13
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -279,6 +279,10 @@ Public Class PartyScreen
Canvas.DrawRectangle(New Rectangle(CInt(position.X) + 32, CInt(position.Y), 228, 76), backColor) Canvas.DrawRectangle(New Rectangle(CInt(position.X) + 32, CInt(position.Y), 228, 76), backColor)
Canvas.DrawGradient(New Rectangle(CInt(position.X) + 260, CInt(position.Y), 32, 76), backColor, New Color(0, 0, 0, 0), True, -1) Canvas.DrawGradient(New Rectangle(CInt(position.X) + 260, CInt(position.Y), 32, 76), backColor, New Color(0, 0, 0, 0), True, -1)
Dim pokeTexture = p.GetMenuTexture()
Dim pokeXOffset = CInt((32 - pokeTexture.Width) / 2)
Dim pokeYOffset = CInt((32 - pokeTexture.Height) / 2)
If p.IsEgg() Then If p.IsEgg() Then
Dim percent As Integer = CInt((p.EggSteps / p.BaseEggSteps) * 100) Dim percent As Integer = CInt((p.EggSteps / p.BaseEggSteps) * 100)
Dim shakeMulti As Single = 1.0F Dim shakeMulti As Single = 1.0F
@ -291,8 +295,8 @@ Public Class PartyScreen
End If End If
'menu image: 'menu image:
SpriteBatch.Draw(p.GetMenuTexture(), New Rectangle(CInt(position.X) + 80 + 32, CInt(position.Y) + 6 + 32, 64, 64), Nothing, New Color(255, 255, 255, CInt(255 * _interfaceFade)), SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(position.X + 24 - pokeXOffset), CInt(position.Y + 32 + 6 - pokeYOffset), 64, 64), Nothing, New Color(255, 255, 255, CInt(255 * _interfaceFade)),
_pokemonAnimations(index)._shakeV * shakeMulti, New Vector2(16, 16), SpriteEffects.None, 0F) _pokemonAnimations(index)._shakeV * shakeMulti, New Vector2(CInt(pokeTexture.Width / 2), CInt(pokeTexture.Width / 4 * 3)), SpriteEffects.None, 0F)
'name: 'name:
GetFontRenderer().DrawString(FontManager.MainFont, p.GetDisplayName(), New Vector2(position.X + 156, position.Y + 27), New Color(255, 255, 255, CInt(255 * _interfaceFade))) GetFontRenderer().DrawString(FontManager.MainFont, p.GetDisplayName(), New Vector2(position.X + 156, position.Y + 27), New Color(255, 255, 255, CInt(255 * _interfaceFade)))
@ -300,9 +304,8 @@ Public Class PartyScreen
Dim shakeMulti As Single = CSng((p.HP / p.MaxHP).Clamp(0.2F, 1.0F)) Dim shakeMulti As Single = CSng((p.HP / p.MaxHP).Clamp(0.2F, 1.0F))
'menu image: 'menu image:
Dim pokeTexture = p.GetMenuTexture() SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(position.X + 24 - pokeXOffset), CInt(position.Y + 32 + 6 - pokeYOffset), 64, 64), Nothing, New Color(255, 255, 255, CInt(255 * _interfaceFade)),
SpriteBatch.Draw(pokeTexture, New Rectangle(CInt(position.X) + 2 + 32 - CInt(pokeTexture.Width - 32), CInt(position.Y) - 4 + 32, pokeTexture.Width * 2, 64), Nothing, New Color(255, 255, 255, CInt(255 * _interfaceFade)), _pokemonAnimations(index)._shakeV * shakeMulti, New Vector2(CInt(pokeTexture.Width / 2), CInt(pokeTexture.Width / 4 * 3)), SpriteEffects.None, 0F)
_pokemonAnimations(index)._shakeV * shakeMulti, New Vector2(16, 16), SpriteEffects.None, 0F)
'Item: 'Item: