tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-04-08 18:35:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tiny fix about mega evolution

Browse Source
This commit is contained in:
CaptainSegis 2018-03-25 21:05:39 -05:00
parent b9c39c07ae
commit 6b33815b2b
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
P3D/Battle/BattleSystemV2/BattleMenu.vb
View File

@ -654,15 +654,19 @@
_mainMenuIndex = 0
End If
For i = 0 To Core.Player.Pokemons.Count - 1
Dim _str As String = Core.Player.Pokemons(i).AdditionalData
Select Case _str
Case "mega", "mega_x", "mega_y"
Exit Sub
Case Else
'do nothing
End Select
Next
If BattleScreen.FieldEffects.OwnMegaEvolved Then
Exit Sub
End If
'For i = 0 To Core.Player.Pokemons.Count - 1
' Dim _str As String = Core.Player.Pokemons(i).AdditionalData
' Select Case _str
' Case "mega", "mega_x", "mega_y"
' Exit Sub
' Case Else
' 'do nothing
' End Select
'Next
Dim PokeIndex As Integer = BattleScreen.OwnPokemonIndex
If BattleScreen.FieldEffects.OwnMegaEvolved = False Then
If Not Core.Player.Pokemons(PokeIndex).Item Is Nothing Then
@ -894,10 +898,14 @@
If BattleScreen.IsMegaEvolvingOwn Then
BattleScreen.SendClientCommand("MEGA|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
BattleScreen.IsMegaEvolvingOwn = False
BattleScreen.FieldEffects.OwnMegaEvolved = True
Else
BattleScreen.SendClientCommand("MOVE|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
End If
Else
If BattleScreen.IsMegaEvolvingOwn Then
BattleScreen.FieldEffects.OwnMegaEvolved = True
End If
BattleScreen.OwnStatistics.Moves += 1
BattleScreen.BattleQuery.Clear()
BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())

BIN
lib/build/Pokemon3D.exe
View File

Binary file not shown.