tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added <battle.caught> command

This commit is contained in:
Vitaly Mikhailov 2019-10-31 23:48:31 +03:00
parent 3db096afed
commit ef0cecfe2e
No known key found for this signature in database
GPG Key ID: 46EFF05D37A3FA18
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -4,6 +4,7 @@
Public Shared Won As Boolean = False Public Shared Won As Boolean = False
Public Shared Fled As Boolean = False Public Shared Fled As Boolean = False
Public Shared Caught As Boolean = False
Public IsAfterFaint As Boolean = False Public IsAfterFaint As Boolean = False

2
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -122,6 +122,8 @@
Me.IsTrainerBattle = False Me.IsTrainerBattle = False
Me.MouseVisible = False Me.MouseVisible = False
Me.PVPGameJoltID = "" Me.PVPGameJoltID = ""
'Reset variable when new battle starts
BattleSystem.Battle.Caught = False
End Sub End Sub
Public Sub New(ByVal Trainer As Trainer, ByVal OverworldScreen As Screen, ByVal defaultMapType As Integer) Public Sub New(ByVal Trainer As Trainer, ByVal OverworldScreen As Screen, ByVal defaultMapType As Integer)

1
P3D/Screens/Battle/BattleCatchScreen.vb
View File

@ -161,6 +161,7 @@
AnimationStarted = False AnimationStarted = False
SetupAnimation() SetupAnimation()
CatchPokemon() CatchPokemon()
BattleSystem.Battle.Caught = True
Case 8 Case 8
AnimationIndex = 9 AnimationIndex = 9
If showPokedexEntry = True Then If showPokedexEntry = True Then

2
P3D/World/ActionScript/V2/ScriptConstructs/DoBattle.vb
View File

@ -25,6 +25,8 @@
Return t.OutroMessage Return t.OutroMessage
Case "won" Case "won"
Return ReturnBoolean(BattleSystem.Battle.Won) Return ReturnBoolean(BattleSystem.Battle.Won)
Case "caught"
Return ReturnBoolean(BattleSystem.Battle.Caught)
End Select End Select
Return DEFAULTNULL Return DEFAULTNULL