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

Fix opponent switching shenanigans

Browse Source
This commit is contained in:
JappaWakka 2023-02-23 12:58:43 +01:00
parent 5a6711f126
commit 36a5ebf936
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5381,7 +5381,7 @@
BattleScreen.BattleQuery.AddRange({cq1, cq2}) BattleScreen.BattleQuery.AddRange({cq1, cq2})
If BattleScreen.OppFaint = False AndAlso OppStep.StepType <> RoundConst.StepTypes.Switch Then If BattleScreen.OppFaint = False Then
StartRound(BattleScreen) StartRound(BattleScreen)
End If End If
BattleScreen.ClearMainMenuTime = True BattleScreen.ClearMainMenuTime = True
@ -8024,8 +8024,10 @@
Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16) Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
cq2.PassThis = True cq2.PassThis = True
BattleScreen.BattleQuery.AddRange({cq1, cq2}) BattleScreen.BattleQuery.AddRange({cq1, cq2})
BattleScreen.HasSwitchedOwn = False If Core.Player.BattleStyle = 1 Then
BattleScreen.Battle.StartRound(BattleScreen) BattleScreen.HasSwitchedOwn = False
StartRound(BattleScreen)
End If
End With End With
End Sub End Sub

2
P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb
View File

@ -127,6 +127,7 @@
Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16) Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
cq2.PassThis = True cq2.PassThis = True
TempScreen.BattleQuery.AddRange({cq1, cq2}) TempScreen.BattleQuery.AddRange({cq1, cq2})
TempScreen.HasSwitchedOwn = False
TempScreen.Battle.StartRound(TempScreen) TempScreen.Battle.StartRound(TempScreen)
_ready = True _ready = True
End If End If
@ -140,6 +141,7 @@
Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16) Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
cq2.PassThis = True cq2.PassThis = True
TempScreen.BattleQuery.AddRange({cq1, cq2}) TempScreen.BattleQuery.AddRange({cq1, cq2})
TempScreen.HasSwitchedOwn = False
TempScreen.Battle.StartRound(TempScreen) TempScreen.Battle.StartRound(TempScreen)
_ready = True _ready = True
End If End If