tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-09-14 13:38:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Cute Charm affecting same gender or genderless

Browse Source
This commit is contained in:
JappaWakka 2025-08-20 16:34:35 +02:00
parent 53b0069ab1
commit cacec77a67
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2593,7 +2593,9 @@
Case "cute charm" Case "cute charm"
If moveUsed.MakesContact = True AndAlso p.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) = False Then If moveUsed.MakesContact = True AndAlso p.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) = False Then
If Core.Random.Next(0, 100) < 30 Then If Core.Random.Next(0, 100) < 30 Then
InflictInfatuate(own, Not own, BattleScreen, op.GetDisplayName() & "'s Cute Charm affects " & p.GetDisplayName() & "!", "cutecharm") If p.Gender <> Pokemon.Genders.Genderless AndAlso op.Gender <> Pokemon.Genders.Genderless AndAlso op.Gender <> p.Gender Then
InflictInfatuate(own, Not own, BattleScreen, op.GetDisplayName() & "'s Cute Charm affects " & p.GetDisplayName() & "!", "cutecharm")
End If
End If End If
End If End If
Case "aftermath" Case "aftermath"