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

Fixed infatuation volatile status lingering after the opp has switched out.

This commit is contained in:
CaptainSegis 2017-01-24 00:34:40 -05:00
parent 85dada91e1
commit d557a98b48
1 changed files with 7 additions and 0 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

@ -6048,6 +6048,10 @@
.OppMagmaStorm = 0 .OppMagmaStorm = 0
.OppSandTomb = 0 .OppSandTomb = 0
.OppInfestation = 0 .OppInfestation = 0
If BattleScreen.OppPokemon.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) Then
BattleScreen.OppPokemon.RemoveVolatileStatus(Pokemon.VolatileStatus.Infatuation)
End If
End With End With
.OwnPokemon.Ability.SwitchOut(.OwnPokemon) .OwnPokemon.Ability.SwitchOut(.OwnPokemon)
@ -6380,6 +6384,9 @@
.OwnSandTomb = 0 .OwnSandTomb = 0
.OwnInfestation = 0 .OwnInfestation = 0
If BattleScreen.OwnPokemon.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) Then
BattleScreen.OwnPokemon.RemoveVolatileStatus(Pokemon.VolatileStatus.Infatuation)
End If
End With End With
End With End With