tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-25 14:54:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Slight fix about shake animation in PartyScreen. Enabled back sprite view in SummaryScreen.

Browse Source
This commit is contained in:
CaptainSegis 2017-08-31 00:03:25 -05:00
parent e3c9a78aea
commit 89944271da
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2.5DHero/2.5DHero/Screens/Pokemon/PartyScreen.vb
View File

@ -457,18 +457,22 @@ Public Class PartyScreen
_menu.Update() _menu.Update()
Else Else
If Controls.Down(True, True, False, True, True, True) And _index < PokemonList.Count - 2 Then If Controls.Down(True, True, False, True, True, True) And _index < PokemonList.Count - 2 Then
_pokemonAnimations(_index)._shakeV = 0
_index += 2 _index += 2
_cursorDest = GetBoxPosition(_index) _cursorDest = GetBoxPosition(_index)
End If End If
If Controls.Up(True, True, False, True, True, True) And _index > 1 Then If Controls.Up(True, True, False, True, True, True) And _index > 1 Then
_pokemonAnimations(_index)._shakeV = 0
_index -= 2 _index -= 2
_cursorDest = GetBoxPosition(_index) _cursorDest = GetBoxPosition(_index)
End If End If
If Controls.Left(True) And _index > 0 Then If Controls.Left(True) And _index > 0 Then
_pokemonAnimations(_index)._shakeV = 0
_index -= 1 _index -= 1
_cursorDest = GetBoxPosition(_index) _cursorDest = GetBoxPosition(_index)
End If End If
If Controls.Right(True) And _index < PokemonList.Count - 1 Then If Controls.Right(True) And _index < PokemonList.Count - 1 Then
_pokemonAnimations(_index)._shakeV = 0
_index += 1 _index += 1
_cursorDest = GetBoxPosition(_index) _cursorDest = GetBoxPosition(_index)
End If End If

12
2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb
View File

@ -10,6 +10,8 @@
Private _texture As Texture2D Private _texture As Texture2D
Private _isFront As Boolean = True
'Pointer 'Pointer
Private _pointerDest As Integer = 0 Private _pointerDest As Integer = 0
Private _pointerPos As Single = 0F Private _pointerPos As Single = 0F
@ -194,7 +196,7 @@
'Draw Pokémon preview: 'Draw Pokémon preview:
If _enrollY >= 160 Then If _enrollY >= 160 Then
Dim height As Integer = CInt(_enrollY - 160).Clamp(0, 256) Dim height As Integer = CInt(_enrollY - 160).Clamp(0, 256)
Dim pokemonTexture = GetPokemon().GetTexture(True) Dim pokemonTexture = GetPokemon().GetTexture(_isFront)
Dim textureHeight As Integer = CInt(pokemonTexture.Height * (height / 256)) Dim textureHeight As Integer = CInt(pokemonTexture.Height * (height / 256))
Dim pokemonTextureOffset As Integer = 32 Dim pokemonTextureOffset As Integer = 32
@ -607,6 +609,7 @@
_partyIndex -= 1 _partyIndex -= 1
GetYOffset() GetYOffset()
SetDest(_partyIndex) SetDest(_partyIndex)
_isFront = True
End If End If
End If End If
@ -615,6 +618,7 @@
_partyIndex += 1 _partyIndex += 1
GetYOffset() GetYOffset()
SetDest(_partyIndex) SetDest(_partyIndex)
_isFront = True
End If End If
End If End If
@ -634,10 +638,14 @@
_pageOpening = False _pageOpening = False
End If End If
End If End If
If Controls.Accept() = True And _pageIndex = 1 Then If Controls.Accept() = True Then
If _pageIndex = 0 Then
_isFront = Not _isFront
ElseIf _pageIndex = 1 Then
_moveSelected = True _moveSelected = True
End If End If
End If End If
End If
If Controls.Dismiss() = True Then If Controls.Dismiss() = True Then
_closing = True _closing = True
End If End If