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

Fixed previewer interaction with boxes for SummaryScreen

Browse Source
This commit is contained in:
CaptainSegis 2017-03-23 00:00:50 -05:00
parent d39eb53bbd
commit 0f839cce23
1 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,9 @@
'Pointer 'Pointer
Private _pointerDest As Integer = 0 Private _pointerDest As Integer = 0
Private _pointerPos As Single = 0F Private _pointerPos As Single = 0F
Private _pokemonDest As Integer = 0
Private _pokemonPos As Single = 0F
Private _previewerOffset As Integer = 0
'Fade in animation: 'Fade in animation:
Private _fadeIn As Single = 0F Private _fadeIn As Single = 0F
@ -56,9 +59,10 @@
_partyIndex = partyIndex _partyIndex = partyIndex
_party = party _party = party
SetPointerDest(_partyIndex) SetDest(_partyIndex)
GetYOffset() GetYOffset()
_pointerPos = _pointerDest _pointerPos = _pointerDest
_pokemonPos = _pokemonDest
_moveSelectorPosition = GetMoveSelectorDest(_moveIndex) _moveSelectorPosition = GetMoveSelectorDest(_moveIndex)
End Sub End Sub
@ -71,9 +75,10 @@
_pageIndex = Player.Temp.PokemonSummaryPageIndex _pageIndex = Player.Temp.PokemonSummaryPageIndex
_selectedPokemon = selectedPokemon _selectedPokemon = selectedPokemon
SetPointerDest(_partyIndex) SetDest(_partyIndex)
GetYOffset() GetYOffset()
_pointerPos = _pointerDest _pointerPos = _pointerDest
_pokemonPos = _pokemonDest
_moveSelectorPosition = GetMoveSelectorDest(_moveIndex) _moveSelectorPosition = GetMoveSelectorDest(_moveIndex)
End Sub End Sub
@ -138,7 +143,7 @@
If _partyIndex > -1 Then If _partyIndex > -1 Then
For i = 0 To _party.Count - 1 For i = 0 To _party.Count - 1
Dim pokemonPos As Double = GetPointerDest(i) - 16 Dim pokemonPos As Double = GetPokemonDest(i) - 16 - (64 + 16) * (_pokemonDest - _pokemonPos)
Core.SpriteBatch.Draw(_party(i).GetMenuTexture(), New Rectangle(CInt(pokemonPos), 16, 64, 64), mainBackgroundColor) Core.SpriteBatch.Draw(_party(i).GetMenuTexture(), New Rectangle(CInt(pokemonPos), 16, 64, 64), mainBackgroundColor)
Next Next
@ -292,7 +297,7 @@
'Draw stats: 'Draw stats:
Dim colors As Color() = {New Color(120, 239, 155), New Color(241, 227, 154), New Color(255, 178, 114), New Color(151, 217, 205), New Color(137, 154, 255), New Color(213, 128, 255)} Dim colors As Color() = {New Color(120, 239, 155), New Color(241, 227, 154), New Color(255, 178, 114), New Color(151, 217, 205), New Color(137, 154, 255), New Color(213, 128, 255)}
Dim statNames As String() = {"HP", "Attack", "Defense", "Sp. Atk", "Sp. Def", "Speed"} Dim statNames As String() = {"HP", "Attack", "Defense", "Sp. Atk", "Sp. Def", "Speed"}
Dim statValues As String() = { .HP & " / " & .MaxHP, CStr( .Attack), CStr( .Defense), CStr( .SpAttack), CStr( .SpDefense), CStr( .Speed)} Dim statValues As String() = { .HP & " / " & .MaxHP, CStr(.Attack), CStr(.Defense), CStr(.SpAttack), CStr(.SpDefense), CStr(.Speed)}
Dim evStats As Single() = { .EVHP, .EVAttack, .EVDefense, .EVSpAttack, .EVSpDefense, .EVSpeed} Dim evStats As Single() = { .EVHP, .EVAttack, .EVDefense, .EVSpAttack, .EVSpDefense, .EVSpeed}
Dim ivStats As Single() = { .IVHP, .IVAttack, .IVDefense, .IVSpAttack, .IVSpDefense, .IVSpeed} Dim ivStats As Single() = { .IVHP, .IVAttack, .IVDefense, .IVSpAttack, .IVSpDefense, .IVSpeed}
@ -316,7 +321,7 @@
Canvas.DrawRectangle(New Rectangle(450, 172 + y * 32 + yOffset, 6, height), statColor) Canvas.DrawRectangle(New Rectangle(450, 172 + y * 32 + yOffset, 6, height), statColor)
SpriteBatch.DrawString(FontManager.ChatFont, statNames(y), New Vector2(466, 176 + y * 32 + yOffset), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) SpriteBatch.DrawString(FontManager.ChatFont, statNames(y), New Vector2(466, 176 + y * 32 + yOffset), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
Dim natureStatMulti As Single = Nature.GetMultiplier( .Nature, statNames(y)) Dim natureStatMulti As Single = Nature.GetMultiplier(.Nature, statNames(y))
Dim multiColor As Color = New Color(255, 255, 255, CInt(200 * _fadeIn * _pageFade)) Dim multiColor As Color = New Color(255, 255, 255, CInt(200 * _fadeIn * _pageFade))
If natureStatMulti > 1.0F Then If natureStatMulti > 1.0F Then
@ -380,19 +385,19 @@
Canvas.DrawRectangle(New Rectangle(816, 490, 300, 64), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade))) Canvas.DrawRectangle(New Rectangle(816, 490, 300, 64), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade)))
SpriteBatch.DrawString(FontManager.ChatFont, "To Next Lv.", New Vector2(826, 494), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) SpriteBatch.DrawString(FontManager.ChatFont, "To Next Lv.", New Vector2(826, 494), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
If .NeedExperience( .Level + 1) - .Experience > 0 Then If .NeedExperience(.Level + 1) - .Experience > 0 Then
SpriteBatch.DrawString(FontManager.ChatFont, CStr( .NeedExperience( .Level + 1) - .Experience), New Vector2(980, 494), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade))) SpriteBatch.DrawString(FontManager.ChatFont, CStr(.NeedExperience(.Level + 1) - .Experience), New Vector2(980, 494), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
'EXP Bar: 'EXP Bar:
Dim expV As Double = ( .Experience - .NeedExperience( .Level)) / ( .NeedExperience( .Level + 1) - .NeedExperience( .Level)) Dim expV As Double = (.Experience - .NeedExperience(.Level)) / (.NeedExperience(.Level + 1) - .NeedExperience(.Level))
If .Level = 1 Then If .Level = 1 Then
expV = .Experience / .NeedExperience(2) expV = .Experience / .NeedExperience(2)
End If End If
Dim expWidth As Integer = CInt((107 * _fadeIn) * expV) Dim expWidth As Integer = CInt((107 * _fadeIn) * expV)
If .Experience > .NeedExperience( .Level) And expWidth = 0 Then If .Experience > .NeedExperience(.Level) And expWidth = 0 Then
expWidth = 1 expWidth = 1
End If End If
If .Experience > .NeedExperience( .Level + 1) Then If .Experience > .NeedExperience(.Level + 1) Then
expWidth = 107 expWidth = 107
expV = 1.0F expV = 1.0F
End If End If
@ -481,7 +486,7 @@
'Stats: 'Stats:
SpriteBatch.DrawString(FontManager.ChatFont, "Category:", New Vector2(810, 240), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) SpriteBatch.DrawString(FontManager.ChatFont, "Category:", New Vector2(810, 240), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
Core.SpriteBatch.Draw( .Attacks(_moveIndex).GetDamageCategoryImage(), New Rectangle(924, 241, 48, 24), New Color(255, 255, 255, CInt(255 * _fadeIn * _pageFade * _moveFade))) Core.SpriteBatch.Draw(.Attacks(_moveIndex).GetDamageCategoryImage(), New Rectangle(924, 241, 48, 24), New Color(255, 255, 255, CInt(255 * _fadeIn * _pageFade * _moveFade)))
SpriteBatch.DrawString(FontManager.ChatFont, "Power:", New Vector2(810, 272), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) SpriteBatch.DrawString(FontManager.ChatFont, "Power:", New Vector2(810, 272), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade)))
@ -600,7 +605,7 @@
If _partyIndex > 0 Then If _partyIndex > 0 Then
_partyIndex -= 1 _partyIndex -= 1
GetYOffset() GetYOffset()
SetPointerDest(_partyIndex) SetDest(_partyIndex)
End If End If
End If End If
@ -608,7 +613,7 @@
If _partyIndex < _party.Count - 1 Then If _partyIndex < _party.Count - 1 Then
_partyIndex += 1 _partyIndex += 1
GetYOffset() GetYOffset()
SetPointerDest(_partyIndex) SetDest(_partyIndex)
End If End If
End If End If
@ -743,39 +748,60 @@
_pointerPos = _pointerDest _pointerPos = _pointerDest
End If End If
End If End If
If _pokemonPos < _pokemonDest Then
_pokemonPos = MathHelper.Lerp(_pokemonDest, _pokemonPos, 0.8F)
If _pokemonPos >= _pokemonDest Then
_pokemonPos = _pokemonDest
End If
ElseIf _pokemonPos > _pokemonDest Then
_pokemonPos = MathHelper.Lerp(_pokemonDest, _pokemonPos, 0.8F)
If _pokemonPos <= _pokemonDest Then
_pokemonPos = _pokemonDest
End If
End If
End Sub End Sub
Private Function GetPointerDest(ByVal partyIndex As Integer) As Integer Private Function GetDest(ByVal partyIndex As Integer) As Integer
Dim pointerX As Double = Core.ScreenSize.Width / 2 Dim pointerX As Double = Core.ScreenSize.Width / 2
If _party.Length Mod 2 = 0 Then If _party.Length Mod 2 = 0 Then
'Even: 'Even:
Dim half As Integer = CInt(_party.Length / 2) Dim half As Integer = CInt(_party.Length / 2)
If partyIndex < _party.Length / 2 Then
pointerX -= (8 + 64 * (half - partyIndex) + 16 * ((half - 1) - partyIndex))
Else
pointerX += (8 + (64 + 16) * (partyIndex - half)) pointerX += (8 + (64 + 16) * (partyIndex - half))
End If
Else Else
'Odd: 'Odd:
Dim half As Integer = CInt(Math.Floor(_party.Length / 2)) Dim half As Integer = CInt(Math.Floor(_party.Length / 2))
pointerX += (64 + 16) * (partyIndex - half)
If partyIndex < half Then
pointerX -= (16 + 64) * (half - partyIndex)
ElseIf partyIndex > half Then
pointerX += (16 + 64) * (partyIndex - half)
End If
End If End If
Return CInt(pointerX) Return CInt(pointerX)
End Function End Function
Private Sub SetPointerDest(ByVal partyIndex As Integer) Private Function GetPointerDest(ByVal partyIndex As Integer) As Integer
Dim pointerX As Double = GetDest(partyIndex)
_previewerOffset = 0
While pointerX > Core.ScreenSize.Width - (64 + 16)
pointerX -= (64 + 16)
_previewerOffset -= 1
End While
While pointerX < (64)
pointerX += (64 + 16)
_previewerOffset += 1
End While
Return CInt(pointerX)
End Function
Private Function GetPokemonDest(ByVal partyIndex As Integer) As Integer
Dim pointerX As Double = GetDest(partyIndex)
pointerX += (_previewerOffset * (64 + 16))
Return CInt(pointerX)
End Function
Private Sub SetDest(ByVal partyIndex As Integer)
_fadeIn = 0F _fadeIn = 0F
_pixelFade = 0F _pixelFade = 0F
_pointerDest = GetPointerDest(partyIndex) _pointerDest = GetPointerDest(partyIndex)
_pokemonDest = _previewerOffset
If GetPokemon().IsEgg() = False Then If GetPokemon().IsEgg() = False Then
GetPokemon().PlayCry() GetPokemon().PlayCry()
End If End If