Fix Infatuation....

Moves that were supposed to fail because of infatuation didn't get the fail function triggered
This commit is contained in:
JappaWakka 2025-02-11 10:58:04 +01:00
parent b1c09a3ebb
commit 96984213b1
2 changed files with 2 additions and 3 deletions

View File

@ -1635,8 +1635,6 @@
End If
End If
moveUsed.PreAttack(own, BattleScreen)
If p.HasVolatileStatus(Pokemon.VolatileStatus.Flinch) = True Then
p.RemoveVolatileStatus(Pokemon.VolatileStatus.Flinch)
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " flinched and couldn't move!"))
@ -1692,6 +1690,7 @@
BattleScreen.BattleQuery.Add(HeartAnimation)
End If
BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " is in love with " & op.GetDisplayName() & "!"))
moveUsed.IsAttracted(own, BattleScreen)
Exit Sub
End If
End If

View File

@ -2261,7 +2261,7 @@
End Sub
''' <summary>
''' Event that occurs when the pokemon has falls in love with the opponent.
''' Event that occurs when the pokemon has fallen in love with the opponent.
''' </summary>
''' <param name="Own">If the own Pokémon is in love.</param>
''' <param name="BattleScreen">Reference to the BattleScreen.</param>