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

After faint switch, revision 2: Fixed case when both pokemon faint.

Browse Source
This commit is contained in:
CaptainSegis 2016-11-02 20:56:04 -05:00
parent dc26fdd75d
commit 5459ed2ac6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,13 +463,12 @@
Public Sub InitializeRound(ByVal BattleScreen As BattleScreen, ByVal OwnStep As RoundConst) Public Sub InitializeRound(ByVal BattleScreen As BattleScreen, ByVal OwnStep As RoundConst)
If BattleScreen.OwnFaint OrElse BattleScreen.OppFaint Then
BattleScreen.IsAfterFaint = True
End If
If BattleHasEnded(BattleScreen) Then If BattleHasEnded(BattleScreen) Then
Exit Sub Exit Sub
End If End If
If BattleScreen.OwnFaint OrElse BattleScreen.OppFaint Then
BattleScreen.IsAfterFaint = True
End If
Dim OppStep = GetOppStep(BattleScreen, OwnStep) Dim OppStep = GetOppStep(BattleScreen, OwnStep)
Me.OwnStep = OwnStep Me.OwnStep = OwnStep
Me.OppStep = OppStep Me.OppStep = OppStep

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

@ -924,6 +924,7 @@
Else Else
If TempBattleScreen.OwnPokemonIndex <> PokeIndex Then If TempBattleScreen.OwnPokemonIndex <> PokeIndex Then
If TempBattleScreen.IsRemoteBattle = True And TempBattleScreen.IsHost = False Then If TempBattleScreen.IsRemoteBattle = True And TempBattleScreen.IsHost = False Then
BattleScreen.OppFaint = False
TempBattleScreen.OwnStatistics.Switches += 1 TempBattleScreen.OwnStatistics.Switches += 1
TempBattleScreen.BattleQuery.Clear() TempBattleScreen.BattleQuery.Clear()
TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle()) TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())