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

Fix Infatuation....

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
P3D/Pokemon/Attacks/Attack.vb
View File

@ -2261,7 +2261,7 @@
End Sub End Sub
''' <summary> ''' <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> ''' </summary>
''' <param name="Own">If the own Pokémon is in love.</param> ''' <param name="Own">If the own Pokémon is in love.</param>
''' <param name="BattleScreen">Reference to the BattleScreen.</param> ''' <param name="BattleScreen">Reference to the BattleScreen.</param>