From 94f03e833a5760ba02ce1aafee877d9afebfba87 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Fri, 24 Nov 2023 11:54:29 +0100 Subject: [PATCH] Fixed flinch moves being affected by King's Rock --- P3D/Pokemon/Attacks/Dark/DarkPulse.vb | 2 +- P3D/Pokemon/Attacks/Dragon/DragonRush.vb | 2 +- P3D/Pokemon/Attacks/Dragon/Twister.vb | 2 +- P3D/Pokemon/Attacks/Electric/ThunderFang.vb | 2 +- P3D/Pokemon/Attacks/Fighting/RollingKick.vb | 2 +- P3D/Pokemon/Attacks/Fire/FireFang.vb | 2 +- P3D/Pokemon/Attacks/Flying/AirSlash.vb | 2 +- P3D/Pokemon/Attacks/Flying/SkyAttack.vb | 2 +- P3D/Pokemon/Attacks/Ice/IceFang.vb | 2 +- P3D/Pokemon/Attacks/Normal/Snore.vb | 2 +- P3D/Pokemon/Attacks/Steel/Ironhead.vb | 2 +- P3D/Pokemon/Attacks/Water/Waterfall.vb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/P3D/Pokemon/Attacks/Dark/DarkPulse.vb b/P3D/Pokemon/Attacks/Dark/DarkPulse.vb index b52cd2062..6d5941f24 100644 --- a/P3D/Pokemon/Attacks/Dark/DarkPulse.vb +++ b/P3D/Pokemon/Attacks/Dark/DarkPulse.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = False Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonRush.vb b/P3D/Pokemon/Attacks/Dragon/DragonRush.vb index dee7d5cbb..34e6f61d5 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonRush.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonRush.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Dragon/Twister.vb b/P3D/Pokemon/Attacks/Dragon/Twister.vb index c56e1b9f0..ba5a9808e 100644 --- a/P3D/Pokemon/Attacks/Dragon/Twister.vb +++ b/P3D/Pokemon/Attacks/Dragon/Twister.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = False Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Electric/ThunderFang.vb b/P3D/Pokemon/Attacks/Electric/ThunderFang.vb index 4a7c669b7..7bdbd9eb7 100644 --- a/P3D/Pokemon/Attacks/Electric/ThunderFang.vb +++ b/P3D/Pokemon/Attacks/Electric/ThunderFang.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Fighting/RollingKick.vb b/P3D/Pokemon/Attacks/Fighting/RollingKick.vb index aefc79889..38e642b03 100644 --- a/P3D/Pokemon/Attacks/Fighting/RollingKick.vb +++ b/P3D/Pokemon/Attacks/Fighting/RollingKick.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Fire/FireFang.vb b/P3D/Pokemon/Attacks/Fire/FireFang.vb index fd9a0eedf..4965fbdd5 100644 --- a/P3D/Pokemon/Attacks/Fire/FireFang.vb +++ b/P3D/Pokemon/Attacks/Fire/FireFang.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Flying/AirSlash.vb b/P3D/Pokemon/Attacks/Flying/AirSlash.vb index 1d0f679ba..9b4910a97 100644 --- a/P3D/Pokemon/Attacks/Flying/AirSlash.vb +++ b/P3D/Pokemon/Attacks/Flying/AirSlash.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Flying/SkyAttack.vb b/P3D/Pokemon/Attacks/Flying/SkyAttack.vb index 441421688..7dd9fba1f 100644 --- a/P3D/Pokemon/Attacks/Flying/SkyAttack.vb +++ b/P3D/Pokemon/Attacks/Flying/SkyAttack.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Ice/IceFang.vb b/P3D/Pokemon/Attacks/Ice/IceFang.vb index 478234723..b49903bc8 100644 --- a/P3D/Pokemon/Attacks/Ice/IceFang.vb +++ b/P3D/Pokemon/Attacks/Ice/IceFang.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Normal/Snore.vb b/P3D/Pokemon/Attacks/Normal/Snore.vb index 0b6fbcf29..54b887817 100644 --- a/P3D/Pokemon/Attacks/Normal/Snore.vb +++ b/P3D/Pokemon/Attacks/Normal/Snore.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = False Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Steel/Ironhead.vb b/P3D/Pokemon/Attacks/Steel/Ironhead.vb index f9b9b370e..5e2b3393d 100644 --- a/P3D/Pokemon/Attacks/Steel/Ironhead.vb +++ b/P3D/Pokemon/Attacks/Steel/Ironhead.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False diff --git a/P3D/Pokemon/Attacks/Water/Waterfall.vb b/P3D/Pokemon/Attacks/Water/Waterfall.vb index 520e66bcc..f577464b1 100644 --- a/P3D/Pokemon/Attacks/Water/Waterfall.vb +++ b/P3D/Pokemon/Attacks/Water/Waterfall.vb @@ -30,7 +30,7 @@ Me.MagicCoatAffected = False Me.SnatchAffected = False Me.MirrorMoveAffected = True - Me.KingsrockAffected = True + Me.KingsrockAffected = False Me.CounterAffected = True Me.DisabledWhileGravity = False