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

Fix stealth rock

Browse Source
This commit is contained in:
JappaWakka 2023-07-21 20:11:17 +02:00
parent 71bd0eaaef
commit 0e9623c557
1 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7905,6 +7905,7 @@
End Sub End Sub
Public Sub SwitchInOpp(ByVal BattleScreen As BattleScreen, ByVal FirstTime As Boolean, ByVal index As Integer) Public Sub SwitchInOpp(ByVal BattleScreen As BattleScreen, ByVal FirstTime As Boolean, ByVal index As Integer)
Dim AddSwitch As Boolean = False
If FirstTime = False Then If FirstTime = False Then
ChangeCameraAngle(1, False, BattleScreen) ChangeCameraAngle(1, False, BattleScreen)
HasSwitchedInOpp = True HasSwitchedInOpp = True
@ -7959,8 +7960,10 @@
Dim oppModel As String = BattleScreen.GetModelName(False) Dim oppModel As String = BattleScreen.GetModelName(False)
'Switch BattleStyle 'Switch BattleStyle
If BattleScreen.FieldEffects.OwnDigCounter = 0 AndAlso BattleScreen.FieldEffects.OwnFlyCounter = 0 AndAlso BattleScreen.FieldEffects.OwnDiveCounter = 0 Then If BattleScreen.FieldEffects.OwnDigCounter = 0 AndAlso BattleScreen.FieldEffects.OwnFlyCounter = 0 AndAlso BattleScreen.FieldEffects.OwnDiveCounter = 0 Then
If Core.Player.BattleStyle <> 1 AndAlso OppStep.StepType <> RoundConst.StepTypes.Switch AndAlso BattleScreen.IsPVPBattle = False Then If Core.Player.BattleStyle <> 1 AndAlso OppStep.StepType <> RoundConst.StepTypes.Switch AndAlso BattleScreen.IsPVPBattle = False Then
AddSwitch = True
BattleScreen.BattleQuery.Add(New SwitchPokemonQueryObject(BattleScreen, BattleScreen.OppPokemon)) BattleScreen.BattleQuery.Add(New SwitchPokemonQueryObject(BattleScreen, BattleScreen.OppPokemon))
BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen) BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen)
End If End If
@ -8015,12 +8018,8 @@
BattleScreen.BattleQuery.Add(BallThrow) BattleScreen.BattleQuery.Add(BallThrow)
End If End If
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)
cq2.PassThis = True
BattleScreen.BattleQuery.AddRange({cq1, cq2})
End If End If
If AddSwitch = False Then
With BattleScreen With BattleScreen
Dim p As Pokemon = .OppPokemon Dim p As Pokemon = .OppPokemon
Dim op As Pokemon = .OwnPokemon Dim op As Pokemon = .OwnPokemon
@ -8110,6 +8109,7 @@
StartRound(BattleScreen) StartRound(BattleScreen)
End If End If
End With End With
End If
End Sub End Sub
#End Region #End Region