Fix scald not defrosting opponent...

Also added defrosting the opponent as a gamemode attack function
2025-04-08 18:35:09 +02:00 · 2023-04-01 08:58:01 +02:00 · 2023-04-01 08:58:01 +02:00 · aa105b38a2
commit aa105b38a2
parent f90152c506
620 changed files with 585 additions and 579 deletions
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@ -1242,7 +1242,7 @@
            BattleScreen.BattleQuery.Add(New DelayQueryObject(20))

            If p.Status = Pokemon.StatusProblems.Freeze Then
-                If moveUsed.RemovesFrozen = True Then
+                If moveUsed.RemovesOwnFrozen = True Then
                    CureStatusProblem(own, own, BattleScreen, p.GetDisplayName() & " got defrosted by " & moveUsed.Name & ".", "defrostmove")
                End If
            End If
@ -2306,6 +2306,9 @@
                                If canUseEffect AndAlso multiUseEffect OrElse (multiUseEffect = False AndAlso i = TimesToAttack) Then
                                    If substitute = 0 OrElse moveUsed.IsAffectedBySubstitute = False Then
                                        moveUsed.MoveHits(own, BattleScreen)
+                                        If moveUsed.RemovesOppFrozen = True Then
+                                            CureStatusProblem(Not own, own, BattleScreen, op.GetDisplayName() & " got defrosted by " & moveUsed.Name & ".", "defrostmove")
+                                        End If
                                    End If
                                End If
                                If op.HP > 0 AndAlso op.Status <> Pokemon.StatusProblems.Fainted Then
--- a/P3D/Pokemon/Attacks/Attack.vb
+++ b/P3D/Pokemon/Attacks/Attack.vb
@ -197,7 +197,8 @@
        Public IsOneHitKOMove As Boolean = False
        Public IsRecoilMove As Boolean = False
        Public IsTrappingMove As Boolean = False
-        Public RemovesFrozen As Boolean = False
+        Public RemovesOwnFrozen As Boolean = False
+        Public RemovesOppFrozen As Boolean = False

        'effected by various moves items and abilities
        Public ProtectAffected As Boolean = True
--- a/P3D/Pokemon/Attacks/Bug/AttackOrder.vb
+++ b/P3D/Pokemon/Attacks/Bug/AttackOrder.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/BugBite.vb
+++ b/P3D/Pokemon/Attacks/Bug/BugBite.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Bug/BugBuzz.vb
+++ b/P3D/Pokemon/Attacks/Bug/BugBuzz.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = True

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Bug/DefendOrder.vb
+++ b/P3D/Pokemon/Attacks/Bug/DefendOrder.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/FellStinger.vb
+++ b/P3D/Pokemon/Attacks/Bug/FellStinger.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/FirstImpression.vb
+++ b/P3D/Pokemon/Attacks/Bug/FirstImpression.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/FuryCutter.vb
+++ b/P3D/Pokemon/Attacks/Bug/FuryCutter.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/HealOrder.vb
+++ b/P3D/Pokemon/Attacks/Bug/HealOrder.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = True
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/Infestation.vb
+++ b/P3D/Pokemon/Attacks/Bug/Infestation.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Bug
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/LeechLife.vb
+++ b/P3D/Pokemon/Attacks/Bug/LeechLife.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = True
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/Lunge.vb
+++ b/P3D/Pokemon/Attacks/Bug/Lunge.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Bug
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/Megahorn.vb
+++ b/P3D/Pokemon/Attacks/Bug/Megahorn.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/PinMissile.vb
+++ b/P3D/Pokemon/Attacks/Bug/PinMissile.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/PollenPuff.vb
+++ b/P3D/Pokemon/Attacks/Bug/PollenPuff.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Bug/QuiverDance.vb
+++ b/P3D/Pokemon/Attacks/Bug/QuiverDance.vb
--- a/P3D/Pokemon/Attacks/Bug/SignalBeam.vb
+++ b/P3D/Pokemon/Attacks/Bug/SignalBeam.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/Silverwind.vb
+++ b/P3D/Pokemon/Attacks/Bug/Silverwind.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/SpiderWeb.vb
+++ b/P3D/Pokemon/Attacks/Bug/SpiderWeb.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/Steamroller.vb
+++ b/P3D/Pokemon/Attacks/Bug/Steamroller.vb
--- a/P3D/Pokemon/Attacks/Bug/StickyWeb.vb
+++ b/P3D/Pokemon/Attacks/Bug/StickyWeb.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Bug
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/StringShot.vb
+++ b/P3D/Pokemon/Attacks/Bug/StringShot.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/StruggleBug.vb
+++ b/P3D/Pokemon/Attacks/Bug/StruggleBug.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Bug/Tailglow.vb
+++ b/P3D/Pokemon/Attacks/Bug/Tailglow.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/Twineedle.vb
+++ b/P3D/Pokemon/Attacks/Bug/Twineedle.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Bug/U-Turn.vb
+++ b/P3D/Pokemon/Attacks/Bug/U-Turn.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Bug/Xscissor.vb
+++ b/P3D/Pokemon/Attacks/Bug/Xscissor.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Assurance.vb
+++ b/P3D/Pokemon/Attacks/Dark/Assurance.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/BeatUp.vb
+++ b/P3D/Pokemon/Attacks/Dark/BeatUp.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/Bite.vb
+++ b/P3D/Pokemon/Attacks/Dark/Bite.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/BrutalSwing.vb
+++ b/P3D/Pokemon/Attacks/Dark/BrutalSwing.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Crunch.vb
+++ b/P3D/Pokemon/Attacks/Dark/Crunch.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/DarkPulse.vb
+++ b/P3D/Pokemon/Attacks/Dark/DarkPulse.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = True

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/DarkVoid.vb
+++ b/P3D/Pokemon/Attacks/Dark/DarkVoid.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/DarkestLariat.vb
+++ b/P3D/Pokemon/Attacks/Dark/DarkestLariat.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Embargo.vb
+++ b/P3D/Pokemon/Attacks/Dark/Embargo.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/FakeTears.vb
+++ b/P3D/Pokemon/Attacks/Dark/FakeTears.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dark
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/FeintAttack.vb
+++ b/P3D/Pokemon/Attacks/Dark/FeintAttack.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/Flatter.vb
+++ b/P3D/Pokemon/Attacks/Dark/Flatter.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Fling.vb
+++ b/P3D/Pokemon/Attacks/Dark/Fling.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/FoulPlay.vb
+++ b/P3D/Pokemon/Attacks/Dark/FoulPlay.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dark
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/HoneClaws.vb
+++ b/P3D/Pokemon/Attacks/Dark/HoneClaws.vb
--- a/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb
+++ b/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = True

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/KnockOff.vb
+++ b/P3D/Pokemon/Attacks/Dark/KnockOff.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/Memento.vb
+++ b/P3D/Pokemon/Attacks/Dark/Memento.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/NastyPlot.vb
+++ b/P3D/Pokemon/Attacks/Dark/NastyPlot.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/NightDaze.vb
+++ b/P3D/Pokemon/Attacks/Dark/NightDaze.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Nightslash.vb
+++ b/P3D/Pokemon/Attacks/Dark/Nightslash.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/PartingShot.vb
+++ b/P3D/Pokemon/Attacks/Dark/PartingShot.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/Payback.vb
+++ b/P3D/Pokemon/Attacks/Dark/Payback.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/PowerTrip.vb
+++ b/P3D/Pokemon/Attacks/Dark/PowerTrip.vb
--- a/P3D/Pokemon/Attacks/Dark/Punishment.vb
+++ b/P3D/Pokemon/Attacks/Dark/Punishment.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dark
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Pursuit.vb
+++ b/P3D/Pokemon/Attacks/Dark/Pursuit.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Snarl.vb
+++ b/P3D/Pokemon/Attacks/Dark/Snarl.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Snatch.vb
+++ b/P3D/Pokemon/Attacks/Dark/Snatch.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/SuckerPunch.vb
+++ b/P3D/Pokemon/Attacks/Dark/SuckerPunch.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Switcheroo.vb
+++ b/P3D/Pokemon/Attacks/Dark/Switcheroo.vb
@ -36,7 +36,7 @@ Namespace BattleSystem.Moves.Dark
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Dark/Taunt.vb
+++ b/P3D/Pokemon/Attacks/Dark/Taunt.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Thief.vb
+++ b/P3D/Pokemon/Attacks/Dark/Thief.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dark/Torment.vb
+++ b/P3D/Pokemon/Attacks/Dark/Torment.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/ClangingScales.vb
+++ b/P3D/Pokemon/Attacks/Dragon/ClangingScales.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dragon
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonBreath.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonBreath.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonClaw.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonClaw.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonDance.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonDance.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonHammer.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonHammer.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonPulse.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonPulse.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonRage.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonRage.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonRush.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonRush.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DragonTail.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DragonTail.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/DualChop.vb
+++ b/P3D/Pokemon/Attacks/Dragon/DualChop.vb
--- a/P3D/Pokemon/Attacks/Dragon/Outrage.vb
+++ b/P3D/Pokemon/Attacks/Dragon/Outrage.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/RoarOfTime.vb
+++ b/P3D/Pokemon/Attacks/Dragon/RoarOfTime.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/SpacialRend.vb
+++ b/P3D/Pokemon/Attacks/Dragon/SpacialRend.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Dragon/Twister.vb
+++ b/P3D/Pokemon/Attacks/Dragon/Twister.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/BoltStrike.vb
+++ b/P3D/Pokemon/Attacks/Electric/BoltStrike.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/Charge.vb
+++ b/P3D/Pokemon/Attacks/Electric/Charge.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/Chargebeam.vb
+++ b/P3D/Pokemon/Attacks/Electric/Chargebeam.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/Discharge.vb
+++ b/P3D/Pokemon/Attacks/Electric/Discharge.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/EerieImpulse.vb
+++ b/P3D/Pokemon/Attacks/Electric/EerieImpulse.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ElectricTerrain.vb
+++ b/P3D/Pokemon/Attacks/Electric/ElectricTerrain.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ElectroBall.vb
+++ b/P3D/Pokemon/Attacks/Electric/ElectroBall.vb
--- a/P3D/Pokemon/Attacks/Electric/Electroweb.vb
+++ b/P3D/Pokemon/Attacks/Electric/Electroweb.vb
--- a/P3D/Pokemon/Attacks/Electric/Flash.vb
+++ b/P3D/Pokemon/Attacks/Electric/Flash.vb
@ -35,7 +35,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.IsHealingMove = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.IsRecoilMove = False

            Me.ImmunityAffected = True
--- a/P3D/Pokemon/Attacks/Electric/FusionBolt.vb
+++ b/P3D/Pokemon/Attacks/Electric/FusionBolt.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = True
+            Me.RemovesOwnFrozen = True

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/MagnetRise.vb
+++ b/P3D/Pokemon/Attacks/Electric/MagnetRise.vb
@ -36,7 +36,7 @@
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = False
            Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Electric/Nuzzle.vb
+++ b/P3D/Pokemon/Attacks/Electric/Nuzzle.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
            Me.UseEffectiveness = False
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb
+++ b/P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = True
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ShockWave.vb
+++ b/P3D/Pokemon/Attacks/Electric/ShockWave.vb
@ -36,7 +36,7 @@ Namespace BattleSystem.Moves.Electric
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Electric/Spark.vb
+++ b/P3D/Pokemon/Attacks/Electric/Spark.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/Thunder.vb
+++ b/P3D/Pokemon/Attacks/Electric/Thunder.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ThunderFang.vb
+++ b/P3D/Pokemon/Attacks/Electric/ThunderFang.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ThunderPunch.vb
+++ b/P3D/Pokemon/Attacks/Electric/ThunderPunch.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ThunderShock.vb
+++ b/P3D/Pokemon/Attacks/Electric/ThunderShock.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/ThunderWave.vb
+++ b/P3D/Pokemon/Attacks/Electric/ThunderWave.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = False
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/Thunderbolt.vb
+++ b/P3D/Pokemon/Attacks/Electric/Thunderbolt.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = False
--- a/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb
+++ b/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb
@ -36,7 +36,7 @@ Namespace BattleSystem.Moves.Electric
            Me.DisabledWhileGravity = False
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
            Me.HasSecondaryEffect = False

            Me.IsHealingMove = False
--- a/P3D/Pokemon/Attacks/Electric/VoltTackle.vb
+++ b/P3D/Pokemon/Attacks/Electric/VoltTackle.vb
@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = True
--- a/P3D/Pokemon/Attacks/Electric/WildCharge.vb
+++ b/P3D/Pokemon/Attacks/Electric/WildCharge.vb
@ -37,7 +37,7 @@
            Me.UseEffectiveness = True
            Me.ImmunityAffected = True
            Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False

            Me.IsHealingMove = False
            Me.IsRecoilMove = True
--- a/Show More
+++ b/Show More