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

Roaming Pokemon doesn't delete away after user fled.

Browse Source
This commit is contained in:
jianmingyong 2016-09-30 03:13:12 +08:00
parent a455a5ca16
commit e5bd91e4b4
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
View File

@ -3,6 +3,7 @@
Public Class Battle Public Class Battle
Public Shared Won As Boolean = False Public Shared Won As Boolean = False
Public Shared Fled As Boolean = False
#Region "StartRound" #Region "StartRound"

1
2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
View File

@ -661,6 +661,7 @@
BattleScreen.BattleQuery.Add(New TextQueryObject("Got away safely!")) BattleScreen.BattleQuery.Add(New TextQueryObject("Got away safely!"))
BattleScreen.BattleQuery.Add(New EndBattleQueryObject(False)) BattleScreen.BattleQuery.Add(New EndBattleQueryObject(False))
Battle.Won = True Battle.Won = True
Battle.Fled = True
Else Else
BattleScreen.BattleQuery.Clear() BattleScreen.BattleQuery.Clear()
BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle()) BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())

5
2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -954,7 +954,7 @@ nextIndex:
'Shift the Roaming Pokemon. 'Shift the Roaming Pokemon.
If RoamingBattle = True Then If RoamingBattle = True Then
If FieldEffects.RoamingFled = False Then If FieldEffects.RoamingFled = False AndAlso Battle.Fled = False Then
Core.Player.RoamingPokemonData = RoamingPokemon.RemoveRoamingPokemon(RoamingPokemonStorage) Core.Player.RoamingPokemonData = RoamingPokemon.RemoveRoamingPokemon(RoamingPokemonStorage)
Else Else
Core.Player.RoamingPokemonData = RoamingPokemon.ReplaceRoamingPokemon(RoamingPokemonStorage) Core.Player.RoamingPokemonData = RoamingPokemon.ReplaceRoamingPokemon(RoamingPokemonStorage)
@ -962,6 +962,9 @@ nextIndex:
RoamingPokemon.ShiftRoamingPokemon(RoamingPokemonStorage.WorldID) RoamingPokemon.ShiftRoamingPokemon(RoamingPokemonStorage.WorldID)
End If End If
'Reverse this variable temp >
Battle.Fled = False
'Add the Pokefile to the visited pokefiles list. 'Add the Pokefile to the visited pokefiles list.
If IsTrainerBattle = False Then If IsTrainerBattle = False Then
If TempPokeFile <> "" Then If TempPokeFile <> "" Then