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

Fix Pokemon not learn move at evolution

Browse Source
This commit is contained in:
JappaWakka 2024-02-21 17:33:36 +01:00
parent b36a1f2bd3
commit 48af8b91d7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
P3D/Screens/Pokemon/EvolutionScreen.vb
View File

@ -136,6 +136,7 @@
Dim evolved As Boolean = False Dim evolved As Boolean = False
Dim brokeEvolution As Boolean = False Dim brokeEvolution As Boolean = False
Dim AttackLearnList As New List(Of BattleSystem.Attack) Dim AttackLearnList As New List(Of BattleSystem.Attack)
Dim HasStartedAttackLearning As Boolean = False
Dim EvolutionArg As String = "" Dim EvolutionArg As String = ""
Dim EvolutionTrigger As EvolutionCondition.EvolutionTrigger Dim EvolutionTrigger As EvolutionCondition.EvolutionTrigger
@ -149,7 +150,7 @@
Me.PreScreen = currentScreen Me.PreScreen = currentScreen
Me.FromBattle = FromBattle Me.FromBattle = FromBattle
Me.HasStartedAttackLearning = False
For Each i As Integer In EvolvePokemonIndices For Each i As Integer In EvolvePokemonIndices
PokeList.Add(i) PokeList.Add(i)
Next Next
@ -302,11 +303,16 @@
End If End If
Else Else
If TextBox.Showing = False Then If TextBox.Showing = False Then
If AttackLearnList.Count > 0 Then If HasStartedAttackLearning = False Then
Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen, evolvedPokemon, AttackLearnList)) If AttackLearnList.Count > 0 Then
AttackLearnList.Clear() Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen, evolvedPokemon, AttackLearnList))
HasStartedAttackLearning = True
End If
Else
If Core.CurrentScreen.Identification = Identifications.EvolutionScreen Then
Endscene()
End If
End If End If
Endscene()
End If End If
End If End If
End If End If
@ -322,7 +328,7 @@
Core.Player.Pokemons(PokeList(0)) = evolvedPokemon Core.Player.Pokemons(PokeList(0)) = evolvedPokemon
End If End If
AttackLearnList.Clear()
PokeList.RemoveAt(0) PokeList.RemoveAt(0)
If PokeList.Count = 0 Then If PokeList.Count = 0 Then
If FromBattle = False Then If FromBattle = False Then