Tiny fix about mega evolution

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

View File

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

Binary file not shown.