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

Check if opponent is frozen before defrosting

Browse Source
This commit is contained in:
JappaWakka 2023-04-08 20:12:42 +02:00
parent ccad3e1f21
commit 1bdd6e1c55
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2306,11 +2306,13 @@
If canUseEffect AndAlso multiUseEffect OrElse (multiUseEffect = False AndAlso i = TimesToAttack) Then If canUseEffect AndAlso multiUseEffect OrElse (multiUseEffect = False AndAlso i = TimesToAttack) Then
If substitute = 0 OrElse moveUsed.IsAffectedBySubstitute = False Then If substitute = 0 OrElse moveUsed.IsAffectedBySubstitute = False Then
moveUsed.MoveHits(own, BattleScreen) moveUsed.MoveHits(own, BattleScreen)
If op.Status = Pokemon.StatusProblems.Freeze Then
If moveUsed.RemovesOppFrozen = True Then If moveUsed.RemovesOppFrozen = True Then
CureStatusProblem(Not own, own, BattleScreen, op.GetDisplayName() & " got defrosted by " & moveUsed.Name & ".", "defrostmove") CureStatusProblem(Not own, own, BattleScreen, op.GetDisplayName() & " got defrosted by " & moveUsed.Name & ".", "defrostmove")
End If End If
End If End If
End If End If
End If
If op.HP > 0 AndAlso op.Status <> Pokemon.StatusProblems.Fainted Then If op.HP > 0 AndAlso op.Status <> Pokemon.StatusProblems.Fainted Then
If Not p.Item Is Nothing Then If Not p.Item Is Nothing Then
If p.Item.OriginalName.ToLower() = "king's rock" Or p.Item.OriginalName.ToLower() = "razor fang" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then If p.Item.OriginalName.ToLower() = "king's rock" Or p.Item.OriginalName.ToLower() = "razor fang" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then