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

Continue battle if select no switchqueryobject

Browse Source 
don't interrupt or clear battlequery
This commit is contained in:
JappaWakka 2025-04-24 19:35:25 +02:00
parent 9a571e480f
commit 8e55a7867b
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,15 +95,15 @@
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
Else Else
SoundManager.PlaySound("select") SoundManager.PlaySound("select")
TempScreen.BattleQuery.Clear() 'TempScreen.BattleQuery.Clear()
FinishOppSwitchAnimation(TempScreen) 'FinishOppSwitchAnimation(TempScreen)
FinishOppSwitchEffects(TempScreen) 'FinishOppSwitchEffects(TempScreen)
Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16) 'Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
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.HasSwitchedOwn = False
TempScreen.Battle.StartRound(TempScreen) 'TempScreen.Battle.StartRound(TempScreen)
_ready = True _ready = True
End If End If
End If End If
@ -116,15 +116,15 @@
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
Else Else
SoundManager.PlaySound("select") SoundManager.PlaySound("select")
TempScreen.BattleQuery.Clear() 'TempScreen.BattleQuery.Clear()
FinishOppSwitchAnimation(TempScreen) 'FinishOppSwitchAnimation(TempScreen)
FinishOppSwitchEffects(TempScreen) 'FinishOppSwitchEffects(TempScreen)
Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16) 'Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
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.HasSwitchedOwn = False
TempScreen.Battle.StartRound(TempScreen) 'TempScreen.Battle.StartRound(TempScreen)
_ready = True _ready = True
End If End If
End If End If
@ -139,30 +139,30 @@
If New Rectangle(Core.windowSize.Width - 213, Core.windowSize.Height - 378, 80, 50).Contains(MouseHandler.MousePosition) Then If New Rectangle(Core.windowSize.Width - 213, Core.windowSize.Height - 378, 80, 50).Contains(MouseHandler.MousePosition) Then
_chooseIndex = 1 _chooseIndex = 1
SoundManager.PlaySound("select") SoundManager.PlaySound("select")
TempScreen.BattleQuery.Clear() 'TempScreen.BattleQuery.Clear()
FinishOppSwitchAnimation(TempScreen) 'FinishOppSwitchAnimation(TempScreen)
FinishOppSwitchEffects(TempScreen) 'FinishOppSwitchEffects(TempScreen)
Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16) 'Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
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.HasSwitchedOwn = False
TempScreen.Battle.StartRound(TempScreen) 'TempScreen.Battle.StartRound(TempScreen)
_ready = True _ready = True
End If End If
End If End If
End If End If
If Controls.Dismiss(True, True, True) = True Then If Controls.Dismiss(True, True, True) = True Then
SoundManager.PlaySound("select") SoundManager.PlaySound("select")
TempScreen.BattleQuery.Clear() 'TempScreen.BattleQuery.Clear()
FinishOppSwitchAnimation(TempScreen) 'FinishOppSwitchAnimation(TempScreen)
FinishOppSwitchEffects(TempScreen) 'FinishOppSwitchEffects(TempScreen)
Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16) 'Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
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.HasSwitchedOwn = False
TempScreen.Battle.StartRound(TempScreen) 'TempScreen.Battle.StartRound(TempScreen)
_ready = True _ready = True
End If End If
End Sub End Sub