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 Evolutionscreen softlock

Browse Source
This commit is contained in:
JappaWakka 2024-02-24 09:26:24 +01:00
parent 542d1084e0
commit 20b2ac35ea
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +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 CanEnd As Boolean = False
Dim EvolutionArg As String = "" Dim EvolutionArg As String = ""
Dim EvolutionTrigger As EvolutionCondition.EvolutionTrigger Dim EvolutionTrigger As EvolutionCondition.EvolutionTrigger
@ -148,9 +148,12 @@
Me.Identification = Identifications.EvolutionScreen Me.Identification = Identifications.EvolutionScreen
PlayerStatistics.Track("Evolutions", 1) PlayerStatistics.Track("Evolutions", 1)
If Me.AttackLearnList.Count > 0 Then
AttackLearnList.Clear()
End If
Me.PreScreen = currentScreen Me.PreScreen = currentScreen
Me.FromBattle = FromBattle Me.FromBattle = FromBattle
Me.HasStartedAttackLearning = False Me.CanEnd = False
For Each i As Integer In EvolvePokemonIndices For Each i As Integer In EvolvePokemonIndices
PokeList.Add(i) PokeList.Add(i)
Next Next
@ -272,9 +275,12 @@
t &= "*" & evolvedPokemon.GetDisplayName() & " learned~" & aList(a).Name & "!" t &= "*" & evolvedPokemon.GetDisplayName() & " learned~" & aList(a).Name & "!"
PlayerStatistics.Track("Moves learned", 1) PlayerStatistics.Track("Moves learned", 1)
CanEnd = True
End If End If
End If End If
Next Next
Else
CanEnd = True
End If End If
If Me.EvolutionTrigger = EvolutionCondition.EvolutionTrigger.Trading Then If Me.EvolutionTrigger = EvolutionCondition.EvolutionTrigger.Trading Then
@ -303,10 +309,10 @@
End If End If
Else Else
If TextBox.Showing = False Then If TextBox.Showing = False Then
If HasStartedAttackLearning = False Then If CanEnd = False Then
If AttackLearnList.Count > 0 Then If AttackLearnList.Count > 0 Then
Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen, evolvedPokemon, AttackLearnList)) Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen, evolvedPokemon, AttackLearnList))
HasStartedAttackLearning = True CanEnd = True
End If End If
Else Else
If Core.CurrentScreen.Identification = Identifications.EvolutionScreen Then If Core.CurrentScreen.Identification = Identifications.EvolutionScreen Then
@ -328,7 +334,6 @@
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