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

Partially fixed switch moves

This commit is contained in:
JappaWakka 2023-08-22 20:55:32 +02:00
parent 4a4a2133ee
commit 18e020bfdf
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
P3D/Pokemon/Attacks/Bug/U-Turn.vb
View File

@ -69,9 +69,7 @@
If BattleScreen.IsTrainerBattle = True Then
If BattleScreen.IsRemoteBattle = True Or BattleScreen.IsPVPBattle = True Then
If BattleScreen.OppPokemon.Status <> Pokemon.StatusProblems.Fainted Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
If BattleScreen.Trainer.CountUseablePokemon > 1 AndAlso BattleScreen.FieldEffects.OppSwapIndex <> BattleScreen.OppPokemonIndex AndAlso BattleScreen.FieldEffects.OppSwapIndex <> -1 Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
BattleScreen.Battle.SwitchOutOpp(BattleScreen, BattleScreen.FieldEffects.OppSwapIndex)
BattleScreen.FieldEffects.OppSwapIndex = -1
@ -83,7 +81,6 @@
End If
Else
If BattleScreen.Trainer.CountUseablePokemon > 1 Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
BattleScreen.Battle.SwitchOutOpp(BattleScreen, GetPokemonIndex(BattleScreen, own))
Else

3
P3D/Pokemon/Attacks/Dark/PartingShot.vb
View File

@ -77,9 +77,7 @@
If BattleScreen.IsTrainerBattle = True Then
If BattleScreen.IsRemoteBattle = True Or BattleScreen.IsPVPBattle = True Then
If BattleScreen.OppPokemon.Status <> Pokemon.StatusProblems.Fainted Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
If BattleScreen.Trainer.CountUseablePokemon > 1 AndAlso BattleScreen.FieldEffects.OppSwapIndex <> BattleScreen.OppPokemonIndex AndAlso BattleScreen.FieldEffects.OppSwapIndex <> -1 Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
BattleScreen.Battle.SwitchOutOpp(BattleScreen, BattleScreen.FieldEffects.OppSwapIndex)
BattleScreen.FieldEffects.OppSwapIndex = -1
@ -91,7 +89,6 @@
End If
Else
If BattleScreen.Trainer.CountUseablePokemon > 1 Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
BattleScreen.Battle.SwitchOutOpp(BattleScreen, GetPokemonIndex(BattleScreen, own))
Else

4
P3D/Pokemon/Attacks/Electric/VoltSwitch.vb
View File

@ -69,9 +69,8 @@ Namespace BattleSystem.Moves.Electric
If BattleScreen.IsTrainerBattle = True Then
If BattleScreen.IsRemoteBattle = True Or BattleScreen.IsPVPBattle = True Then
If BattleScreen.OppPokemon.Status <> Pokemon.StatusProblems.Fainted Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
If BattleScreen.Trainer.CountUseablePokemon > 1 AndAlso BattleScreen.FieldEffects.OppSwapIndex <> BattleScreen.OppPokemonIndex AndAlso BattleScreen.FieldEffects.OppSwapIndex <> -1 Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
BattleScreen.Battle.SwitchOutOpp(BattleScreen, BattleScreen.FieldEffects.OppSwapIndex)
BattleScreen.FieldEffects.OppSwapIndex = -1
@ -83,7 +82,6 @@ Namespace BattleSystem.Moves.Electric
End If
Else
If BattleScreen.Trainer.CountUseablePokemon > 1 Then
BattleScreen.FieldEffects.OppUsedBatonPass = True
BattleScreen.Battle.SwitchOutOpp(BattleScreen, GetPokemonIndex(BattleScreen, own))
Else