From 3cad814d5ddd4ebc79a6933834f9694968cee35a Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Tue, 20 Dec 2022 10:40:04 -0600 Subject: [PATCH] move clean up moves reference attributes that they arent changing, removed 2 from all --- P3D/Pokemon/Attacks/Bug/AttackOrder.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/BugBite.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/BugBuzz.vb | 2 +- P3D/Pokemon/Attacks/Bug/DefendOrder.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/FellStinger.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/FirstImpression.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/FuryCutter.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/HealOrder.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Infestation.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/LeechLife.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Lunge.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Megahorn.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/PinMissile.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/PollenPuff.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/QuiverDance.vb | Bin 5358 -> 5216 bytes P3D/Pokemon/Attacks/Bug/SignalBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Silverwind.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/SpiderWeb.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Steamroller.vb | Bin 5626 -> 5484 bytes P3D/Pokemon/Attacks/Bug/StickyWeb.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/StringShot.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/StruggleBug.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Tailglow.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Twineedle.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/U-Turn.vb | 4 ++-- P3D/Pokemon/Attacks/Bug/Xscissor.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Assurance.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/BeatUp.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Bite.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/BrutalSwing.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Crunch.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/DarkPulse.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/DarkVoid.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Embargo.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/FakeTears.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/FeintAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Flatter.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Fling.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/HoneClaws.vb | Bin 4804 -> 4662 bytes P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/KnockOff.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Memento.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/NastyPlot.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/NightDaze.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Nightslash.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/PartingShot.vb | 2 +- P3D/Pokemon/Attacks/Dark/Payback.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/PowerTrip.vb | Bin 5910 -> 5768 bytes P3D/Pokemon/Attacks/Dark/Punishment.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Pursuit.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Snarl.vb | 2 +- P3D/Pokemon/Attacks/Dark/Snatch.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/SuckerPunch.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Switcheroo.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Taunt.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Thief.vb | 4 ++-- P3D/Pokemon/Attacks/Dark/Torment.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/ClangingScales.vb | 2 +- P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonBreath.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonClaw.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonDance.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonHammer.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonPulse.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonRage.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonRush.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DragonTail.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/DualChop.vb | Bin 3684 -> 3542 bytes P3D/Pokemon/Attacks/Dragon/Outrage.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/RoarOfTime.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/SpacialRend.vb | 4 ++-- P3D/Pokemon/Attacks/Dragon/Twister.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/BoltStrike.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/Charge.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/Chargebeam.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/Discharge.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/EerieImpulse.vb | 2 +- .../Attacks/Electric/ElectricTerrain.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/ElectroBall.vb | Bin 5914 -> 5772 bytes P3D/Pokemon/Attacks/Electric/Electroweb.vb | Bin 4312 -> 4170 bytes P3D/Pokemon/Attacks/Electric/Flash.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/FusionBolt.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/MagnetRise.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/Nuzzle.vb | 4 ++-- .../Attacks/Electric/ParabolicCharge.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/ShockWave.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/Spark.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/Thunder.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/ThunderFang.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/ThunderPunch.vb | 2 +- P3D/Pokemon/Attacks/Electric/ThunderShock.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/ThunderWave.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/Thunderbolt.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/VoltSwitch.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/VoltTackle.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/WildCharge.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/ZapCannon.vb | 4 ++-- P3D/Pokemon/Attacks/Electric/ZingZap.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/Baby-DollEyes.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/Charm.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/DazzlingGleam.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/DisarmingVoice.vb | 2 +- P3D/Pokemon/Attacks/Fairy/DrainingKiss.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/FairyWind.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/FleurCannon.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/Geomancy.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/LightOfRuin.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/MistyTerrain.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/Moonblast.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/Moonlight.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/NaturesMadness.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/PlayRough.vb | 4 ++-- P3D/Pokemon/Attacks/Fairy/SweetKiss.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/ArmThrust.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/AuraSphere.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/BrickBreak.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/BulkUp.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/CircleThrow.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/CloseCombat.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/Counter.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/CrossChop.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/Detect.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/DoubleKick.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/DrainPunch.vb | 2 +- P3D/Pokemon/Attacks/Fighting/DynamicPunch.vb | 2 +- P3D/Pokemon/Attacks/Fighting/FinalGambit.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/FlyingPress.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/FocusBlast.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/FocusPunch.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/ForcePalm.vb | 2 +- P3D/Pokemon/Attacks/Fighting/HammerArm.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/HighJumpKick.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/JumpKick.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/KarateChop.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/LowKick.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/LowSweep.vb | Bin 4096 -> 3954 bytes P3D/Pokemon/Attacks/Fighting/MachPunch.vb | 2 +- P3D/Pokemon/Attacks/Fighting/Power-UpPunch.vb | 2 +- P3D/Pokemon/Attacks/Fighting/Revenge.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/Reversal.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/Ride.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/RockSmash.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/RollingKick.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/SacredSword.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/SecretSword.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/SeismicToss.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/SkyUppercut.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/StormThrow.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/Submission.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/Superpower.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/TripleKick.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/VacuumWave.vb | Bin 3892 -> 3750 bytes P3D/Pokemon/Attacks/Fighting/VitalThrow.vb | 4 ++-- P3D/Pokemon/Attacks/Fighting/WakeUpSlap.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/BlastBurn.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/BlazeKick.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/BlueFlare.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/BurnUp.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/Ember.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/Eruption.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FieryDance.vb | Bin 5294 -> 5152 bytes P3D/Pokemon/Attacks/Fire/FireBlast.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FireFang.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FireLash.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FirePledge.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FirePunch.vb | 2 +- P3D/Pokemon/Attacks/Fire/FireSpin.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FlameBurst.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FlameCharge.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FlameWheel.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/Flamethrower.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FlareBlitz.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/FusionFlare.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/HeatCrash.vb | Bin 5776 -> 5634 bytes P3D/Pokemon/Attacks/Fire/HeatWave.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/Incinerate.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/Inferno.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/LavaPlume.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/MagmaStorm.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/MysticalFire.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/Overheat.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/SacredFire.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/SearingShot.vb | Bin 5250 -> 5108 bytes P3D/Pokemon/Attacks/Fire/SunnyDay.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/V-Create.vb | 4 ++-- P3D/Pokemon/Attacks/Fire/Will-O-Wisp.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/AerialAce.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Aeroblast.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/AirCutter.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/AirSlash.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Bounce.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/BraveBird.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Chatter.vb | Bin 4236 -> 4162 bytes P3D/Pokemon/Attacks/Flying/Defog.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/DragonAscent.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/DrillPeck.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/FeatherDance.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Fly.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Gust.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Hurricane.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/MirrorMove.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/OblivionWing.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Peck.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Pluck.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Roost.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/SkyAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/Tailwind.vb | 4 ++-- P3D/Pokemon/Attacks/Flying/WingAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/Astonish.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/ConfuseRay.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/Curse.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/DestinyBond.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/Hex.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/Lick.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/NightShade.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/Nightmare.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/OminousWind.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/PhantomForce.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/ShadowBall.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/ShadowBone.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/ShadowClaw.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/ShadowForce.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/ShadowPunch.vb | 2 +- P3D/Pokemon/Attacks/Ghost/ShadowSneak.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/SpiritShackle.vb | 4 ++-- P3D/Pokemon/Attacks/Ghost/Spite.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/Aromatherapy.vb | 2 +- P3D/Pokemon/Attacks/Grass/BulletSeed.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/CottonGuard.vb | Bin 4628 -> 4486 bytes P3D/Pokemon/Attacks/Grass/CottonSpore.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/EnergyBall.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/FrenzyPlant.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/GigaDrain.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/GrassKnot.vb | Bin 5122 -> 4980 bytes P3D/Pokemon/Attacks/Grass/GrassPledge.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/GrassWhistle.vb | 2 +- P3D/Pokemon/Attacks/Grass/GrassyTerrain.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/HornLeech.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/Ingrain.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/LeafBlade.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/LeafStorm.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/LeafTornado.vb | Bin 4652 -> 4510 bytes P3D/Pokemon/Attacks/Grass/Leafage.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/MagicalLeaf.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/MegaDrain.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/NeedleArm.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/PetalBlizzard.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/PetalDance.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/PowerWhip.vb | Bin 3822 -> 3680 bytes P3D/Pokemon/Attacks/Grass/RazorLeaf.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/SeedBomb.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/Seedflare.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/SleepPowder.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/SolarBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/SolarBlade.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/Spore.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/Strength Sap.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/StunSpore.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/Synthesis.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/TropKick.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/VineWhip.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/WoodHammer.vb | 4 ++-- P3D/Pokemon/Attacks/Grass/WorrySeed.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/BoneClub.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/BoneRush.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Bonemerang.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Bulldoze.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Dig.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/DrillRun.vb | Bin 3698 -> 3556 bytes P3D/Pokemon/Attacks/Ground/EarthPower.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Earthquake.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Fissure.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/HighHorsepower.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/LandsWrath.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Magnitude.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Mud-Slap.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/MudBomb.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/MudShot.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/MudSport.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/PrecipiceBlades.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/SHoreUp.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/SandAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/SandTomb.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/Spikes.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/ThousandArrows.vb | 4 ++-- P3D/Pokemon/Attacks/Ground/ThousandWaves.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/AuroraBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/Avalanche.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/Blizzard.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/FreezeDry.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/FreezeShock.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/FrostBreath.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/Glaciate.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/Hail.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/Haze.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IceBall.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IceBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IceBurn.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IceFang.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IceHammer.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IcePunch.vb | 2 +- P3D/Pokemon/Attacks/Ice/IceShard.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IcicleCrash.vb | Bin 5236 -> 5094 bytes P3D/Pokemon/Attacks/Ice/IcicleSpear.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/IcyWind.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/Mist.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/PowderSnow.vb | 4 ++-- P3D/Pokemon/Attacks/Ice/SheerCold.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Acupressure.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Assist.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Attract.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Barrage.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/BatonPass.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/BellyDrum.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Bestow.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Bide.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Bind.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Block.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/BodySlam.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Boomburst.vb | 2 +- P3D/Pokemon/Attacks/Normal/Captivate.vb | Bin 6142 -> 6068 bytes P3D/Pokemon/Attacks/Normal/Celebrate.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/ChipAway.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/CometPunch.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Confide.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Constrict.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Conversion.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Conversion2.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Covet.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/CrushClaw.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/CrushGrip.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Cut.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/DefenseCurl.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/DizzyPunch.vb | 2 +- P3D/Pokemon/Attacks/Normal/DoubleEdge.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/DoubleHit.vb | Bin 3694 -> 3552 bytes P3D/Pokemon/Attacks/Normal/DoubleSlap.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/DoubleTeam.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/EchoedVoice.vb | 2 +- P3D/Pokemon/Attacks/Normal/EggBomb.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Encore.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Endeavor.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Endure.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Entrainment.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Explosion.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/ExtremeSpeed.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Facade.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/FakeOut.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/FalseSwipe.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Feint.vb | 2 +- P3D/Pokemon/Attacks/Normal/Flail.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/FocusEnergy.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Foresight.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Frustration.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/FuryAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/FurySwipes.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/GigaImpact.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Glare.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Growl.vb | 2 +- P3D/Pokemon/Attacks/Normal/Growth.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Guillotine.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Harden.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/HeadCharge.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Headbutt.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/HealBell.vb | 2 +- P3D/Pokemon/Attacks/Normal/HiddenPower.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/HoldBack.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/HornAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/HornDrill.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Howl.vb | 2 +- P3D/Pokemon/Attacks/Normal/HyperBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/HyperFang.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/HyperVoice.vb | 2 +- P3D/Pokemon/Attacks/Normal/Judgement.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/LastResort.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Leer.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/LockOn.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/LovelyKiss.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/MeanLook.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/MegaKick.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/MegaPunch.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Metronome.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/MilkDrink.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Mimic.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/MindReader.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Minimize.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/MorningSun.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/NaturalGift.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/NaturePower.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/NobleRoar.vb | 2 +- P3D/Pokemon/Attacks/Normal/OdorSleuth.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/PainSplit.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/PayDay.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/PerishSong.vb | 2 +- P3D/Pokemon/Attacks/Normal/PlayNice.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Pound.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Present.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Protect.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/PsychUp.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/QuickAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Rage.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/RapidSpin.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/RazorWind.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Recover.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Recycle.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/ReflectType.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Refresh.vb | Bin 6010 -> 5868 bytes P3D/Pokemon/Attacks/Normal/Return.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/RevelationDance.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Roar.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/RockClimb.vb | Bin 4600 -> 4458 bytes P3D/Pokemon/Attacks/Normal/Round.vb | 2 +- P3D/Pokemon/Attacks/Normal/Safeguard.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/ScaryFace.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Scratch.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Screech.vb | 2 +- P3D/Pokemon/Attacks/Normal/Self-Destruct.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Sharpen.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/ShellSmash.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SimpleBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Sing.vb | 2 +- P3D/Pokemon/Attacks/Normal/Sketch.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SkullBash.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SlackOff.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Slam.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Slash.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SleepTalk.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SmellingSalts.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SmokeScreen.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Snore.vb | 2 +- P3D/Pokemon/Attacks/Normal/Soft-Boiled.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SonicBoom.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SpikeCannon.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SpitUp.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Splash.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Stockpile.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Stomp.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Strength.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Struggle.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Substitute.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SuperFang.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Supersonic.vb | 2 +- P3D/Pokemon/Attacks/Normal/Swagger.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Swallow.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SweetScent.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Swift.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/SwordsDance.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Tackle.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TailSlap.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TailWhip.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TakeDown.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TearfulLook.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TechnoBlast.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TeeterDance.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Thrash.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Tickle.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Transform.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TriAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/TrumpCard.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Uproar.vb | 2 +- P3D/Pokemon/Attacks/Normal/ViceGrip.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/WeatherBall.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Whirlwind.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Wish.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/WorkUp.vb | Bin 4862 -> 4720 bytes P3D/Pokemon/Attacks/Normal/Wrap.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/WringOut.vb | 4 ++-- P3D/Pokemon/Attacks/Normal/Yawn.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/Acid.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/AcidArmor.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/AcidSpray.vb | Bin 4476 -> 4334 bytes P3D/Pokemon/Attacks/Poison/ClearSmog.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/Coil.vb | Bin 5174 -> 5032 bytes P3D/Pokemon/Attacks/Poison/Crosspoison.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/GunkShot.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/PoisonFang.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/PoisonGas.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/PoisonJab.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/PoisonPowder.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/PoisonSting.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/PoisonTail.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/Sludge.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/SludgeBomb.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/SludgeWave.vb | Bin 4726 -> 4584 bytes P3D/Pokemon/Attacks/Poison/Smog.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/Toxic.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/ToxicSpikes.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/ToxicThread.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/VenomDrench.vb | 4 ++-- P3D/Pokemon/Attacks/Poison/Venoshock.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Agility.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Amnesia.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Barrier.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/CalmMind.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Confusion.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/CosmicPower.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/DreamEater.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Extrasensory.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/FutureSight.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Gravity.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/GuardSwap.vb | Bin 5818 -> 5676 bytes P3D/Pokemon/Attacks/Psychic/HealBlock.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/HealPulse.vb | Bin 7386 -> 7244 bytes P3D/Pokemon/Attacks/Psychic/HealingWish.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/HeartStamp.vb | Bin 4540 -> 4398 bytes P3D/Pokemon/Attacks/Psychic/HeartSwap.vb | Bin 7636 -> 7494 bytes P3D/Pokemon/Attacks/Psychic/HyperspaceHole.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Hypnosis.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Kinesis.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/LightScreen.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/LusterPurge.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/MagicCoat.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Meditate.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/MiracleEye.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/MirrorCoat.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/MistBall.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/PowerSwap.vb | Bin 5808 -> 5666 bytes P3D/Pokemon/Attacks/Psychic/PowerTrick.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/PrismaticLaser.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Psybeam.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Psychic.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/PsychicFangs.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/PsychicTerrain.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/PsychoBoost.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/PsychoCut.vb | Bin 3868 -> 3726 bytes P3D/Pokemon/Attacks/Psychic/PsychoShift.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Psyshock.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Psystrike.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Psywave.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Reflect.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Rest.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/RolePlay.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/SkillSwap.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/StoredPower.vb | Bin 5916 -> 5774 bytes P3D/Pokemon/Attacks/Psychic/Synchronoise.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/Teleport.vb | Bin 6498 -> 6356 bytes P3D/Pokemon/Attacks/Psychic/Trick.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/TrickRoom.vb | 4 ++-- P3D/Pokemon/Attacks/Psychic/ZenHeadbutt.vb | Bin 5250 -> 5108 bytes P3D/Pokemon/Attacks/Rock/AncientPower.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/DiamondStorm.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/HeadSmash.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/PowerGem.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/RockBlast.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/RockPolish.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/RockSlide.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/RockThrow.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/RockTomb.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/RockWrecker.vb | Bin 4532 -> 4390 bytes P3D/Pokemon/Attacks/Rock/Rollout.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/Sandstorm.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/SmackDown.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/Stealthrock.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/StoneEdge.vb | 4 ++-- P3D/Pokemon/Attacks/Rock/TarShot.vb | 4 ++-- .../Attacks/Special/ConfusionAttack.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/AnchorShot.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/Autotomize.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/BulletPunch.vb | 2 +- P3D/Pokemon/Attacks/Steel/DoomDesire.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/FlashCannon.vb | Bin 4760 -> 4618 bytes P3D/Pokemon/Attacks/Steel/GearGrind.vb | Bin 3616 -> 3474 bytes P3D/Pokemon/Attacks/Steel/GearUp.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/GyroBall.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/HeavySlam.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/IronDefense.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/IronTail.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/Ironhead.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/KingsShield.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/MagnetBomb.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/MetalBurst.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/MetalClaw.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/MetalSound.vb | 2 +- P3D/Pokemon/Attacks/Steel/MeteorMash.vb | 2 +- P3D/Pokemon/Attacks/Steel/MirrorShot.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/ShiftGear.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/SmartStrike.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/SteelBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Steel/SteelWing.vb | 4 ++-- P3D/Pokemon/Attacks/TheDerpMove.vb | 4 ++-- P3D/Pokemon/Attacks/Water/AquaRing.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Aquajet.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Aquatail.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Brine.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Bubble.vb | 4 ++-- P3D/Pokemon/Attacks/Water/BubbleBeam.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Clamp.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Crabhammer.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Dive.vb | 4 ++-- P3D/Pokemon/Attacks/Water/HydroPump.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Hydrocannon.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Liquidation.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Muddywater.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Octazooka.vb | 4 ++-- P3D/Pokemon/Attacks/Water/OriginPulse.vb | 4 ++-- P3D/Pokemon/Attacks/Water/RainDance.vb | 4 ++-- P3D/Pokemon/Attacks/Water/RazorShell.vb | Bin 4684 -> 4542 bytes P3D/Pokemon/Attacks/Water/Scald.vb | Bin 5124 -> 4982 bytes P3D/Pokemon/Attacks/Water/SparklingAria.vb | 2 +- P3D/Pokemon/Attacks/Water/SteamEruption.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Surf.vb | 4 ++-- P3D/Pokemon/Attacks/Water/WaterGun.vb | 4 ++-- P3D/Pokemon/Attacks/Water/WaterPledge.vb | 4 ++-- P3D/Pokemon/Attacks/Water/WaterPulse.vb | 4 ++-- P3D/Pokemon/Attacks/Water/WaterShuriken.vb | 4 ++-- P3D/Pokemon/Attacks/Water/WaterSport.vb | 4 ++-- P3D/Pokemon/Attacks/Water/WaterSpout.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Waterfall.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Whirlpool.vb | 4 ++-- P3D/Pokemon/Attacks/Water/Withdraw.vb | 4 ++-- 610 files changed, 1101 insertions(+), 1101 deletions(-) diff --git a/P3D/Pokemon/Attacks/Bug/AttackOrder.vb b/P3D/Pokemon/Attacks/Bug/AttackOrder.vb index ec068ed0e..bb599a846 100644 --- a/P3D/Pokemon/Attacks/Bug/AttackOrder.vb +++ b/P3D/Pokemon/Attacks/Bug/AttackOrder.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/BugBite.vb b/P3D/Pokemon/Attacks/Bug/BugBite.vb index 89daea2fa..fb0254410 100644 --- a/P3D/Pokemon/Attacks/Bug/BugBite.vb +++ b/P3D/Pokemon/Attacks/Bug/BugBite.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/BugBuzz.vb b/P3D/Pokemon/Attacks/Bug/BugBuzz.vb index 5132fac8b..3458b1c3c 100644 --- a/P3D/Pokemon/Attacks/Bug/BugBuzz.vb +++ b/P3D/Pokemon/Attacks/Bug/BugBuzz.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Bug/DefendOrder.vb b/P3D/Pokemon/Attacks/Bug/DefendOrder.vb index 411bd9f71..a0482a473 100644 --- a/P3D/Pokemon/Attacks/Bug/DefendOrder.vb +++ b/P3D/Pokemon/Attacks/Bug/DefendOrder.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/FellStinger.vb b/P3D/Pokemon/Attacks/Bug/FellStinger.vb index 1241158e6..41acee502 100644 --- a/P3D/Pokemon/Attacks/Bug/FellStinger.vb +++ b/P3D/Pokemon/Attacks/Bug/FellStinger.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/FirstImpression.vb b/P3D/Pokemon/Attacks/Bug/FirstImpression.vb index ffbcd50bd..3633e03d0 100644 --- a/P3D/Pokemon/Attacks/Bug/FirstImpression.vb +++ b/P3D/Pokemon/Attacks/Bug/FirstImpression.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/FuryCutter.vb b/P3D/Pokemon/Attacks/Bug/FuryCutter.vb index 8052be433..76b3cb461 100644 --- a/P3D/Pokemon/Attacks/Bug/FuryCutter.vb +++ b/P3D/Pokemon/Attacks/Bug/FuryCutter.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/HealOrder.vb b/P3D/Pokemon/Attacks/Bug/HealOrder.vb index c1712b38e..3fcc8a1b0 100644 --- a/P3D/Pokemon/Attacks/Bug/HealOrder.vb +++ b/P3D/Pokemon/Attacks/Bug/HealOrder.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Infestation.vb b/P3D/Pokemon/Attacks/Bug/Infestation.vb index a8deca541..6f5067bd6 100644 --- a/P3D/Pokemon/Attacks/Bug/Infestation.vb +++ b/P3D/Pokemon/Attacks/Bug/Infestation.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Bug Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/LeechLife.vb b/P3D/Pokemon/Attacks/Bug/LeechLife.vb index b3dacf1d8..ae24e1ce9 100644 --- a/P3D/Pokemon/Attacks/Bug/LeechLife.vb +++ b/P3D/Pokemon/Attacks/Bug/LeechLife.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Lunge.vb b/P3D/Pokemon/Attacks/Bug/Lunge.vb index d1d238630..96b7faff6 100644 --- a/P3D/Pokemon/Attacks/Bug/Lunge.vb +++ b/P3D/Pokemon/Attacks/Bug/Lunge.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Bug Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Megahorn.vb b/P3D/Pokemon/Attacks/Bug/Megahorn.vb index e7f8a71dc..a1453b38a 100644 --- a/P3D/Pokemon/Attacks/Bug/Megahorn.vb +++ b/P3D/Pokemon/Attacks/Bug/Megahorn.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/PinMissile.vb b/P3D/Pokemon/Attacks/Bug/PinMissile.vb index b97beee61..225afe782 100644 --- a/P3D/Pokemon/Attacks/Bug/PinMissile.vb +++ b/P3D/Pokemon/Attacks/Bug/PinMissile.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/PollenPuff.vb b/P3D/Pokemon/Attacks/Bug/PollenPuff.vb index da5f270d7..fbcf4fe88 100644 --- a/P3D/Pokemon/Attacks/Bug/PollenPuff.vb +++ b/P3D/Pokemon/Attacks/Bug/PollenPuff.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/QuiverDance.vb b/P3D/Pokemon/Attacks/Bug/QuiverDance.vb index ced4a19eaf4b179ab4c0973fb31d9fafa3904054..2345455858dba0880266594f3c54933565887556 100644 GIT binary patch delta 24 dcmaE-`9NdCTJFjDoJx}=d1^rP=HEP@*#Uq%3CaKf delta 54 zcmaE$@lJEYTJFjJxmDOp8S)sC88Rk2aJx>v%v}K#Q{oI}$Y%hFr%ax}EejIaT*&jD F9RMMC6AJ(U diff --git a/P3D/Pokemon/Attacks/Bug/SignalBeam.vb b/P3D/Pokemon/Attacks/Bug/SignalBeam.vb index ed79d0621..906cf1bb7 100644 --- a/P3D/Pokemon/Attacks/Bug/SignalBeam.vb +++ b/P3D/Pokemon/Attacks/Bug/SignalBeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Silverwind.vb b/P3D/Pokemon/Attacks/Bug/Silverwind.vb index ed634c4d9..292229c17 100644 --- a/P3D/Pokemon/Attacks/Bug/Silverwind.vb +++ b/P3D/Pokemon/Attacks/Bug/Silverwind.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/SpiderWeb.vb b/P3D/Pokemon/Attacks/Bug/SpiderWeb.vb index a14f77e94..8baba6d4b 100644 --- a/P3D/Pokemon/Attacks/Bug/SpiderWeb.vb +++ b/P3D/Pokemon/Attacks/Bug/SpiderWeb.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Steamroller.vb b/P3D/Pokemon/Attacks/Bug/Steamroller.vb index 0a18926a8a55e50105e4824d144e5c73e79c02cf..66f7c4fd7ded7f3f9fbc708c735c3957e0911b29 100644 GIT binary patch delta 24 gcmeyR{YGoUS?qjmiI0P0F68e>i_@% delta 60 zcmaE(^-FuhS?CMR&aPX5eY2A2tD$Op@%Oy0olym>Ou GO%4EFQxh8i diff --git a/P3D/Pokemon/Attacks/Bug/StickyWeb.vb b/P3D/Pokemon/Attacks/Bug/StickyWeb.vb index c695c7897..4c2f70cb3 100644 --- a/P3D/Pokemon/Attacks/Bug/StickyWeb.vb +++ b/P3D/Pokemon/Attacks/Bug/StickyWeb.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Bug Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/StringShot.vb b/P3D/Pokemon/Attacks/Bug/StringShot.vb index 0a10bdecf..ae7abcdf2 100644 --- a/P3D/Pokemon/Attacks/Bug/StringShot.vb +++ b/P3D/Pokemon/Attacks/Bug/StringShot.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/StruggleBug.vb b/P3D/Pokemon/Attacks/Bug/StruggleBug.vb index 1def1f29a..058a1d110 100644 --- a/P3D/Pokemon/Attacks/Bug/StruggleBug.vb +++ b/P3D/Pokemon/Attacks/Bug/StruggleBug.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Tailglow.vb b/P3D/Pokemon/Attacks/Bug/Tailglow.vb index 3157d2f21..372a2c578 100644 --- a/P3D/Pokemon/Attacks/Bug/Tailglow.vb +++ b/P3D/Pokemon/Attacks/Bug/Tailglow.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Twineedle.vb b/P3D/Pokemon/Attacks/Bug/Twineedle.vb index 4b5befc05..0a1f3d7a5 100644 --- a/P3D/Pokemon/Attacks/Bug/Twineedle.vb +++ b/P3D/Pokemon/Attacks/Bug/Twineedle.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/U-Turn.vb b/P3D/Pokemon/Attacks/Bug/U-Turn.vb index 4eee49331..730aeddf8 100644 --- a/P3D/Pokemon/Attacks/Bug/U-Turn.vb +++ b/P3D/Pokemon/Attacks/Bug/U-Turn.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Bug/Xscissor.vb b/P3D/Pokemon/Attacks/Bug/Xscissor.vb index 43ef67b66..4918438b7 100644 --- a/P3D/Pokemon/Attacks/Bug/Xscissor.vb +++ b/P3D/Pokemon/Attacks/Bug/Xscissor.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Assurance.vb b/P3D/Pokemon/Attacks/Dark/Assurance.vb index 01b71587c..9e7e23636 100644 --- a/P3D/Pokemon/Attacks/Dark/Assurance.vb +++ b/P3D/Pokemon/Attacks/Dark/Assurance.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/BeatUp.vb b/P3D/Pokemon/Attacks/Dark/BeatUp.vb index c7be617e5..161050cc3 100644 --- a/P3D/Pokemon/Attacks/Dark/BeatUp.vb +++ b/P3D/Pokemon/Attacks/Dark/BeatUp.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Bite.vb b/P3D/Pokemon/Attacks/Dark/Bite.vb index 064a4baf0..6e07b90c1 100644 --- a/P3D/Pokemon/Attacks/Dark/Bite.vb +++ b/P3D/Pokemon/Attacks/Dark/Bite.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/BrutalSwing.vb b/P3D/Pokemon/Attacks/Dark/BrutalSwing.vb index c8e4fbbb2..5295d6cda 100644 --- a/P3D/Pokemon/Attacks/Dark/BrutalSwing.vb +++ b/P3D/Pokemon/Attacks/Dark/BrutalSwing.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Crunch.vb b/P3D/Pokemon/Attacks/Dark/Crunch.vb index 61606fc2b..319ded3a0 100644 --- a/P3D/Pokemon/Attacks/Dark/Crunch.vb +++ b/P3D/Pokemon/Attacks/Dark/Crunch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/DarkPulse.vb b/P3D/Pokemon/Attacks/Dark/DarkPulse.vb index 3fb29c927..6864980d7 100644 --- a/P3D/Pokemon/Attacks/Dark/DarkPulse.vb +++ b/P3D/Pokemon/Attacks/Dark/DarkPulse.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/DarkVoid.vb b/P3D/Pokemon/Attacks/Dark/DarkVoid.vb index 377734a42..0164f3560 100644 --- a/P3D/Pokemon/Attacks/Dark/DarkVoid.vb +++ b/P3D/Pokemon/Attacks/Dark/DarkVoid.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Embargo.vb b/P3D/Pokemon/Attacks/Dark/Embargo.vb index c79558249..57be44ca6 100644 --- a/P3D/Pokemon/Attacks/Dark/Embargo.vb +++ b/P3D/Pokemon/Attacks/Dark/Embargo.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/FakeTears.vb b/P3D/Pokemon/Attacks/Dark/FakeTears.vb index 8b9c13445..b48a3230c 100644 --- a/P3D/Pokemon/Attacks/Dark/FakeTears.vb +++ b/P3D/Pokemon/Attacks/Dark/FakeTears.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Dark Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/FeintAttack.vb b/P3D/Pokemon/Attacks/Dark/FeintAttack.vb index e6add8b3a..a4c8099e3 100644 --- a/P3D/Pokemon/Attacks/Dark/FeintAttack.vb +++ b/P3D/Pokemon/Attacks/Dark/FeintAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Flatter.vb b/P3D/Pokemon/Attacks/Dark/Flatter.vb index ce81d6fe4..2139587b1 100644 --- a/P3D/Pokemon/Attacks/Dark/Flatter.vb +++ b/P3D/Pokemon/Attacks/Dark/Flatter.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Fling.vb b/P3D/Pokemon/Attacks/Dark/Fling.vb index b08a8e7bd..109444c98 100644 --- a/P3D/Pokemon/Attacks/Dark/Fling.vb +++ b/P3D/Pokemon/Attacks/Dark/Fling.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/HoneClaws.vb b/P3D/Pokemon/Attacks/Dark/HoneClaws.vb index de84b0fd04ca2c7999d237f375ff95902bf88e80..55838d4b42c546a5da917907c685c03680a9b3d9 100644 GIT binary patch delta 27 jcmX@2x=m$6Aot|$TxydKa#u`jl$gApTWIrg9$7X3oB9ef delta 64 zcmdm{azu4QAot|+>~g%G48;rq45bWt49N@`lN-2QCzo?qz-59N^1*T`lY3ZYCvWFc K+bqc=%LV{(bP^o^ diff --git a/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb b/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb index 7d8dbeb6a..8f4520dc6 100644 --- a/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb +++ b/P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/KnockOff.vb b/P3D/Pokemon/Attacks/Dark/KnockOff.vb index eca7e41ae..2e19f4685 100644 --- a/P3D/Pokemon/Attacks/Dark/KnockOff.vb +++ b/P3D/Pokemon/Attacks/Dark/KnockOff.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Memento.vb b/P3D/Pokemon/Attacks/Dark/Memento.vb index edf2ff95a..bf549cdfd 100644 --- a/P3D/Pokemon/Attacks/Dark/Memento.vb +++ b/P3D/Pokemon/Attacks/Dark/Memento.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/NastyPlot.vb b/P3D/Pokemon/Attacks/Dark/NastyPlot.vb index 82f60e259..c8296fa9b 100644 --- a/P3D/Pokemon/Attacks/Dark/NastyPlot.vb +++ b/P3D/Pokemon/Attacks/Dark/NastyPlot.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/NightDaze.vb b/P3D/Pokemon/Attacks/Dark/NightDaze.vb index 3a9c86470..5bb91aeb6 100644 --- a/P3D/Pokemon/Attacks/Dark/NightDaze.vb +++ b/P3D/Pokemon/Attacks/Dark/NightDaze.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Nightslash.vb b/P3D/Pokemon/Attacks/Dark/Nightslash.vb index be1f89068..45d9fbe13 100644 --- a/P3D/Pokemon/Attacks/Dark/Nightslash.vb +++ b/P3D/Pokemon/Attacks/Dark/Nightslash.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/PartingShot.vb b/P3D/Pokemon/Attacks/Dark/PartingShot.vb index 2100a896c..3343ea0ca 100644 --- a/P3D/Pokemon/Attacks/Dark/PartingShot.vb +++ b/P3D/Pokemon/Attacks/Dark/PartingShot.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Dark/Payback.vb b/P3D/Pokemon/Attacks/Dark/Payback.vb index 5bb68668d..36a38c3bc 100644 --- a/P3D/Pokemon/Attacks/Dark/Payback.vb +++ b/P3D/Pokemon/Attacks/Dark/Payback.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/PowerTrip.vb b/P3D/Pokemon/Attacks/Dark/PowerTrip.vb index fb841255711a7fb31072080acd287c324f978664..d1fdb8a52767f51c7db2c4778fd2167cbb0880be 100644 GIT binary patch delta 20 bcmbQH*P*-NI`?E-ZneqoJY}01c}2MZPL~Er delta 64 zcmeCsou;?pI`?FGHaT8ThGK>QhEj$+hGd3}$ywa4lmBv;!DWIO^1*T`lMA?IC);wX KZJx{XniBv|x)Lh@ diff --git a/P3D/Pokemon/Attacks/Dark/Punishment.vb b/P3D/Pokemon/Attacks/Dark/Punishment.vb index 70ce1f835..12894ee7d 100644 --- a/P3D/Pokemon/Attacks/Dark/Punishment.vb +++ b/P3D/Pokemon/Attacks/Dark/Punishment.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Dark Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Pursuit.vb b/P3D/Pokemon/Attacks/Dark/Pursuit.vb index a68090eda..36fb95008 100644 --- a/P3D/Pokemon/Attacks/Dark/Pursuit.vb +++ b/P3D/Pokemon/Attacks/Dark/Pursuit.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Snarl.vb b/P3D/Pokemon/Attacks/Dark/Snarl.vb index 8e2456d2c..eec3e1eab 100644 --- a/P3D/Pokemon/Attacks/Dark/Snarl.vb +++ b/P3D/Pokemon/Attacks/Dark/Snarl.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Dark/Snatch.vb b/P3D/Pokemon/Attacks/Dark/Snatch.vb index 0edc708ec..318fe9806 100644 --- a/P3D/Pokemon/Attacks/Dark/Snatch.vb +++ b/P3D/Pokemon/Attacks/Dark/Snatch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/SuckerPunch.vb b/P3D/Pokemon/Attacks/Dark/SuckerPunch.vb index 8bce3e483..8f900d4fc 100644 --- a/P3D/Pokemon/Attacks/Dark/SuckerPunch.vb +++ b/P3D/Pokemon/Attacks/Dark/SuckerPunch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Switcheroo.vb b/P3D/Pokemon/Attacks/Dark/Switcheroo.vb index dfc61146d..5cacfaf7f 100644 --- a/P3D/Pokemon/Attacks/Dark/Switcheroo.vb +++ b/P3D/Pokemon/Attacks/Dark/Switcheroo.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Dark Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Taunt.vb b/P3D/Pokemon/Attacks/Dark/Taunt.vb index 79ae2f764..e1c897bc2 100644 --- a/P3D/Pokemon/Attacks/Dark/Taunt.vb +++ b/P3D/Pokemon/Attacks/Dark/Taunt.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Thief.vb b/P3D/Pokemon/Attacks/Dark/Thief.vb index 88b99f0c0..e29894ac4 100644 --- a/P3D/Pokemon/Attacks/Dark/Thief.vb +++ b/P3D/Pokemon/Attacks/Dark/Thief.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dark/Torment.vb b/P3D/Pokemon/Attacks/Dark/Torment.vb index 0a88bbb66..e7363224c 100644 --- a/P3D/Pokemon/Attacks/Dark/Torment.vb +++ b/P3D/Pokemon/Attacks/Dark/Torment.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/ClangingScales.vb b/P3D/Pokemon/Attacks/Dragon/ClangingScales.vb index 8b4de089f..6f27afd42 100644 --- a/P3D/Pokemon/Attacks/Dragon/ClangingScales.vb +++ b/P3D/Pokemon/Attacks/Dragon/ClangingScales.vb @@ -41,7 +41,7 @@ Namespace BattleSystem.Moves.Dragon Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb b/P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb index 134fbd99b..ce59e7123 100644 --- a/P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb +++ b/P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonBreath.vb b/P3D/Pokemon/Attacks/Dragon/DragonBreath.vb index 72cdb67c4..63c14f914 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonBreath.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonBreath.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonClaw.vb b/P3D/Pokemon/Attacks/Dragon/DragonClaw.vb index 3bbfd5eb4..a0d8a342e 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonClaw.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonClaw.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonDance.vb b/P3D/Pokemon/Attacks/Dragon/DragonDance.vb index e7a0974a7..6f0633525 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonDance.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonDance.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsDanceMove = True Me.IsAffectedBySubstitute = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonHammer.vb b/P3D/Pokemon/Attacks/Dragon/DragonHammer.vb index 7210f69f8..4baea0bb7 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonHammer.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonHammer.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonPulse.vb b/P3D/Pokemon/Attacks/Dragon/DragonPulse.vb index 9478d919b..580140120 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonPulse.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonPulse.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonRage.vb b/P3D/Pokemon/Attacks/Dragon/DragonRage.vb index 3c11cf1d4..7cd8e35ed 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonRage.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonRage.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonRush.vb b/P3D/Pokemon/Attacks/Dragon/DragonRush.vb index 5a8ea762c..4e8a837cb 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonRush.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonRush.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DragonTail.vb b/P3D/Pokemon/Attacks/Dragon/DragonTail.vb index cfadffaad..16e9de4b4 100644 --- a/P3D/Pokemon/Attacks/Dragon/DragonTail.vb +++ b/P3D/Pokemon/Attacks/Dragon/DragonTail.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Dragon/DualChop.vb b/P3D/Pokemon/Attacks/Dragon/DualChop.vb index 7338be3f5bcd13ec50b7e40853faab1c39aa187d..48a3c834ca2ad62c2e683c04c8e61986d7c80186 100644 GIT binary patch delta 20 ccmaDNb4_}~a_-5z+-j4>dCE3l<>=8HyPK7)lxP7?K$>CR=g4PCm delta 64 zcmeCtou#+oA@^i`UM0=|hEj$+hGd3}$pSp0lk<7_K%$e`dCI`D!3_Ce`IN~CJc^UO Mxs^6A=XuHr06ioTg#Z8m diff --git a/P3D/Pokemon/Attacks/Electric/Electroweb.vb b/P3D/Pokemon/Attacks/Electric/Electroweb.vb index f2eaeb2e73d23f88495e94c168ea44a7d4ad7d53..a740ecbc85d746abb6149a1acba0ea51cbf78905 100644 GIT binary patch delta 27 jcmcbicuHZzVeZM@oJy1Rd8#HJl$gApS7@_1??Gk&p5zKy delta 70 zcmX@5a6@s!VeZM?Y;wY$48;rq45bWt49N@`44FVWeeye2>&Z{Kt3dL+Ao*a1e6WfX Qpp5L~Zce4mtvpAW0n>^Uc>n+a diff --git a/P3D/Pokemon/Attacks/Electric/Flash.vb b/P3D/Pokemon/Attacks/Electric/Flash.vb index eca4fa628..9244638bd 100644 --- a/P3D/Pokemon/Attacks/Electric/Flash.vb +++ b/P3D/Pokemon/Attacks/Electric/Flash.vb @@ -37,11 +37,11 @@ Me.IsHealingMove = False Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.HasSecondaryEffect = True Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/FusionBolt.vb b/P3D/Pokemon/Attacks/Electric/FusionBolt.vb index d6e69fb83..9689784ac 100644 --- a/P3D/Pokemon/Attacks/Electric/FusionBolt.vb +++ b/P3D/Pokemon/Attacks/Electric/FusionBolt.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/MagnetRise.vb b/P3D/Pokemon/Attacks/Electric/MagnetRise.vb index 07c21674c..1795db8da 100644 --- a/P3D/Pokemon/Attacks/Electric/MagnetRise.vb +++ b/P3D/Pokemon/Attacks/Electric/MagnetRise.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/Nuzzle.vb b/P3D/Pokemon/Attacks/Electric/Nuzzle.vb index 42de9cb00..91d7517b7 100644 --- a/P3D/Pokemon/Attacks/Electric/Nuzzle.vb +++ b/P3D/Pokemon/Attacks/Electric/Nuzzle.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Electric Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb b/P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb index 4b0060e92..2815976bf 100644 --- a/P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb +++ b/P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Electric Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ShockWave.vb b/P3D/Pokemon/Attacks/Electric/ShockWave.vb index a4ddab901..160c4f28b 100644 --- a/P3D/Pokemon/Attacks/Electric/ShockWave.vb +++ b/P3D/Pokemon/Attacks/Electric/ShockWave.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Electric Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/Spark.vb b/P3D/Pokemon/Attacks/Electric/Spark.vb index efa6399c1..dd4643909 100644 --- a/P3D/Pokemon/Attacks/Electric/Spark.vb +++ b/P3D/Pokemon/Attacks/Electric/Spark.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/Thunder.vb b/P3D/Pokemon/Attacks/Electric/Thunder.vb index f1d683fbd..b2a172791 100644 --- a/P3D/Pokemon/Attacks/Electric/Thunder.vb +++ b/P3D/Pokemon/Attacks/Electric/Thunder.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ThunderFang.vb b/P3D/Pokemon/Attacks/Electric/ThunderFang.vb index 73e7241a5..d5967f987 100644 --- a/P3D/Pokemon/Attacks/Electric/ThunderFang.vb +++ b/P3D/Pokemon/Attacks/Electric/ThunderFang.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ThunderPunch.vb b/P3D/Pokemon/Attacks/Electric/ThunderPunch.vb index d2355af02..3ae09a20f 100644 --- a/P3D/Pokemon/Attacks/Electric/ThunderPunch.vb +++ b/P3D/Pokemon/Attacks/Electric/ThunderPunch.vb @@ -44,7 +44,7 @@ Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ThunderShock.vb b/P3D/Pokemon/Attacks/Electric/ThunderShock.vb index 41cb5c5a6..adfc98df7 100644 --- a/P3D/Pokemon/Attacks/Electric/ThunderShock.vb +++ b/P3D/Pokemon/Attacks/Electric/ThunderShock.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ThunderWave.vb b/P3D/Pokemon/Attacks/Electric/ThunderWave.vb index 4855cde0e..603398bb9 100644 --- a/P3D/Pokemon/Attacks/Electric/ThunderWave.vb +++ b/P3D/Pokemon/Attacks/Electric/ThunderWave.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/Thunderbolt.vb b/P3D/Pokemon/Attacks/Electric/Thunderbolt.vb index 10445f49b..789f1bdb9 100644 --- a/P3D/Pokemon/Attacks/Electric/Thunderbolt.vb +++ b/P3D/Pokemon/Attacks/Electric/Thunderbolt.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb b/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb index c73b31bda..ede553c8a 100644 --- a/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb +++ b/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Electric Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/VoltTackle.vb b/P3D/Pokemon/Attacks/Electric/VoltTackle.vb index eeeca813d..724dc0d31 100644 --- a/P3D/Pokemon/Attacks/Electric/VoltTackle.vb +++ b/P3D/Pokemon/Attacks/Electric/VoltTackle.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Electric Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/WildCharge.vb b/P3D/Pokemon/Attacks/Electric/WildCharge.vb index 447a59797..edef81380 100644 --- a/P3D/Pokemon/Attacks/Electric/WildCharge.vb +++ b/P3D/Pokemon/Attacks/Electric/WildCharge.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ZapCannon.vb b/P3D/Pokemon/Attacks/Electric/ZapCannon.vb index 476f664b6..3ce76529d 100644 --- a/P3D/Pokemon/Attacks/Electric/ZapCannon.vb +++ b/P3D/Pokemon/Attacks/Electric/ZapCannon.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Electric/ZingZap.vb b/P3D/Pokemon/Attacks/Electric/ZingZap.vb index 706871824..fffdf1bba 100644 --- a/P3D/Pokemon/Attacks/Electric/ZingZap.vb +++ b/P3D/Pokemon/Attacks/Electric/ZingZap.vb @@ -40,10 +40,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/Baby-DollEyes.vb b/P3D/Pokemon/Attacks/Fairy/Baby-DollEyes.vb index 343e65227..59059fe42 100644 --- a/P3D/Pokemon/Attacks/Fairy/Baby-DollEyes.vb +++ b/P3D/Pokemon/Attacks/Fairy/Baby-DollEyes.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/Charm.vb b/P3D/Pokemon/Attacks/Fairy/Charm.vb index e84e1f64a..8a92b2403 100644 --- a/P3D/Pokemon/Attacks/Fairy/Charm.vb +++ b/P3D/Pokemon/Attacks/Fairy/Charm.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/DazzlingGleam.vb b/P3D/Pokemon/Attacks/Fairy/DazzlingGleam.vb index bb60ababc..df33d2e82 100644 --- a/P3D/Pokemon/Attacks/Fairy/DazzlingGleam.vb +++ b/P3D/Pokemon/Attacks/Fairy/DazzlingGleam.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/DisarmingVoice.vb b/P3D/Pokemon/Attacks/Fairy/DisarmingVoice.vb index bc9c3418d..9b21bdf4e 100644 --- a/P3D/Pokemon/Attacks/Fairy/DisarmingVoice.vb +++ b/P3D/Pokemon/Attacks/Fairy/DisarmingVoice.vb @@ -41,7 +41,7 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Fairy/DrainingKiss.vb b/P3D/Pokemon/Attacks/Fairy/DrainingKiss.vb index 829831aac..6e14dcbc8 100644 --- a/P3D/Pokemon/Attacks/Fairy/DrainingKiss.vb +++ b/P3D/Pokemon/Attacks/Fairy/DrainingKiss.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/FairyWind.vb b/P3D/Pokemon/Attacks/Fairy/FairyWind.vb index 0744e61b4..62a905957 100644 --- a/P3D/Pokemon/Attacks/Fairy/FairyWind.vb +++ b/P3D/Pokemon/Attacks/Fairy/FairyWind.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/FleurCannon.vb b/P3D/Pokemon/Attacks/Fairy/FleurCannon.vb index 35c56492e..a66d7a35f 100644 --- a/P3D/Pokemon/Attacks/Fairy/FleurCannon.vb +++ b/P3D/Pokemon/Attacks/Fairy/FleurCannon.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/Geomancy.vb b/P3D/Pokemon/Attacks/Fairy/Geomancy.vb index adde24d29..ef8933928 100644 --- a/P3D/Pokemon/Attacks/Fairy/Geomancy.vb +++ b/P3D/Pokemon/Attacks/Fairy/Geomancy.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/LightOfRuin.vb b/P3D/Pokemon/Attacks/Fairy/LightOfRuin.vb index f66a5f492..518cbd77f 100644 --- a/P3D/Pokemon/Attacks/Fairy/LightOfRuin.vb +++ b/P3D/Pokemon/Attacks/Fairy/LightOfRuin.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/MistyTerrain.vb b/P3D/Pokemon/Attacks/Fairy/MistyTerrain.vb index ab22d9cef..11e779975 100644 --- a/P3D/Pokemon/Attacks/Fairy/MistyTerrain.vb +++ b/P3D/Pokemon/Attacks/Fairy/MistyTerrain.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/Moonblast.vb b/P3D/Pokemon/Attacks/Fairy/Moonblast.vb index 0b6b71946..195a78625 100644 --- a/P3D/Pokemon/Attacks/Fairy/Moonblast.vb +++ b/P3D/Pokemon/Attacks/Fairy/Moonblast.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/Moonlight.vb b/P3D/Pokemon/Attacks/Fairy/Moonlight.vb index 3f85a8cc9..a952d0607 100644 --- a/P3D/Pokemon/Attacks/Fairy/Moonlight.vb +++ b/P3D/Pokemon/Attacks/Fairy/Moonlight.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/NaturesMadness.vb b/P3D/Pokemon/Attacks/Fairy/NaturesMadness.vb index b845511ba..1f59f37ec 100644 --- a/P3D/Pokemon/Attacks/Fairy/NaturesMadness.vb +++ b/P3D/Pokemon/Attacks/Fairy/NaturesMadness.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/PlayRough.vb b/P3D/Pokemon/Attacks/Fairy/PlayRough.vb index 666b57e0e..3c1b39e6e 100644 --- a/P3D/Pokemon/Attacks/Fairy/PlayRough.vb +++ b/P3D/Pokemon/Attacks/Fairy/PlayRough.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fairy Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fairy/SweetKiss.vb b/P3D/Pokemon/Attacks/Fairy/SweetKiss.vb index 177300b1d..29aaee806 100644 --- a/P3D/Pokemon/Attacks/Fairy/SweetKiss.vb +++ b/P3D/Pokemon/Attacks/Fairy/SweetKiss.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/ArmThrust.vb b/P3D/Pokemon/Attacks/Fighting/ArmThrust.vb index 85d5aabfc..91be2ffce 100644 --- a/P3D/Pokemon/Attacks/Fighting/ArmThrust.vb +++ b/P3D/Pokemon/Attacks/Fighting/ArmThrust.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fighting Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/AuraSphere.vb b/P3D/Pokemon/Attacks/Fighting/AuraSphere.vb index 403d67e68..20db94406 100644 --- a/P3D/Pokemon/Attacks/Fighting/AuraSphere.vb +++ b/P3D/Pokemon/Attacks/Fighting/AuraSphere.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/BrickBreak.vb b/P3D/Pokemon/Attacks/Fighting/BrickBreak.vb index b782a3c13..f3506854f 100644 --- a/P3D/Pokemon/Attacks/Fighting/BrickBreak.vb +++ b/P3D/Pokemon/Attacks/Fighting/BrickBreak.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fighting Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/BulkUp.vb b/P3D/Pokemon/Attacks/Fighting/BulkUp.vb index 80ea9dde2..e7e5559bf 100644 --- a/P3D/Pokemon/Attacks/Fighting/BulkUp.vb +++ b/P3D/Pokemon/Attacks/Fighting/BulkUp.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fighting Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/CircleThrow.vb b/P3D/Pokemon/Attacks/Fighting/CircleThrow.vb index 7ef6d4d85..557f21f17 100644 --- a/P3D/Pokemon/Attacks/Fighting/CircleThrow.vb +++ b/P3D/Pokemon/Attacks/Fighting/CircleThrow.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fighting Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/CloseCombat.vb b/P3D/Pokemon/Attacks/Fighting/CloseCombat.vb index bbb55681e..de1311405 100644 --- a/P3D/Pokemon/Attacks/Fighting/CloseCombat.vb +++ b/P3D/Pokemon/Attacks/Fighting/CloseCombat.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Counter.vb b/P3D/Pokemon/Attacks/Fighting/Counter.vb index eae97f581..53a62ae4d 100644 --- a/P3D/Pokemon/Attacks/Fighting/Counter.vb +++ b/P3D/Pokemon/Attacks/Fighting/Counter.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/CrossChop.vb b/P3D/Pokemon/Attacks/Fighting/CrossChop.vb index b6504bc44..5e9e4e958 100644 --- a/P3D/Pokemon/Attacks/Fighting/CrossChop.vb +++ b/P3D/Pokemon/Attacks/Fighting/CrossChop.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Detect.vb b/P3D/Pokemon/Attacks/Fighting/Detect.vb index 6aa498ae6..19230d9bd 100644 --- a/P3D/Pokemon/Attacks/Fighting/Detect.vb +++ b/P3D/Pokemon/Attacks/Fighting/Detect.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = True - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/DoubleKick.vb b/P3D/Pokemon/Attacks/Fighting/DoubleKick.vb index 9c35a7360..3231b5c79 100644 --- a/P3D/Pokemon/Attacks/Fighting/DoubleKick.vb +++ b/P3D/Pokemon/Attacks/Fighting/DoubleKick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/DrainPunch.vb b/P3D/Pokemon/Attacks/Fighting/DrainPunch.vb index 6cd898611..86a58470c 100644 --- a/P3D/Pokemon/Attacks/Fighting/DrainPunch.vb +++ b/P3D/Pokemon/Attacks/Fighting/DrainPunch.vb @@ -44,7 +44,7 @@ Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/DynamicPunch.vb b/P3D/Pokemon/Attacks/Fighting/DynamicPunch.vb index e28713d97..e1f1c0a15 100644 --- a/P3D/Pokemon/Attacks/Fighting/DynamicPunch.vb +++ b/P3D/Pokemon/Attacks/Fighting/DynamicPunch.vb @@ -44,7 +44,7 @@ Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/FinalGambit.vb b/P3D/Pokemon/Attacks/Fighting/FinalGambit.vb index a762530cb..4b07d816f 100644 --- a/P3D/Pokemon/Attacks/Fighting/FinalGambit.vb +++ b/P3D/Pokemon/Attacks/Fighting/FinalGambit.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/FlyingPress.vb b/P3D/Pokemon/Attacks/Fighting/FlyingPress.vb index 98ab629da..799a7b273 100644 --- a/P3D/Pokemon/Attacks/Fighting/FlyingPress.vb +++ b/P3D/Pokemon/Attacks/Fighting/FlyingPress.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/FocusBlast.vb b/P3D/Pokemon/Attacks/Fighting/FocusBlast.vb index 6b52fab90..8781f50a1 100644 --- a/P3D/Pokemon/Attacks/Fighting/FocusBlast.vb +++ b/P3D/Pokemon/Attacks/Fighting/FocusBlast.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/FocusPunch.vb b/P3D/Pokemon/Attacks/Fighting/FocusPunch.vb index 5a0b40015..ce628629b 100644 --- a/P3D/Pokemon/Attacks/Fighting/FocusPunch.vb +++ b/P3D/Pokemon/Attacks/Fighting/FocusPunch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/ForcePalm.vb b/P3D/Pokemon/Attacks/Fighting/ForcePalm.vb index 4137f317e..b0c752cb8 100644 --- a/P3D/Pokemon/Attacks/Fighting/ForcePalm.vb +++ b/P3D/Pokemon/Attacks/Fighting/ForcePalm.vb @@ -44,7 +44,7 @@ Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/HammerArm.vb b/P3D/Pokemon/Attacks/Fighting/HammerArm.vb index ce9020e28..139326de3 100644 --- a/P3D/Pokemon/Attacks/Fighting/HammerArm.vb +++ b/P3D/Pokemon/Attacks/Fighting/HammerArm.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/HighJumpKick.vb b/P3D/Pokemon/Attacks/Fighting/HighJumpKick.vb index 276a3ce91..3e5fe5972 100644 --- a/P3D/Pokemon/Attacks/Fighting/HighJumpKick.vb +++ b/P3D/Pokemon/Attacks/Fighting/HighJumpKick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/JumpKick.vb b/P3D/Pokemon/Attacks/Fighting/JumpKick.vb index da2114401..cee339964 100644 --- a/P3D/Pokemon/Attacks/Fighting/JumpKick.vb +++ b/P3D/Pokemon/Attacks/Fighting/JumpKick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/KarateChop.vb b/P3D/Pokemon/Attacks/Fighting/KarateChop.vb index 4657b43ed..b2948efed 100644 --- a/P3D/Pokemon/Attacks/Fighting/KarateChop.vb +++ b/P3D/Pokemon/Attacks/Fighting/KarateChop.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/LowKick.vb b/P3D/Pokemon/Attacks/Fighting/LowKick.vb index 763954586..055ff5d97 100644 --- a/P3D/Pokemon/Attacks/Fighting/LowKick.vb +++ b/P3D/Pokemon/Attacks/Fighting/LowKick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/LowSweep.vb b/P3D/Pokemon/Attacks/Fighting/LowSweep.vb index 055f59b0b557fdf630f6bb1f2aef68c6f877dbaf..df36b5bcbfc45dbffeeb881f903535fe855048e4 100644 GIT binary patch delta 20 ccmZor_$0SsG56$)JZh7LdCE4Q&ZvCt3dL+Ao*a1e6WfX Mpp5KhXC8fK0IyLKYXATM diff --git a/P3D/Pokemon/Attacks/Fighting/MachPunch.vb b/P3D/Pokemon/Attacks/Fighting/MachPunch.vb index 853c64ad1..50997a818 100644 --- a/P3D/Pokemon/Attacks/Fighting/MachPunch.vb +++ b/P3D/Pokemon/Attacks/Fighting/MachPunch.vb @@ -44,7 +44,7 @@ Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Power-UpPunch.vb b/P3D/Pokemon/Attacks/Fighting/Power-UpPunch.vb index 58706154d..da48c215a 100644 --- a/P3D/Pokemon/Attacks/Fighting/Power-UpPunch.vb +++ b/P3D/Pokemon/Attacks/Fighting/Power-UpPunch.vb @@ -44,7 +44,7 @@ Namespace BattleSystem.Moves.Fighting Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Revenge.vb b/P3D/Pokemon/Attacks/Fighting/Revenge.vb index fc2326411..8d134c536 100644 --- a/P3D/Pokemon/Attacks/Fighting/Revenge.vb +++ b/P3D/Pokemon/Attacks/Fighting/Revenge.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fighting Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Reversal.vb b/P3D/Pokemon/Attacks/Fighting/Reversal.vb index 5434ef771..b58232514 100644 --- a/P3D/Pokemon/Attacks/Fighting/Reversal.vb +++ b/P3D/Pokemon/Attacks/Fighting/Reversal.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Ride.vb b/P3D/Pokemon/Attacks/Fighting/Ride.vb index ebf7f9d8a..527bbe9eb 100644 --- a/P3D/Pokemon/Attacks/Fighting/Ride.vb +++ b/P3D/Pokemon/Attacks/Fighting/Ride.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/RockSmash.vb b/P3D/Pokemon/Attacks/Fighting/RockSmash.vb index 05df10d3a..7e65ed924 100644 --- a/P3D/Pokemon/Attacks/Fighting/RockSmash.vb +++ b/P3D/Pokemon/Attacks/Fighting/RockSmash.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/RollingKick.vb b/P3D/Pokemon/Attacks/Fighting/RollingKick.vb index e96d59de2..516472484 100644 --- a/P3D/Pokemon/Attacks/Fighting/RollingKick.vb +++ b/P3D/Pokemon/Attacks/Fighting/RollingKick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/SacredSword.vb b/P3D/Pokemon/Attacks/Fighting/SacredSword.vb index 94ceab99f..f61793ad9 100644 --- a/P3D/Pokemon/Attacks/Fighting/SacredSword.vb +++ b/P3D/Pokemon/Attacks/Fighting/SacredSword.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/SecretSword.vb b/P3D/Pokemon/Attacks/Fighting/SecretSword.vb index a5cfc8bc6..d5df9b7c7 100644 --- a/P3D/Pokemon/Attacks/Fighting/SecretSword.vb +++ b/P3D/Pokemon/Attacks/Fighting/SecretSword.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/SeismicToss.vb b/P3D/Pokemon/Attacks/Fighting/SeismicToss.vb index b79d351e2..672b3a0c4 100644 --- a/P3D/Pokemon/Attacks/Fighting/SeismicToss.vb +++ b/P3D/Pokemon/Attacks/Fighting/SeismicToss.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/SkyUppercut.vb b/P3D/Pokemon/Attacks/Fighting/SkyUppercut.vb index be3bbd317..1d68d4383 100644 --- a/P3D/Pokemon/Attacks/Fighting/SkyUppercut.vb +++ b/P3D/Pokemon/Attacks/Fighting/SkyUppercut.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/StormThrow.vb b/P3D/Pokemon/Attacks/Fighting/StormThrow.vb index 3c3cf6db8..820523372 100644 --- a/P3D/Pokemon/Attacks/Fighting/StormThrow.vb +++ b/P3D/Pokemon/Attacks/Fighting/StormThrow.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Fighting Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Submission.vb b/P3D/Pokemon/Attacks/Fighting/Submission.vb index 5942cc84e..55d50f46a 100644 --- a/P3D/Pokemon/Attacks/Fighting/Submission.vb +++ b/P3D/Pokemon/Attacks/Fighting/Submission.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/Superpower.vb b/P3D/Pokemon/Attacks/Fighting/Superpower.vb index 8ab526e4a..97736d04d 100644 --- a/P3D/Pokemon/Attacks/Fighting/Superpower.vb +++ b/P3D/Pokemon/Attacks/Fighting/Superpower.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/TripleKick.vb b/P3D/Pokemon/Attacks/Fighting/TripleKick.vb index fa6f7507c..87fc6c4d9 100644 --- a/P3D/Pokemon/Attacks/Fighting/TripleKick.vb +++ b/P3D/Pokemon/Attacks/Fighting/TripleKick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/VacuumWave.vb b/P3D/Pokemon/Attacks/Fighting/VacuumWave.vb index 756c253610d81c6445535e905a7f59b4301331f0..e835cd784578a1abb3ad509fefc1d7bd2e1f9e6e 100644 GIT binary patch delta 24 gcmdlYw@h}!e(uR{dDJHB^OQ|i7&3u$`s5Eh_LHA-mx1JYLGr;2`Ct_( RKpEM|`?=LNxAG`50RRWC6;Q6p2sHoz delta 52 zcmZ3Wu}*WtR_@8!+)A7Q45bWt49N@`lRdayC*S5S1B(VTQhEj$+hGd3}$$8walNou+;4;As`Cz$}$@{pSH!tK# GxhZY9nDhEj$+hGd3}$v)h!lkanvfklHE^1 delta 34 qcmX@4(4)Aan|m@pha9gbLoq`DLn%WZLo!3gWI1lv%^SHVvH$?7TnTCb diff --git a/P3D/Pokemon/Attacks/Flying/Defog.vb b/P3D/Pokemon/Attacks/Flying/Defog.vb index 309976857..69703fe4f 100644 --- a/P3D/Pokemon/Attacks/Flying/Defog.vb +++ b/P3D/Pokemon/Attacks/Flying/Defog.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/DragonAscent.vb b/P3D/Pokemon/Attacks/Flying/DragonAscent.vb index 2e91f4500..de8573b6e 100644 --- a/P3D/Pokemon/Attacks/Flying/DragonAscent.vb +++ b/P3D/Pokemon/Attacks/Flying/DragonAscent.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/DrillPeck.vb b/P3D/Pokemon/Attacks/Flying/DrillPeck.vb index bf2cfb9f0..0fb3226b0 100644 --- a/P3D/Pokemon/Attacks/Flying/DrillPeck.vb +++ b/P3D/Pokemon/Attacks/Flying/DrillPeck.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/FeatherDance.vb b/P3D/Pokemon/Attacks/Flying/FeatherDance.vb index b0ba574d2..0640050d7 100644 --- a/P3D/Pokemon/Attacks/Flying/FeatherDance.vb +++ b/P3D/Pokemon/Attacks/Flying/FeatherDance.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Flying Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsDanceMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Flying/Fly.vb b/P3D/Pokemon/Attacks/Flying/Fly.vb index 09443833d..3c9544fde 100644 --- a/P3D/Pokemon/Attacks/Flying/Fly.vb +++ b/P3D/Pokemon/Attacks/Flying/Fly.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/Gust.vb b/P3D/Pokemon/Attacks/Flying/Gust.vb index 9061ece13..fc0cfecbb 100644 --- a/P3D/Pokemon/Attacks/Flying/Gust.vb +++ b/P3D/Pokemon/Attacks/Flying/Gust.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/Hurricane.vb b/P3D/Pokemon/Attacks/Flying/Hurricane.vb index 52f07065c..a83a1b308 100644 --- a/P3D/Pokemon/Attacks/Flying/Hurricane.vb +++ b/P3D/Pokemon/Attacks/Flying/Hurricane.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/MirrorMove.vb b/P3D/Pokemon/Attacks/Flying/MirrorMove.vb index 1698bee68..4a2e3db36 100644 --- a/P3D/Pokemon/Attacks/Flying/MirrorMove.vb +++ b/P3D/Pokemon/Attacks/Flying/MirrorMove.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/OblivionWing.vb b/P3D/Pokemon/Attacks/Flying/OblivionWing.vb index cc5779982..9b78a2d9b 100644 --- a/P3D/Pokemon/Attacks/Flying/OblivionWing.vb +++ b/P3D/Pokemon/Attacks/Flying/OblivionWing.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Flying Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/Peck.vb b/P3D/Pokemon/Attacks/Flying/Peck.vb index bdbc401e1..b8e126b03 100644 --- a/P3D/Pokemon/Attacks/Flying/Peck.vb +++ b/P3D/Pokemon/Attacks/Flying/Peck.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/Pluck.vb b/P3D/Pokemon/Attacks/Flying/Pluck.vb index 690dc96af..26f814830 100644 --- a/P3D/Pokemon/Attacks/Flying/Pluck.vb +++ b/P3D/Pokemon/Attacks/Flying/Pluck.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Flying Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/Roost.vb b/P3D/Pokemon/Attacks/Flying/Roost.vb index 351341b5b..608cdca8a 100644 --- a/P3D/Pokemon/Attacks/Flying/Roost.vb +++ b/P3D/Pokemon/Attacks/Flying/Roost.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/SkyAttack.vb b/P3D/Pokemon/Attacks/Flying/SkyAttack.vb index ecffea6c7..c2d468189 100644 --- a/P3D/Pokemon/Attacks/Flying/SkyAttack.vb +++ b/P3D/Pokemon/Attacks/Flying/SkyAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/Tailwind.vb b/P3D/Pokemon/Attacks/Flying/Tailwind.vb index ff27c0a76..cf4f11c0a 100644 --- a/P3D/Pokemon/Attacks/Flying/Tailwind.vb +++ b/P3D/Pokemon/Attacks/Flying/Tailwind.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Flying Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Flying/WingAttack.vb b/P3D/Pokemon/Attacks/Flying/WingAttack.vb index 500159167..417903e15 100644 --- a/P3D/Pokemon/Attacks/Flying/WingAttack.vb +++ b/P3D/Pokemon/Attacks/Flying/WingAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/Astonish.vb b/P3D/Pokemon/Attacks/Ghost/Astonish.vb index 5986067ec..2368ccd12 100644 --- a/P3D/Pokemon/Attacks/Ghost/Astonish.vb +++ b/P3D/Pokemon/Attacks/Ghost/Astonish.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ghost Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/ConfuseRay.vb b/P3D/Pokemon/Attacks/Ghost/ConfuseRay.vb index 41953aa90..4d7c048c7 100644 --- a/P3D/Pokemon/Attacks/Ghost/ConfuseRay.vb +++ b/P3D/Pokemon/Attacks/Ghost/ConfuseRay.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/Curse.vb b/P3D/Pokemon/Attacks/Ghost/Curse.vb index bbdb6087d..32d90e001 100644 --- a/P3D/Pokemon/Attacks/Ghost/Curse.vb +++ b/P3D/Pokemon/Attacks/Ghost/Curse.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/DestinyBond.vb b/P3D/Pokemon/Attacks/Ghost/DestinyBond.vb index df636e4ff..c80386765 100644 --- a/P3D/Pokemon/Attacks/Ghost/DestinyBond.vb +++ b/P3D/Pokemon/Attacks/Ghost/DestinyBond.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/Hex.vb b/P3D/Pokemon/Attacks/Ghost/Hex.vb index 1f132a916..870c807d8 100644 --- a/P3D/Pokemon/Attacks/Ghost/Hex.vb +++ b/P3D/Pokemon/Attacks/Ghost/Hex.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/Lick.vb b/P3D/Pokemon/Attacks/Ghost/Lick.vb index eb5d1dec6..094ae1dac 100644 --- a/P3D/Pokemon/Attacks/Ghost/Lick.vb +++ b/P3D/Pokemon/Attacks/Ghost/Lick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/NightShade.vb b/P3D/Pokemon/Attacks/Ghost/NightShade.vb index 29faedc7a..e6f0389ef 100644 --- a/P3D/Pokemon/Attacks/Ghost/NightShade.vb +++ b/P3D/Pokemon/Attacks/Ghost/NightShade.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/Nightmare.vb b/P3D/Pokemon/Attacks/Ghost/Nightmare.vb index 97fa765a9..59401e692 100644 --- a/P3D/Pokemon/Attacks/Ghost/Nightmare.vb +++ b/P3D/Pokemon/Attacks/Ghost/Nightmare.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/OminousWind.vb b/P3D/Pokemon/Attacks/Ghost/OminousWind.vb index f43ebe828..2e34a97d0 100644 --- a/P3D/Pokemon/Attacks/Ghost/OminousWind.vb +++ b/P3D/Pokemon/Attacks/Ghost/OminousWind.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/PhantomForce.vb b/P3D/Pokemon/Attacks/Ghost/PhantomForce.vb index 72779f2b1..7a098699f 100644 --- a/P3D/Pokemon/Attacks/Ghost/PhantomForce.vb +++ b/P3D/Pokemon/Attacks/Ghost/PhantomForce.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ghost Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/ShadowBall.vb b/P3D/Pokemon/Attacks/Ghost/ShadowBall.vb index 9c11075aa..b1a674072 100644 --- a/P3D/Pokemon/Attacks/Ghost/ShadowBall.vb +++ b/P3D/Pokemon/Attacks/Ghost/ShadowBall.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/ShadowBone.vb b/P3D/Pokemon/Attacks/Ghost/ShadowBone.vb index a6b746571..dafd65814 100644 --- a/P3D/Pokemon/Attacks/Ghost/ShadowBone.vb +++ b/P3D/Pokemon/Attacks/Ghost/ShadowBone.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/ShadowClaw.vb b/P3D/Pokemon/Attacks/Ghost/ShadowClaw.vb index 16b05cca9..c79947c29 100644 --- a/P3D/Pokemon/Attacks/Ghost/ShadowClaw.vb +++ b/P3D/Pokemon/Attacks/Ghost/ShadowClaw.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/ShadowForce.vb b/P3D/Pokemon/Attacks/Ghost/ShadowForce.vb index 1cd2e8fc7..7c82e14a5 100644 --- a/P3D/Pokemon/Attacks/Ghost/ShadowForce.vb +++ b/P3D/Pokemon/Attacks/Ghost/ShadowForce.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ghost Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/ShadowPunch.vb b/P3D/Pokemon/Attacks/Ghost/ShadowPunch.vb index bdc634750..9679df7ff 100644 --- a/P3D/Pokemon/Attacks/Ghost/ShadowPunch.vb +++ b/P3D/Pokemon/Attacks/Ghost/ShadowPunch.vb @@ -44,7 +44,7 @@ Namespace BattleSystem.Moves.Ghost Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/ShadowSneak.vb b/P3D/Pokemon/Attacks/Ghost/ShadowSneak.vb index b4932ec2e..7d6ce3102 100644 --- a/P3D/Pokemon/Attacks/Ghost/ShadowSneak.vb +++ b/P3D/Pokemon/Attacks/Ghost/ShadowSneak.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/SpiritShackle.vb b/P3D/Pokemon/Attacks/Ghost/SpiritShackle.vb index c5821106a..630d962fa 100644 --- a/P3D/Pokemon/Attacks/Ghost/SpiritShackle.vb +++ b/P3D/Pokemon/Attacks/Ghost/SpiritShackle.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ghost/Spite.vb b/P3D/Pokemon/Attacks/Ghost/Spite.vb index dd8a7e485..b37ec7c13 100644 --- a/P3D/Pokemon/Attacks/Ghost/Spite.vb +++ b/P3D/Pokemon/Attacks/Ghost/Spite.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/Aromatherapy.vb b/P3D/Pokemon/Attacks/Grass/Aromatherapy.vb index 57db38f7e..7e67bc7a9 100644 --- a/P3D/Pokemon/Attacks/Grass/Aromatherapy.vb +++ b/P3D/Pokemon/Attacks/Grass/Aromatherapy.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Grass/BulletSeed.vb b/P3D/Pokemon/Attacks/Grass/BulletSeed.vb index 860068c35..410511d6c 100644 --- a/P3D/Pokemon/Attacks/Grass/BulletSeed.vb +++ b/P3D/Pokemon/Attacks/Grass/BulletSeed.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/CottonGuard.vb b/P3D/Pokemon/Attacks/Grass/CottonGuard.vb index 5a690009fa4ac24441c05b364e40e3b969b36af2..5a7f126a11b5d194fc23f5b1174de8e37c7dc930 100644 GIT binary patch delta 28 kcmbQD(x$v&JNIN+ZneqkJQb5a@<~iy&m**%mzSLt0FUMf)&Kwi delta 64 zcmZouo}#j0JNIOMHaT8ThGK>QhEj$+hGd3}$zI&9lkaj@z-59N^1*T`lLNSAC(ClH KZLa5GX9WN+q7Y92 diff --git a/P3D/Pokemon/Attacks/Grass/CottonSpore.vb b/P3D/Pokemon/Attacks/Grass/CottonSpore.vb index ffe939f63..aebb987d2 100644 --- a/P3D/Pokemon/Attacks/Grass/CottonSpore.vb +++ b/P3D/Pokemon/Attacks/Grass/CottonSpore.vb @@ -37,11 +37,11 @@ Me.IsHealingMove = False Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = True Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.HasSecondaryEffect = False Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/EnergyBall.vb b/P3D/Pokemon/Attacks/Grass/EnergyBall.vb index a625b8fea..d8c7fc119 100644 --- a/P3D/Pokemon/Attacks/Grass/EnergyBall.vb +++ b/P3D/Pokemon/Attacks/Grass/EnergyBall.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/FrenzyPlant.vb b/P3D/Pokemon/Attacks/Grass/FrenzyPlant.vb index 1f30446d1..e13323b5f 100644 --- a/P3D/Pokemon/Attacks/Grass/FrenzyPlant.vb +++ b/P3D/Pokemon/Attacks/Grass/FrenzyPlant.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/GigaDrain.vb b/P3D/Pokemon/Attacks/Grass/GigaDrain.vb index 0ab2bee32..45e425720 100644 --- a/P3D/Pokemon/Attacks/Grass/GigaDrain.vb +++ b/P3D/Pokemon/Attacks/Grass/GigaDrain.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/GrassKnot.vb b/P3D/Pokemon/Attacks/Grass/GrassKnot.vb index 48a2ee246c0999836b6e127c90fdea3067985a63..d7c6544bd7ac2fda07ca9a95651b6964c38e53ee 100644 GIT binary patch delta 20 ccmZqD_@cI9JNIN+ZneqkJY}07@+h(c08;1&8~^|S delta 64 zcmeyO)}*mvJNM-Ota7}b48;rq45bWt49N@`lfAfIC*S2RgUbXnCI@iKPL}0X K+g!`@oecn*ToZi& diff --git a/P3D/Pokemon/Attacks/Grass/GrassPledge.vb b/P3D/Pokemon/Attacks/Grass/GrassPledge.vb index aa1a89046..6d28a4470 100644 --- a/P3D/Pokemon/Attacks/Grass/GrassPledge.vb +++ b/P3D/Pokemon/Attacks/Grass/GrassPledge.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/GrassWhistle.vb b/P3D/Pokemon/Attacks/Grass/GrassWhistle.vb index 198f62b91..28af9efd4 100644 --- a/P3D/Pokemon/Attacks/Grass/GrassWhistle.vb +++ b/P3D/Pokemon/Attacks/Grass/GrassWhistle.vb @@ -41,7 +41,7 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Grass/GrassyTerrain.vb b/P3D/Pokemon/Attacks/Grass/GrassyTerrain.vb index 8f25c8fc4..e391263bb 100644 --- a/P3D/Pokemon/Attacks/Grass/GrassyTerrain.vb +++ b/P3D/Pokemon/Attacks/Grass/GrassyTerrain.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/HornLeech.vb b/P3D/Pokemon/Attacks/Grass/HornLeech.vb index c7a08e369..e85f2712c 100644 --- a/P3D/Pokemon/Attacks/Grass/HornLeech.vb +++ b/P3D/Pokemon/Attacks/Grass/HornLeech.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/Ingrain.vb b/P3D/Pokemon/Attacks/Grass/Ingrain.vb index d7d4c08be..45c8986b7 100644 --- a/P3D/Pokemon/Attacks/Grass/Ingrain.vb +++ b/P3D/Pokemon/Attacks/Grass/Ingrain.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/LeafBlade.vb b/P3D/Pokemon/Attacks/Grass/LeafBlade.vb index 107c79107..02e59c62a 100644 --- a/P3D/Pokemon/Attacks/Grass/LeafBlade.vb +++ b/P3D/Pokemon/Attacks/Grass/LeafBlade.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/LeafStorm.vb b/P3D/Pokemon/Attacks/Grass/LeafStorm.vb index e8bae95fe..a7f8f3db3 100644 --- a/P3D/Pokemon/Attacks/Grass/LeafStorm.vb +++ b/P3D/Pokemon/Attacks/Grass/LeafStorm.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/LeafTornado.vb b/P3D/Pokemon/Attacks/Grass/LeafTornado.vb index 19ba1584f05222b8da769cd586b1cbec6b0cc406..20d1decc1c3e24dee58d6db9509576dc681c4237 100644 GIT binary patch delta 28 kcmZ3ZGEaHKMefP}dDJF5@{}?2GH^|9U{cv0SMj8=q diff --git a/P3D/Pokemon/Attacks/Grass/Leafage.vb b/P3D/Pokemon/Attacks/Grass/Leafage.vb index b1e2938f6..c0e71b2dc 100644 --- a/P3D/Pokemon/Attacks/Grass/Leafage.vb +++ b/P3D/Pokemon/Attacks/Grass/Leafage.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/MagicalLeaf.vb b/P3D/Pokemon/Attacks/Grass/MagicalLeaf.vb index bda31fd5a..915969faa 100644 --- a/P3D/Pokemon/Attacks/Grass/MagicalLeaf.vb +++ b/P3D/Pokemon/Attacks/Grass/MagicalLeaf.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/MegaDrain.vb b/P3D/Pokemon/Attacks/Grass/MegaDrain.vb index 2b871bfd0..2ae5527b2 100644 --- a/P3D/Pokemon/Attacks/Grass/MegaDrain.vb +++ b/P3D/Pokemon/Attacks/Grass/MegaDrain.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/NeedleArm.vb b/P3D/Pokemon/Attacks/Grass/NeedleArm.vb index 5356e5e55..a103b7045 100644 --- a/P3D/Pokemon/Attacks/Grass/NeedleArm.vb +++ b/P3D/Pokemon/Attacks/Grass/NeedleArm.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/PetalBlizzard.vb b/P3D/Pokemon/Attacks/Grass/PetalBlizzard.vb index 2b7f47b31..213d1708e 100644 --- a/P3D/Pokemon/Attacks/Grass/PetalBlizzard.vb +++ b/P3D/Pokemon/Attacks/Grass/PetalBlizzard.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/PetalDance.vb b/P3D/Pokemon/Attacks/Grass/PetalDance.vb index 539e55b38..19e0fafab 100644 --- a/P3D/Pokemon/Attacks/Grass/PetalDance.vb +++ b/P3D/Pokemon/Attacks/Grass/PetalDance.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsDanceMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Grass/PowerWhip.vb b/P3D/Pokemon/Attacks/Grass/PowerWhip.vb index d756d2a92512a17c4d776a0b56900196385255b3..bb72b0c4bdcddddccec7762327cae67430180663 100644 GIT binary patch delta 28 kcmaDS`#@$xGxy||Txyd)bC*rN$fhuvpNnJjRUSzu0JW$J<^TWy delta 70 zcmaDL^G&Z*Gt3dL+Ao*a1e6WfX Qpp5L~mt1O_J$b~L0R3(hlK=n! diff --git a/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb b/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb index 0f00d9e15..ccd4a880c 100644 --- a/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb +++ b/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/SeedBomb.vb b/P3D/Pokemon/Attacks/Grass/SeedBomb.vb index f3352f091..42e2a94cb 100644 --- a/P3D/Pokemon/Attacks/Grass/SeedBomb.vb +++ b/P3D/Pokemon/Attacks/Grass/SeedBomb.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/Seedflare.vb b/P3D/Pokemon/Attacks/Grass/Seedflare.vb index 7ca38f68d..68bd4b5ef 100644 --- a/P3D/Pokemon/Attacks/Grass/Seedflare.vb +++ b/P3D/Pokemon/Attacks/Grass/Seedflare.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/SleepPowder.vb b/P3D/Pokemon/Attacks/Grass/SleepPowder.vb index 0e53eff11..9164d3e17 100644 --- a/P3D/Pokemon/Attacks/Grass/SleepPowder.vb +++ b/P3D/Pokemon/Attacks/Grass/SleepPowder.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/SolarBeam.vb b/P3D/Pokemon/Attacks/Grass/SolarBeam.vb index 20fb40709..64c33b435 100644 --- a/P3D/Pokemon/Attacks/Grass/SolarBeam.vb +++ b/P3D/Pokemon/Attacks/Grass/SolarBeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/SolarBlade.vb b/P3D/Pokemon/Attacks/Grass/SolarBlade.vb index 0ae2fd864..0b5c6bbab 100644 --- a/P3D/Pokemon/Attacks/Grass/SolarBlade.vb +++ b/P3D/Pokemon/Attacks/Grass/SolarBlade.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/Spore.vb b/P3D/Pokemon/Attacks/Grass/Spore.vb index 854a67fb5..c08312cb1 100644 --- a/P3D/Pokemon/Attacks/Grass/Spore.vb +++ b/P3D/Pokemon/Attacks/Grass/Spore.vb @@ -37,11 +37,11 @@ Me.IsHealingMove = False Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = True Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.HasSecondaryEffect = False Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/Strength Sap.vb b/P3D/Pokemon/Attacks/Grass/Strength Sap.vb index d9bb5da02..605a27c97 100644 --- a/P3D/Pokemon/Attacks/Grass/Strength Sap.vb +++ b/P3D/Pokemon/Attacks/Grass/Strength Sap.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/StunSpore.vb b/P3D/Pokemon/Attacks/Grass/StunSpore.vb index 9c8a9fd06..1b0b96755 100644 --- a/P3D/Pokemon/Attacks/Grass/StunSpore.vb +++ b/P3D/Pokemon/Attacks/Grass/StunSpore.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/Synthesis.vb b/P3D/Pokemon/Attacks/Grass/Synthesis.vb index 41216b9d6..36f8967b0 100644 --- a/P3D/Pokemon/Attacks/Grass/Synthesis.vb +++ b/P3D/Pokemon/Attacks/Grass/Synthesis.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/TropKick.vb b/P3D/Pokemon/Attacks/Grass/TropKick.vb index 1adda3a9f..072830bdf 100644 --- a/P3D/Pokemon/Attacks/Grass/TropKick.vb +++ b/P3D/Pokemon/Attacks/Grass/TropKick.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/VineWhip.vb b/P3D/Pokemon/Attacks/Grass/VineWhip.vb index 7069bb891..bfde119a9 100644 --- a/P3D/Pokemon/Attacks/Grass/VineWhip.vb +++ b/P3D/Pokemon/Attacks/Grass/VineWhip.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/WoodHammer.vb b/P3D/Pokemon/Attacks/Grass/WoodHammer.vb index 5a1e6be87..5e1cc7f0a 100644 --- a/P3D/Pokemon/Attacks/Grass/WoodHammer.vb +++ b/P3D/Pokemon/Attacks/Grass/WoodHammer.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Grass/WorrySeed.vb b/P3D/Pokemon/Attacks/Grass/WorrySeed.vb index 733131107..62f2467d2 100644 --- a/P3D/Pokemon/Attacks/Grass/WorrySeed.vb +++ b/P3D/Pokemon/Attacks/Grass/WorrySeed.vb @@ -40,11 +40,11 @@ Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = True Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/BoneClub.vb b/P3D/Pokemon/Attacks/Ground/BoneClub.vb index 2408153f5..47058940f 100644 --- a/P3D/Pokemon/Attacks/Ground/BoneClub.vb +++ b/P3D/Pokemon/Attacks/Ground/BoneClub.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/BoneRush.vb b/P3D/Pokemon/Attacks/Ground/BoneRush.vb index 1dac12f85..524d756a3 100644 --- a/P3D/Pokemon/Attacks/Ground/BoneRush.vb +++ b/P3D/Pokemon/Attacks/Ground/BoneRush.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Bonemerang.vb b/P3D/Pokemon/Attacks/Ground/Bonemerang.vb index 4fd620745..1e5508754 100644 --- a/P3D/Pokemon/Attacks/Ground/Bonemerang.vb +++ b/P3D/Pokemon/Attacks/Ground/Bonemerang.vb @@ -37,11 +37,11 @@ Me.IsHealingMove = False Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.HasSecondaryEffect = False Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Bulldoze.vb b/P3D/Pokemon/Attacks/Ground/Bulldoze.vb index 02909d48e..707c29c64 100644 --- a/P3D/Pokemon/Attacks/Ground/Bulldoze.vb +++ b/P3D/Pokemon/Attacks/Ground/Bulldoze.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Dig.vb b/P3D/Pokemon/Attacks/Ground/Dig.vb index 32a4b8448..b96d03ea3 100644 --- a/P3D/Pokemon/Attacks/Ground/Dig.vb +++ b/P3D/Pokemon/Attacks/Ground/Dig.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/DrillRun.vb b/P3D/Pokemon/Attacks/Ground/DrillRun.vb index 868727a12f0f87317f768eaa87cbae4b4489beab..fb3d36da54536a09ae54d7b2a3f7f071c241a264 100644 GIT binary patch delta 20 ccmew)^F(^XR_@8t+-j3mdCE55=b6k109knl$p8QV delta 70 zcmaDN{YhrSR_@7vS>=R18HyPK7)lxP7?K$>7&3u$`s4?!)|0PuSApbtLGr;2`Ct_( QKpEM|(%fpBt9ddR0Vy#RdjJ3c diff --git a/P3D/Pokemon/Attacks/Ground/EarthPower.vb b/P3D/Pokemon/Attacks/Ground/EarthPower.vb index af6700775..e2be6275d 100644 --- a/P3D/Pokemon/Attacks/Ground/EarthPower.vb +++ b/P3D/Pokemon/Attacks/Ground/EarthPower.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Earthquake.vb b/P3D/Pokemon/Attacks/Ground/Earthquake.vb index aa8050dec..4a34ffcbe 100644 --- a/P3D/Pokemon/Attacks/Ground/Earthquake.vb +++ b/P3D/Pokemon/Attacks/Ground/Earthquake.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Fissure.vb b/P3D/Pokemon/Attacks/Ground/Fissure.vb index 69d90ca37..111a6b4cf 100644 --- a/P3D/Pokemon/Attacks/Ground/Fissure.vb +++ b/P3D/Pokemon/Attacks/Ground/Fissure.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = True diff --git a/P3D/Pokemon/Attacks/Ground/HighHorsepower.vb b/P3D/Pokemon/Attacks/Ground/HighHorsepower.vb index 1288c3f67..210daeb4b 100644 --- a/P3D/Pokemon/Attacks/Ground/HighHorsepower.vb +++ b/P3D/Pokemon/Attacks/Ground/HighHorsepower.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/LandsWrath.vb b/P3D/Pokemon/Attacks/Ground/LandsWrath.vb index 0f12a48fd..cfda45d76 100644 --- a/P3D/Pokemon/Attacks/Ground/LandsWrath.vb +++ b/P3D/Pokemon/Attacks/Ground/LandsWrath.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ground Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Magnitude.vb b/P3D/Pokemon/Attacks/Ground/Magnitude.vb index e74aa63b5..135af9fb7 100644 --- a/P3D/Pokemon/Attacks/Ground/Magnitude.vb +++ b/P3D/Pokemon/Attacks/Ground/Magnitude.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Mud-Slap.vb b/P3D/Pokemon/Attacks/Ground/Mud-Slap.vb index 2e35123d1..12c4772c0 100644 --- a/P3D/Pokemon/Attacks/Ground/Mud-Slap.vb +++ b/P3D/Pokemon/Attacks/Ground/Mud-Slap.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/MudBomb.vb b/P3D/Pokemon/Attacks/Ground/MudBomb.vb index f071c2f06..0fde1d153 100644 --- a/P3D/Pokemon/Attacks/Ground/MudBomb.vb +++ b/P3D/Pokemon/Attacks/Ground/MudBomb.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/MudShot.vb b/P3D/Pokemon/Attacks/Ground/MudShot.vb index 2764dbab6..a2b9e202b 100644 --- a/P3D/Pokemon/Attacks/Ground/MudShot.vb +++ b/P3D/Pokemon/Attacks/Ground/MudShot.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ground Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/MudSport.vb b/P3D/Pokemon/Attacks/Ground/MudSport.vb index dbf50acd2..e824f1851 100644 --- a/P3D/Pokemon/Attacks/Ground/MudSport.vb +++ b/P3D/Pokemon/Attacks/Ground/MudSport.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/PrecipiceBlades.vb b/P3D/Pokemon/Attacks/Ground/PrecipiceBlades.vb index d16bf05a8..3343d814e 100644 --- a/P3D/Pokemon/Attacks/Ground/PrecipiceBlades.vb +++ b/P3D/Pokemon/Attacks/Ground/PrecipiceBlades.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/SHoreUp.vb b/P3D/Pokemon/Attacks/Ground/SHoreUp.vb index 2849e6924..934c9ed1d 100644 --- a/P3D/Pokemon/Attacks/Ground/SHoreUp.vb +++ b/P3D/Pokemon/Attacks/Ground/SHoreUp.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/SandAttack.vb b/P3D/Pokemon/Attacks/Ground/SandAttack.vb index 88826a232..f9a147bf6 100644 --- a/P3D/Pokemon/Attacks/Ground/SandAttack.vb +++ b/P3D/Pokemon/Attacks/Ground/SandAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/SandTomb.vb b/P3D/Pokemon/Attacks/Ground/SandTomb.vb index d4c87393d..aa78cdc85 100644 --- a/P3D/Pokemon/Attacks/Ground/SandTomb.vb +++ b/P3D/Pokemon/Attacks/Ground/SandTomb.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/Spikes.vb b/P3D/Pokemon/Attacks/Ground/Spikes.vb index 66b8b6948..e02eccd57 100644 --- a/P3D/Pokemon/Attacks/Ground/Spikes.vb +++ b/P3D/Pokemon/Attacks/Ground/Spikes.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/ThousandArrows.vb b/P3D/Pokemon/Attacks/Ground/ThousandArrows.vb index 04f2d71b9..0d4c4ac23 100644 --- a/P3D/Pokemon/Attacks/Ground/ThousandArrows.vb +++ b/P3D/Pokemon/Attacks/Ground/ThousandArrows.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ground/ThousandWaves.vb b/P3D/Pokemon/Attacks/Ground/ThousandWaves.vb index c7b72e3e5..88437d487 100644 --- a/P3D/Pokemon/Attacks/Ground/ThousandWaves.vb +++ b/P3D/Pokemon/Attacks/Ground/ThousandWaves.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/AuroraBeam.vb b/P3D/Pokemon/Attacks/Ice/AuroraBeam.vb index d6241f9bf..b423259b8 100644 --- a/P3D/Pokemon/Attacks/Ice/AuroraBeam.vb +++ b/P3D/Pokemon/Attacks/Ice/AuroraBeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/Avalanche.vb b/P3D/Pokemon/Attacks/Ice/Avalanche.vb index 4737d419e..6fb7e8bf8 100644 --- a/P3D/Pokemon/Attacks/Ice/Avalanche.vb +++ b/P3D/Pokemon/Attacks/Ice/Avalanche.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/Blizzard.vb b/P3D/Pokemon/Attacks/Ice/Blizzard.vb index 4f694c9b5..5ab7bf104 100644 --- a/P3D/Pokemon/Attacks/Ice/Blizzard.vb +++ b/P3D/Pokemon/Attacks/Ice/Blizzard.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/FreezeDry.vb b/P3D/Pokemon/Attacks/Ice/FreezeDry.vb index f22eda36f..5781a985d 100644 --- a/P3D/Pokemon/Attacks/Ice/FreezeDry.vb +++ b/P3D/Pokemon/Attacks/Ice/FreezeDry.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ice Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/FreezeShock.vb b/P3D/Pokemon/Attacks/Ice/FreezeShock.vb index aaff82695..4bbf3cad1 100644 --- a/P3D/Pokemon/Attacks/Ice/FreezeShock.vb +++ b/P3D/Pokemon/Attacks/Ice/FreezeShock.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/FrostBreath.vb b/P3D/Pokemon/Attacks/Ice/FrostBreath.vb index 4087a26dd..5c5f916fb 100644 --- a/P3D/Pokemon/Attacks/Ice/FrostBreath.vb +++ b/P3D/Pokemon/Attacks/Ice/FrostBreath.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ice Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/Glaciate.vb b/P3D/Pokemon/Attacks/Ice/Glaciate.vb index 7250a5fee..99da70cd3 100644 --- a/P3D/Pokemon/Attacks/Ice/Glaciate.vb +++ b/P3D/Pokemon/Attacks/Ice/Glaciate.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/Hail.vb b/P3D/Pokemon/Attacks/Ice/Hail.vb index e501ba894..e419ab659 100644 --- a/P3D/Pokemon/Attacks/Ice/Hail.vb +++ b/P3D/Pokemon/Attacks/Ice/Hail.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/Haze.vb b/P3D/Pokemon/Attacks/Ice/Haze.vb index 247d744e2..67c7825d9 100644 --- a/P3D/Pokemon/Attacks/Ice/Haze.vb +++ b/P3D/Pokemon/Attacks/Ice/Haze.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IceBall.vb b/P3D/Pokemon/Attacks/Ice/IceBall.vb index db2054dc9..1ac89aa83 100644 --- a/P3D/Pokemon/Attacks/Ice/IceBall.vb +++ b/P3D/Pokemon/Attacks/Ice/IceBall.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsBulletMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Ice/IceBeam.vb b/P3D/Pokemon/Attacks/Ice/IceBeam.vb index c19c87207..619f9dd0f 100644 --- a/P3D/Pokemon/Attacks/Ice/IceBeam.vb +++ b/P3D/Pokemon/Attacks/Ice/IceBeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IceBurn.vb b/P3D/Pokemon/Attacks/Ice/IceBurn.vb index fffbdef41..456b05daf 100644 --- a/P3D/Pokemon/Attacks/Ice/IceBurn.vb +++ b/P3D/Pokemon/Attacks/Ice/IceBurn.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IceFang.vb b/P3D/Pokemon/Attacks/Ice/IceFang.vb index b46af5a75..6af7475ac 100644 --- a/P3D/Pokemon/Attacks/Ice/IceFang.vb +++ b/P3D/Pokemon/Attacks/Ice/IceFang.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IceHammer.vb b/P3D/Pokemon/Attacks/Ice/IceHammer.vb index 1748be232..810ecbbee 100644 --- a/P3D/Pokemon/Attacks/Ice/IceHammer.vb +++ b/P3D/Pokemon/Attacks/Ice/IceHammer.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IcePunch.vb b/P3D/Pokemon/Attacks/Ice/IcePunch.vb index 1b9850b76..81097dd5e 100644 --- a/P3D/Pokemon/Attacks/Ice/IcePunch.vb +++ b/P3D/Pokemon/Attacks/Ice/IcePunch.vb @@ -44,7 +44,7 @@ Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IceShard.vb b/P3D/Pokemon/Attacks/Ice/IceShard.vb index bf269686c..10e774c6d 100644 --- a/P3D/Pokemon/Attacks/Ice/IceShard.vb +++ b/P3D/Pokemon/Attacks/Ice/IceShard.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ice Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IcicleCrash.vb b/P3D/Pokemon/Attacks/Ice/IcicleCrash.vb index d6e330d32ead94920b4895993b394fdd87b2b012..d8aa366814d450c5ed446543691b4d239791eec2 100644 GIT binary patch delta 24 gcmeyO@l1WgZtlr1dDJFr^OQ}l=TzIw&6~*%0EU$b3IG5A delta 60 zcmaE+{zYTMZtltU9CEy#48;rq45bWt49N@`ll{0|CqLvagUbXnCePz`-rUHO G$_@ZB)De0B diff --git a/P3D/Pokemon/Attacks/Ice/IcicleSpear.vb b/P3D/Pokemon/Attacks/Ice/IcicleSpear.vb index 9f2240da1..f554e6244 100644 --- a/P3D/Pokemon/Attacks/Ice/IcicleSpear.vb +++ b/P3D/Pokemon/Attacks/Ice/IcicleSpear.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Ice Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/IcyWind.vb b/P3D/Pokemon/Attacks/Ice/IcyWind.vb index 9abfba34a..ae0f42f41 100644 --- a/P3D/Pokemon/Attacks/Ice/IcyWind.vb +++ b/P3D/Pokemon/Attacks/Ice/IcyWind.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/Mist.vb b/P3D/Pokemon/Attacks/Ice/Mist.vb index b0bbbc661..a44330a1d 100644 --- a/P3D/Pokemon/Attacks/Ice/Mist.vb +++ b/P3D/Pokemon/Attacks/Ice/Mist.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/PowderSnow.vb b/P3D/Pokemon/Attacks/Ice/PowderSnow.vb index 5347058e2..a2b421d6a 100644 --- a/P3D/Pokemon/Attacks/Ice/PowderSnow.vb +++ b/P3D/Pokemon/Attacks/Ice/PowderSnow.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Ice/SheerCold.vb b/P3D/Pokemon/Attacks/Ice/SheerCold.vb index f178397ee..9b4aebcf9 100644 --- a/P3D/Pokemon/Attacks/Ice/SheerCold.vb +++ b/P3D/Pokemon/Attacks/Ice/SheerCold.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Acupressure.vb b/P3D/Pokemon/Attacks/Normal/Acupressure.vb index bc383747e..e709b4823 100644 --- a/P3D/Pokemon/Attacks/Normal/Acupressure.vb +++ b/P3D/Pokemon/Attacks/Normal/Acupressure.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Assist.vb b/P3D/Pokemon/Attacks/Normal/Assist.vb index b834027a2..925566b11 100644 --- a/P3D/Pokemon/Attacks/Normal/Assist.vb +++ b/P3D/Pokemon/Attacks/Normal/Assist.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Attract.vb b/P3D/Pokemon/Attacks/Normal/Attract.vb index f139654fb..90e4e4cb2 100644 --- a/P3D/Pokemon/Attacks/Normal/Attract.vb +++ b/P3D/Pokemon/Attacks/Normal/Attract.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Barrage.vb b/P3D/Pokemon/Attacks/Normal/Barrage.vb index 8ca4290b1..f188e0f44 100644 --- a/P3D/Pokemon/Attacks/Normal/Barrage.vb +++ b/P3D/Pokemon/Attacks/Normal/Barrage.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/BatonPass.vb b/P3D/Pokemon/Attacks/Normal/BatonPass.vb index 286a611b2..ed81cb8c8 100644 --- a/P3D/Pokemon/Attacks/Normal/BatonPass.vb +++ b/P3D/Pokemon/Attacks/Normal/BatonPass.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/BellyDrum.vb b/P3D/Pokemon/Attacks/Normal/BellyDrum.vb index fb050eb30..b063948ab 100644 --- a/P3D/Pokemon/Attacks/Normal/BellyDrum.vb +++ b/P3D/Pokemon/Attacks/Normal/BellyDrum.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Bestow.vb b/P3D/Pokemon/Attacks/Normal/Bestow.vb index c895693d5..b54d12fea 100644 --- a/P3D/Pokemon/Attacks/Normal/Bestow.vb +++ b/P3D/Pokemon/Attacks/Normal/Bestow.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Bide.vb b/P3D/Pokemon/Attacks/Normal/Bide.vb index a9007a872..06b5224d8 100644 --- a/P3D/Pokemon/Attacks/Normal/Bide.vb +++ b/P3D/Pokemon/Attacks/Normal/Bide.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Bind.vb b/P3D/Pokemon/Attacks/Normal/Bind.vb index cbe93c57b..0e0d60b6b 100644 --- a/P3D/Pokemon/Attacks/Normal/Bind.vb +++ b/P3D/Pokemon/Attacks/Normal/Bind.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Block.vb b/P3D/Pokemon/Attacks/Normal/Block.vb index 5fcdaa557..147f59df9 100644 --- a/P3D/Pokemon/Attacks/Normal/Block.vb +++ b/P3D/Pokemon/Attacks/Normal/Block.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/BodySlam.vb b/P3D/Pokemon/Attacks/Normal/BodySlam.vb index d5a24e063..fde6713b1 100644 --- a/P3D/Pokemon/Attacks/Normal/BodySlam.vb +++ b/P3D/Pokemon/Attacks/Normal/BodySlam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Boomburst.vb b/P3D/Pokemon/Attacks/Normal/Boomburst.vb index 73fd9a659..372d20e81 100644 --- a/P3D/Pokemon/Attacks/Normal/Boomburst.vb +++ b/P3D/Pokemon/Attacks/Normal/Boomburst.vb @@ -41,7 +41,7 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Captivate.vb b/P3D/Pokemon/Attacks/Normal/Captivate.vb index 63e015937a1539a096c9846c3ad8c8d0d976e02f..14b66c63ff4359061093abfdb225fc4c3c7dea31 100644 GIT binary patch delta 16 YcmeyTzeRt;Y3|9roJyO`d5&`f06_@`ssI20 delta 34 qcmdm@|4)CzY3|AVY;wGw48;rq45bWt49N@`ljFEuH-F?l%nbm;+6v+T diff --git a/P3D/Pokemon/Attacks/Normal/Celebrate.vb b/P3D/Pokemon/Attacks/Normal/Celebrate.vb index 688d2f87e..11991c023 100644 --- a/P3D/Pokemon/Attacks/Normal/Celebrate.vb +++ b/P3D/Pokemon/Attacks/Normal/Celebrate.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/ChipAway.vb b/P3D/Pokemon/Attacks/Normal/ChipAway.vb index a81848b9e..fd5932764 100644 --- a/P3D/Pokemon/Attacks/Normal/ChipAway.vb +++ b/P3D/Pokemon/Attacks/Normal/ChipAway.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/CometPunch.vb b/P3D/Pokemon/Attacks/Normal/CometPunch.vb index bb4367d33..1c43d64d8 100644 --- a/P3D/Pokemon/Attacks/Normal/CometPunch.vb +++ b/P3D/Pokemon/Attacks/Normal/CometPunch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Confide.vb b/P3D/Pokemon/Attacks/Normal/Confide.vb index 4d2e9b5bc..d4d11f683 100644 --- a/P3D/Pokemon/Attacks/Normal/Confide.vb +++ b/P3D/Pokemon/Attacks/Normal/Confide.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Constrict.vb b/P3D/Pokemon/Attacks/Normal/Constrict.vb index b4f58a4ba..e4f1b3fbd 100644 --- a/P3D/Pokemon/Attacks/Normal/Constrict.vb +++ b/P3D/Pokemon/Attacks/Normal/Constrict.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Conversion.vb b/P3D/Pokemon/Attacks/Normal/Conversion.vb index c42ef4b82..1eaedcc26 100644 --- a/P3D/Pokemon/Attacks/Normal/Conversion.vb +++ b/P3D/Pokemon/Attacks/Normal/Conversion.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Conversion2.vb b/P3D/Pokemon/Attacks/Normal/Conversion2.vb index e83ba0107..c936222cc 100644 --- a/P3D/Pokemon/Attacks/Normal/Conversion2.vb +++ b/P3D/Pokemon/Attacks/Normal/Conversion2.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Covet.vb b/P3D/Pokemon/Attacks/Normal/Covet.vb index 9342a56bb..dbd8d9c2a 100644 --- a/P3D/Pokemon/Attacks/Normal/Covet.vb +++ b/P3D/Pokemon/Attacks/Normal/Covet.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/CrushClaw.vb b/P3D/Pokemon/Attacks/Normal/CrushClaw.vb index bd29fc61b..83910e448 100644 --- a/P3D/Pokemon/Attacks/Normal/CrushClaw.vb +++ b/P3D/Pokemon/Attacks/Normal/CrushClaw.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/CrushGrip.vb b/P3D/Pokemon/Attacks/Normal/CrushGrip.vb index c392953a1..072aac912 100644 --- a/P3D/Pokemon/Attacks/Normal/CrushGrip.vb +++ b/P3D/Pokemon/Attacks/Normal/CrushGrip.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Cut.vb b/P3D/Pokemon/Attacks/Normal/Cut.vb index 1718931ee..dc8d097e3 100644 --- a/P3D/Pokemon/Attacks/Normal/Cut.vb +++ b/P3D/Pokemon/Attacks/Normal/Cut.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/DefenseCurl.vb b/P3D/Pokemon/Attacks/Normal/DefenseCurl.vb index 90646e24a..aea7de654 100644 --- a/P3D/Pokemon/Attacks/Normal/DefenseCurl.vb +++ b/P3D/Pokemon/Attacks/Normal/DefenseCurl.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/DizzyPunch.vb b/P3D/Pokemon/Attacks/Normal/DizzyPunch.vb index 37cc7518a..99ad3a2e4 100644 --- a/P3D/Pokemon/Attacks/Normal/DizzyPunch.vb +++ b/P3D/Pokemon/Attacks/Normal/DizzyPunch.vb @@ -44,7 +44,7 @@ Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/DoubleEdge.vb b/P3D/Pokemon/Attacks/Normal/DoubleEdge.vb index 263aca5eb..f696a66bd 100644 --- a/P3D/Pokemon/Attacks/Normal/DoubleEdge.vb +++ b/P3D/Pokemon/Attacks/Normal/DoubleEdge.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/DoubleHit.vb b/P3D/Pokemon/Attacks/Normal/DoubleHit.vb index 5d9e09773d462789754a55fb3f7666aa5c7ac07b..19213658100411de8bb0b1e1983d1296539a0bb4 100644 GIT binary patch delta 28 kcmaDS^FVsTM()Y?dDJE=@{~>f&!#Z>JS*2`R^CiT0I^mIqyPW_ delta 64 zcmaDL{Z3}XM()Y~d6YN<7)lxP7?K$>CO_a7oovs;2NIopox2Py8_bXomQR^%z@s=> Mnp diff --git a/P3D/Pokemon/Attacks/Normal/DoubleSlap.vb b/P3D/Pokemon/Attacks/Normal/DoubleSlap.vb index 39b4e5639..e315f329f 100644 --- a/P3D/Pokemon/Attacks/Normal/DoubleSlap.vb +++ b/P3D/Pokemon/Attacks/Normal/DoubleSlap.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/DoubleTeam.vb b/P3D/Pokemon/Attacks/Normal/DoubleTeam.vb index f2515d3e7..74b2510d0 100644 --- a/P3D/Pokemon/Attacks/Normal/DoubleTeam.vb +++ b/P3D/Pokemon/Attacks/Normal/DoubleTeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/EchoedVoice.vb b/P3D/Pokemon/Attacks/Normal/EchoedVoice.vb index 421e498d0..09bdaefa5 100644 --- a/P3D/Pokemon/Attacks/Normal/EchoedVoice.vb +++ b/P3D/Pokemon/Attacks/Normal/EchoedVoice.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/EggBomb.vb b/P3D/Pokemon/Attacks/Normal/EggBomb.vb index dce8fc5eb..b4aeb0f36 100644 --- a/P3D/Pokemon/Attacks/Normal/EggBomb.vb +++ b/P3D/Pokemon/Attacks/Normal/EggBomb.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Encore.vb b/P3D/Pokemon/Attacks/Normal/Encore.vb index 8a5202b21..826f4bb10 100644 --- a/P3D/Pokemon/Attacks/Normal/Encore.vb +++ b/P3D/Pokemon/Attacks/Normal/Encore.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Endeavor.vb b/P3D/Pokemon/Attacks/Normal/Endeavor.vb index 383916f78..040bd79a6 100644 --- a/P3D/Pokemon/Attacks/Normal/Endeavor.vb +++ b/P3D/Pokemon/Attacks/Normal/Endeavor.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Endure.vb b/P3D/Pokemon/Attacks/Normal/Endure.vb index 8f370d90d..a8aeb7a51 100644 --- a/P3D/Pokemon/Attacks/Normal/Endure.vb +++ b/P3D/Pokemon/Attacks/Normal/Endure.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = True - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Entrainment.vb b/P3D/Pokemon/Attacks/Normal/Entrainment.vb index e2ca13513..fb9714199 100644 --- a/P3D/Pokemon/Attacks/Normal/Entrainment.vb +++ b/P3D/Pokemon/Attacks/Normal/Entrainment.vb @@ -40,11 +40,11 @@ Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = True Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Explosion.vb b/P3D/Pokemon/Attacks/Normal/Explosion.vb index 965994844..5d2cbb068 100644 --- a/P3D/Pokemon/Attacks/Normal/Explosion.vb +++ b/P3D/Pokemon/Attacks/Normal/Explosion.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsExplosiveMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Normal/ExtremeSpeed.vb b/P3D/Pokemon/Attacks/Normal/ExtremeSpeed.vb index 3892af939..89ee71dad 100644 --- a/P3D/Pokemon/Attacks/Normal/ExtremeSpeed.vb +++ b/P3D/Pokemon/Attacks/Normal/ExtremeSpeed.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Facade.vb b/P3D/Pokemon/Attacks/Normal/Facade.vb index fcf059fab..8e9ce7f01 100644 --- a/P3D/Pokemon/Attacks/Normal/Facade.vb +++ b/P3D/Pokemon/Attacks/Normal/Facade.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/FakeOut.vb b/P3D/Pokemon/Attacks/Normal/FakeOut.vb index 9fe0ee3cd..f72a7b0e6 100644 --- a/P3D/Pokemon/Attacks/Normal/FakeOut.vb +++ b/P3D/Pokemon/Attacks/Normal/FakeOut.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/FalseSwipe.vb b/P3D/Pokemon/Attacks/Normal/FalseSwipe.vb index 3a53277fe..2d84dceae 100644 --- a/P3D/Pokemon/Attacks/Normal/FalseSwipe.vb +++ b/P3D/Pokemon/Attacks/Normal/FalseSwipe.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Feint.vb b/P3D/Pokemon/Attacks/Normal/Feint.vb index 7602646e1..f08461325 100644 --- a/P3D/Pokemon/Attacks/Normal/Feint.vb +++ b/P3D/Pokemon/Attacks/Normal/Feint.vb @@ -44,7 +44,7 @@ Namespace BattleSystem.Moves.Normal Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Flail.vb b/P3D/Pokemon/Attacks/Normal/Flail.vb index f9a3e153f..756060fb2 100644 --- a/P3D/Pokemon/Attacks/Normal/Flail.vb +++ b/P3D/Pokemon/Attacks/Normal/Flail.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/FocusEnergy.vb b/P3D/Pokemon/Attacks/Normal/FocusEnergy.vb index a5f72fb42..f4dc1cb97 100644 --- a/P3D/Pokemon/Attacks/Normal/FocusEnergy.vb +++ b/P3D/Pokemon/Attacks/Normal/FocusEnergy.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Foresight.vb b/P3D/Pokemon/Attacks/Normal/Foresight.vb index 8e98c73b7..bf7882f7f 100644 --- a/P3D/Pokemon/Attacks/Normal/Foresight.vb +++ b/P3D/Pokemon/Attacks/Normal/Foresight.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Frustration.vb b/P3D/Pokemon/Attacks/Normal/Frustration.vb index f53e23add..e7e60fede 100644 --- a/P3D/Pokemon/Attacks/Normal/Frustration.vb +++ b/P3D/Pokemon/Attacks/Normal/Frustration.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/FuryAttack.vb b/P3D/Pokemon/Attacks/Normal/FuryAttack.vb index 587cb7d80..52562c547 100644 --- a/P3D/Pokemon/Attacks/Normal/FuryAttack.vb +++ b/P3D/Pokemon/Attacks/Normal/FuryAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/FurySwipes.vb b/P3D/Pokemon/Attacks/Normal/FurySwipes.vb index 169e0e5ca..8693ecc29 100644 --- a/P3D/Pokemon/Attacks/Normal/FurySwipes.vb +++ b/P3D/Pokemon/Attacks/Normal/FurySwipes.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/GigaImpact.vb b/P3D/Pokemon/Attacks/Normal/GigaImpact.vb index 72caf4ef7..7835d8ca1 100644 --- a/P3D/Pokemon/Attacks/Normal/GigaImpact.vb +++ b/P3D/Pokemon/Attacks/Normal/GigaImpact.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Glare.vb b/P3D/Pokemon/Attacks/Normal/Glare.vb index c72f9098b..f33a20313 100644 --- a/P3D/Pokemon/Attacks/Normal/Glare.vb +++ b/P3D/Pokemon/Attacks/Normal/Glare.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Growl.vb b/P3D/Pokemon/Attacks/Normal/Growl.vb index 8807ddefc..0c8fcd60e 100644 --- a/P3D/Pokemon/Attacks/Normal/Growl.vb +++ b/P3D/Pokemon/Attacks/Normal/Growl.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Growth.vb b/P3D/Pokemon/Attacks/Normal/Growth.vb index 2bcbf37f2..fcbffbf02 100644 --- a/P3D/Pokemon/Attacks/Normal/Growth.vb +++ b/P3D/Pokemon/Attacks/Normal/Growth.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Guillotine.vb b/P3D/Pokemon/Attacks/Normal/Guillotine.vb index b1e1e49e3..6d2f2a66e 100644 --- a/P3D/Pokemon/Attacks/Normal/Guillotine.vb +++ b/P3D/Pokemon/Attacks/Normal/Guillotine.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Harden.vb b/P3D/Pokemon/Attacks/Normal/Harden.vb index ec86f7807..edafd7ede 100644 --- a/P3D/Pokemon/Attacks/Normal/Harden.vb +++ b/P3D/Pokemon/Attacks/Normal/Harden.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/HeadCharge.vb b/P3D/Pokemon/Attacks/Normal/HeadCharge.vb index ed01d0ef3..4c643c4ad 100644 --- a/P3D/Pokemon/Attacks/Normal/HeadCharge.vb +++ b/P3D/Pokemon/Attacks/Normal/HeadCharge.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Headbutt.vb b/P3D/Pokemon/Attacks/Normal/Headbutt.vb index 81a44d6e8..af2cb4854 100644 --- a/P3D/Pokemon/Attacks/Normal/Headbutt.vb +++ b/P3D/Pokemon/Attacks/Normal/Headbutt.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/HealBell.vb b/P3D/Pokemon/Attacks/Normal/HealBell.vb index fdb97f57b..e578b4c0e 100644 --- a/P3D/Pokemon/Attacks/Normal/HealBell.vb +++ b/P3D/Pokemon/Attacks/Normal/HealBell.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/HiddenPower.vb b/P3D/Pokemon/Attacks/Normal/HiddenPower.vb index d3138049d..8318b6491 100644 --- a/P3D/Pokemon/Attacks/Normal/HiddenPower.vb +++ b/P3D/Pokemon/Attacks/Normal/HiddenPower.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/HoldBack.vb b/P3D/Pokemon/Attacks/Normal/HoldBack.vb index bf7406eef..f57cd599b 100644 --- a/P3D/Pokemon/Attacks/Normal/HoldBack.vb +++ b/P3D/Pokemon/Attacks/Normal/HoldBack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/HornAttack.vb b/P3D/Pokemon/Attacks/Normal/HornAttack.vb index ea3c78710..ac072a4ae 100644 --- a/P3D/Pokemon/Attacks/Normal/HornAttack.vb +++ b/P3D/Pokemon/Attacks/Normal/HornAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/HornDrill.vb b/P3D/Pokemon/Attacks/Normal/HornDrill.vb index 27e327c27..23471622d 100644 --- a/P3D/Pokemon/Attacks/Normal/HornDrill.vb +++ b/P3D/Pokemon/Attacks/Normal/HornDrill.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Howl.vb b/P3D/Pokemon/Attacks/Normal/Howl.vb index d12d01f01..ae416c383 100644 --- a/P3D/Pokemon/Attacks/Normal/Howl.vb +++ b/P3D/Pokemon/Attacks/Normal/Howl.vb @@ -41,7 +41,7 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/HyperBeam.vb b/P3D/Pokemon/Attacks/Normal/HyperBeam.vb index c91d920a4..b13bf3ccc 100644 --- a/P3D/Pokemon/Attacks/Normal/HyperBeam.vb +++ b/P3D/Pokemon/Attacks/Normal/HyperBeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/HyperFang.vb b/P3D/Pokemon/Attacks/Normal/HyperFang.vb index 7c3eb6a8b..dbafdf1a7 100644 --- a/P3D/Pokemon/Attacks/Normal/HyperFang.vb +++ b/P3D/Pokemon/Attacks/Normal/HyperFang.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/HyperVoice.vb b/P3D/Pokemon/Attacks/Normal/HyperVoice.vb index ad9d8794b..77b8f1c6e 100644 --- a/P3D/Pokemon/Attacks/Normal/HyperVoice.vb +++ b/P3D/Pokemon/Attacks/Normal/HyperVoice.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Judgement.vb b/P3D/Pokemon/Attacks/Normal/Judgement.vb index 847e53f26..132656a49 100644 --- a/P3D/Pokemon/Attacks/Normal/Judgement.vb +++ b/P3D/Pokemon/Attacks/Normal/Judgement.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/LastResort.vb b/P3D/Pokemon/Attacks/Normal/LastResort.vb index 6474a7261..8377fc9c5 100644 --- a/P3D/Pokemon/Attacks/Normal/LastResort.vb +++ b/P3D/Pokemon/Attacks/Normal/LastResort.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Leer.vb b/P3D/Pokemon/Attacks/Normal/Leer.vb index 17f0d6b17..12a20f18c 100644 --- a/P3D/Pokemon/Attacks/Normal/Leer.vb +++ b/P3D/Pokemon/Attacks/Normal/Leer.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/LockOn.vb b/P3D/Pokemon/Attacks/Normal/LockOn.vb index 0704b116b..8b0632e4d 100644 --- a/P3D/Pokemon/Attacks/Normal/LockOn.vb +++ b/P3D/Pokemon/Attacks/Normal/LockOn.vb @@ -37,11 +37,11 @@ Me.IsHealingMove = False Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = False Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.HasSecondaryEffect = False Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/LovelyKiss.vb b/P3D/Pokemon/Attacks/Normal/LovelyKiss.vb index 953a86ba9..5e338aa91 100644 --- a/P3D/Pokemon/Attacks/Normal/LovelyKiss.vb +++ b/P3D/Pokemon/Attacks/Normal/LovelyKiss.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/MeanLook.vb b/P3D/Pokemon/Attacks/Normal/MeanLook.vb index acf9e049a..0361a6ffb 100644 --- a/P3D/Pokemon/Attacks/Normal/MeanLook.vb +++ b/P3D/Pokemon/Attacks/Normal/MeanLook.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/MegaKick.vb b/P3D/Pokemon/Attacks/Normal/MegaKick.vb index 09355d38f..368171e95 100644 --- a/P3D/Pokemon/Attacks/Normal/MegaKick.vb +++ b/P3D/Pokemon/Attacks/Normal/MegaKick.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/MegaPunch.vb b/P3D/Pokemon/Attacks/Normal/MegaPunch.vb index 6a1f8bd75..d2bae4bde 100644 --- a/P3D/Pokemon/Attacks/Normal/MegaPunch.vb +++ b/P3D/Pokemon/Attacks/Normal/MegaPunch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Metronome.vb b/P3D/Pokemon/Attacks/Normal/Metronome.vb index 8f540a223..24f41544c 100644 --- a/P3D/Pokemon/Attacks/Normal/Metronome.vb +++ b/P3D/Pokemon/Attacks/Normal/Metronome.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/MilkDrink.vb b/P3D/Pokemon/Attacks/Normal/MilkDrink.vb index d10c6cbbc..afda138df 100644 --- a/P3D/Pokemon/Attacks/Normal/MilkDrink.vb +++ b/P3D/Pokemon/Attacks/Normal/MilkDrink.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Mimic.vb b/P3D/Pokemon/Attacks/Normal/Mimic.vb index 463cbbad5..3eb68a726 100644 --- a/P3D/Pokemon/Attacks/Normal/Mimic.vb +++ b/P3D/Pokemon/Attacks/Normal/Mimic.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/MindReader.vb b/P3D/Pokemon/Attacks/Normal/MindReader.vb index c2225e56f..fb9fc55bf 100644 --- a/P3D/Pokemon/Attacks/Normal/MindReader.vb +++ b/P3D/Pokemon/Attacks/Normal/MindReader.vb @@ -37,11 +37,11 @@ Me.IsHealingMove = False Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = False Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.HasSecondaryEffect = False Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Minimize.vb b/P3D/Pokemon/Attacks/Normal/Minimize.vb index 9d845fe8e..e37310719 100644 --- a/P3D/Pokemon/Attacks/Normal/Minimize.vb +++ b/P3D/Pokemon/Attacks/Normal/Minimize.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/MorningSun.vb b/P3D/Pokemon/Attacks/Normal/MorningSun.vb index 1e4b4b480..2ee5efeea 100644 --- a/P3D/Pokemon/Attacks/Normal/MorningSun.vb +++ b/P3D/Pokemon/Attacks/Normal/MorningSun.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/NaturalGift.vb b/P3D/Pokemon/Attacks/Normal/NaturalGift.vb index 16d0927c1..ed9de92c3 100644 --- a/P3D/Pokemon/Attacks/Normal/NaturalGift.vb +++ b/P3D/Pokemon/Attacks/Normal/NaturalGift.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/NaturePower.vb b/P3D/Pokemon/Attacks/Normal/NaturePower.vb index a79cfef1c..6ffe0be4e 100644 --- a/P3D/Pokemon/Attacks/Normal/NaturePower.vb +++ b/P3D/Pokemon/Attacks/Normal/NaturePower.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/NobleRoar.vb b/P3D/Pokemon/Attacks/Normal/NobleRoar.vb index ef32743bd..d1b177bb5 100644 --- a/P3D/Pokemon/Attacks/Normal/NobleRoar.vb +++ b/P3D/Pokemon/Attacks/Normal/NobleRoar.vb @@ -41,7 +41,7 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/OdorSleuth.vb b/P3D/Pokemon/Attacks/Normal/OdorSleuth.vb index 7ad0e6542..50d0b0f3d 100644 --- a/P3D/Pokemon/Attacks/Normal/OdorSleuth.vb +++ b/P3D/Pokemon/Attacks/Normal/OdorSleuth.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/PainSplit.vb b/P3D/Pokemon/Attacks/Normal/PainSplit.vb index adcc4e7cc..ebf3f807c 100644 --- a/P3D/Pokemon/Attacks/Normal/PainSplit.vb +++ b/P3D/Pokemon/Attacks/Normal/PainSplit.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/PayDay.vb b/P3D/Pokemon/Attacks/Normal/PayDay.vb index e7d04253a..5aa686e44 100644 --- a/P3D/Pokemon/Attacks/Normal/PayDay.vb +++ b/P3D/Pokemon/Attacks/Normal/PayDay.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/PerishSong.vb b/P3D/Pokemon/Attacks/Normal/PerishSong.vb index 9ef04a264..dde946a42 100644 --- a/P3D/Pokemon/Attacks/Normal/PerishSong.vb +++ b/P3D/Pokemon/Attacks/Normal/PerishSong.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/PlayNice.vb b/P3D/Pokemon/Attacks/Normal/PlayNice.vb index 11ddebcd8..fc9dbd723 100644 --- a/P3D/Pokemon/Attacks/Normal/PlayNice.vb +++ b/P3D/Pokemon/Attacks/Normal/PlayNice.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Pound.vb b/P3D/Pokemon/Attacks/Normal/Pound.vb index a270da3e1..8074f92e3 100644 --- a/P3D/Pokemon/Attacks/Normal/Pound.vb +++ b/P3D/Pokemon/Attacks/Normal/Pound.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Present.vb b/P3D/Pokemon/Attacks/Normal/Present.vb index 10959cdf7..811a727fe 100644 --- a/P3D/Pokemon/Attacks/Normal/Present.vb +++ b/P3D/Pokemon/Attacks/Normal/Present.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Protect.vb b/P3D/Pokemon/Attacks/Normal/Protect.vb index b3eda906f..16fe01f05 100644 --- a/P3D/Pokemon/Attacks/Normal/Protect.vb +++ b/P3D/Pokemon/Attacks/Normal/Protect.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = True - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/PsychUp.vb b/P3D/Pokemon/Attacks/Normal/PsychUp.vb index 0109ea457..3042f986e 100644 --- a/P3D/Pokemon/Attacks/Normal/PsychUp.vb +++ b/P3D/Pokemon/Attacks/Normal/PsychUp.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/QuickAttack.vb b/P3D/Pokemon/Attacks/Normal/QuickAttack.vb index bfb5decdb..77d0d3ab3 100644 --- a/P3D/Pokemon/Attacks/Normal/QuickAttack.vb +++ b/P3D/Pokemon/Attacks/Normal/QuickAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Rage.vb b/P3D/Pokemon/Attacks/Normal/Rage.vb index cf368759a..cdd67440c 100644 --- a/P3D/Pokemon/Attacks/Normal/Rage.vb +++ b/P3D/Pokemon/Attacks/Normal/Rage.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/RapidSpin.vb b/P3D/Pokemon/Attacks/Normal/RapidSpin.vb index 519fe217c..847e4755c 100644 --- a/P3D/Pokemon/Attacks/Normal/RapidSpin.vb +++ b/P3D/Pokemon/Attacks/Normal/RapidSpin.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/RazorWind.vb b/P3D/Pokemon/Attacks/Normal/RazorWind.vb index f92e96799..67e55ddf6 100644 --- a/P3D/Pokemon/Attacks/Normal/RazorWind.vb +++ b/P3D/Pokemon/Attacks/Normal/RazorWind.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Recover.vb b/P3D/Pokemon/Attacks/Normal/Recover.vb index a1eb60d0a..13bedf4a5 100644 --- a/P3D/Pokemon/Attacks/Normal/Recover.vb +++ b/P3D/Pokemon/Attacks/Normal/Recover.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Recycle.vb b/P3D/Pokemon/Attacks/Normal/Recycle.vb index f6069b72d..b7cc703c2 100644 --- a/P3D/Pokemon/Attacks/Normal/Recycle.vb +++ b/P3D/Pokemon/Attacks/Normal/Recycle.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/ReflectType.vb b/P3D/Pokemon/Attacks/Normal/ReflectType.vb index 628fde77d..eb707d620 100644 --- a/P3D/Pokemon/Attacks/Normal/ReflectType.vb +++ b/P3D/Pokemon/Attacks/Normal/ReflectType.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Refresh.vb b/P3D/Pokemon/Attacks/Normal/Refresh.vb index f86ae909dcc85f9c0a045cc082501ce9edf14b2f..f9cf00d34bf124c20dd1d7cbafd4ca386ba0a9a2 100644 GIT binary patch delta 28 kcmeyR_eOVvH}_Px# delta 60 zcmaE(`%7CO2@)PUh!S K+RV>$mkR(w?h&*A diff --git a/P3D/Pokemon/Attacks/Normal/Return.vb b/P3D/Pokemon/Attacks/Normal/Return.vb index 635ae371f..6fa06fcc1 100644 --- a/P3D/Pokemon/Attacks/Normal/Return.vb +++ b/P3D/Pokemon/Attacks/Normal/Return.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/RevelationDance.vb b/P3D/Pokemon/Attacks/Normal/RevelationDance.vb index 8dd69556a..fd67064d8 100644 --- a/P3D/Pokemon/Attacks/Normal/RevelationDance.vb +++ b/P3D/Pokemon/Attacks/Normal/RevelationDance.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsDanceMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Normal/Roar.vb b/P3D/Pokemon/Attacks/Normal/Roar.vb index 877da138f..533837d6c 100644 --- a/P3D/Pokemon/Attacks/Normal/Roar.vb +++ b/P3D/Pokemon/Attacks/Normal/Roar.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/RockClimb.vb b/P3D/Pokemon/Attacks/Normal/RockClimb.vb index 5e404c8f0944198a6e34683c5ba8f4b6fd5de3c5..64209c810c1cc011b036925ba187350b777aaad5 100644 GIT binary patch delta 24 gcmeyN{7PxVUhc`SdDJHB@{~<(CI@i4PJYZ?2A2tD$Op@%OkTk4yt$d@ GIST+$V-mjr diff --git a/P3D/Pokemon/Attacks/Normal/Round.vb b/P3D/Pokemon/Attacks/Normal/Round.vb index cdc065e25..10d6db4a0 100644 --- a/P3D/Pokemon/Attacks/Normal/Round.vb +++ b/P3D/Pokemon/Attacks/Normal/Round.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Safeguard.vb b/P3D/Pokemon/Attacks/Normal/Safeguard.vb index 84a5ddd6a..4fd487e9a 100644 --- a/P3D/Pokemon/Attacks/Normal/Safeguard.vb +++ b/P3D/Pokemon/Attacks/Normal/Safeguard.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = True - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/ScaryFace.vb b/P3D/Pokemon/Attacks/Normal/ScaryFace.vb index 4d1c386a2..8b5cd0ff9 100644 --- a/P3D/Pokemon/Attacks/Normal/ScaryFace.vb +++ b/P3D/Pokemon/Attacks/Normal/ScaryFace.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Scratch.vb b/P3D/Pokemon/Attacks/Normal/Scratch.vb index c2cdb96f6..1b11863e7 100644 --- a/P3D/Pokemon/Attacks/Normal/Scratch.vb +++ b/P3D/Pokemon/Attacks/Normal/Scratch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Screech.vb b/P3D/Pokemon/Attacks/Normal/Screech.vb index b425dfc37..aa1044b86 100644 --- a/P3D/Pokemon/Attacks/Normal/Screech.vb +++ b/P3D/Pokemon/Attacks/Normal/Screech.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Self-Destruct.vb b/P3D/Pokemon/Attacks/Normal/Self-Destruct.vb index cbc48d239..f0a9c1b2c 100644 --- a/P3D/Pokemon/Attacks/Normal/Self-Destruct.vb +++ b/P3D/Pokemon/Attacks/Normal/Self-Destruct.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsExplosiveMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Normal/Sharpen.vb b/P3D/Pokemon/Attacks/Normal/Sharpen.vb index 4e3681d04..bd058a08f 100644 --- a/P3D/Pokemon/Attacks/Normal/Sharpen.vb +++ b/P3D/Pokemon/Attacks/Normal/Sharpen.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/ShellSmash.vb b/P3D/Pokemon/Attacks/Normal/ShellSmash.vb index a50f58ac0..d73dd6621 100644 --- a/P3D/Pokemon/Attacks/Normal/ShellSmash.vb +++ b/P3D/Pokemon/Attacks/Normal/ShellSmash.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SimpleBeam.vb b/P3D/Pokemon/Attacks/Normal/SimpleBeam.vb index b71383534..d1d45863b 100644 --- a/P3D/Pokemon/Attacks/Normal/SimpleBeam.vb +++ b/P3D/Pokemon/Attacks/Normal/SimpleBeam.vb @@ -40,11 +40,11 @@ Me.RemovesFrozen = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.ImmunityAffected = True Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Sing.vb b/P3D/Pokemon/Attacks/Normal/Sing.vb index bb4ac6fe6..e94991d2a 100644 --- a/P3D/Pokemon/Attacks/Normal/Sing.vb +++ b/P3D/Pokemon/Attacks/Normal/Sing.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Sketch.vb b/P3D/Pokemon/Attacks/Normal/Sketch.vb index 513ed74cf..dae918831 100644 --- a/P3D/Pokemon/Attacks/Normal/Sketch.vb +++ b/P3D/Pokemon/Attacks/Normal/Sketch.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SkullBash.vb b/P3D/Pokemon/Attacks/Normal/SkullBash.vb index 2686cf591..a444a7829 100644 --- a/P3D/Pokemon/Attacks/Normal/SkullBash.vb +++ b/P3D/Pokemon/Attacks/Normal/SkullBash.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SlackOff.vb b/P3D/Pokemon/Attacks/Normal/SlackOff.vb index 0424768cb..bf415cdf7 100644 --- a/P3D/Pokemon/Attacks/Normal/SlackOff.vb +++ b/P3D/Pokemon/Attacks/Normal/SlackOff.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Slam.vb b/P3D/Pokemon/Attacks/Normal/Slam.vb index 9f8d2696c..9fdb40913 100644 --- a/P3D/Pokemon/Attacks/Normal/Slam.vb +++ b/P3D/Pokemon/Attacks/Normal/Slam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Slash.vb b/P3D/Pokemon/Attacks/Normal/Slash.vb index 82af46d7a..72b19e923 100644 --- a/P3D/Pokemon/Attacks/Normal/Slash.vb +++ b/P3D/Pokemon/Attacks/Normal/Slash.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SleepTalk.vb b/P3D/Pokemon/Attacks/Normal/SleepTalk.vb index 0a21a9196..f10578dd8 100644 --- a/P3D/Pokemon/Attacks/Normal/SleepTalk.vb +++ b/P3D/Pokemon/Attacks/Normal/SleepTalk.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SmellingSalts.vb b/P3D/Pokemon/Attacks/Normal/SmellingSalts.vb index e406c5bf7..324e7c917 100644 --- a/P3D/Pokemon/Attacks/Normal/SmellingSalts.vb +++ b/P3D/Pokemon/Attacks/Normal/SmellingSalts.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SmokeScreen.vb b/P3D/Pokemon/Attacks/Normal/SmokeScreen.vb index 4b06f6d19..59f7a0508 100644 --- a/P3D/Pokemon/Attacks/Normal/SmokeScreen.vb +++ b/P3D/Pokemon/Attacks/Normal/SmokeScreen.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Snore.vb b/P3D/Pokemon/Attacks/Normal/Snore.vb index 7b84c88fc..0216c6826 100644 --- a/P3D/Pokemon/Attacks/Normal/Snore.vb +++ b/P3D/Pokemon/Attacks/Normal/Snore.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Soft-Boiled.vb b/P3D/Pokemon/Attacks/Normal/Soft-Boiled.vb index e5ec90d61..5cc7133ee 100644 --- a/P3D/Pokemon/Attacks/Normal/Soft-Boiled.vb +++ b/P3D/Pokemon/Attacks/Normal/Soft-Boiled.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SonicBoom.vb b/P3D/Pokemon/Attacks/Normal/SonicBoom.vb index 27f107fe7..d7813d303 100644 --- a/P3D/Pokemon/Attacks/Normal/SonicBoom.vb +++ b/P3D/Pokemon/Attacks/Normal/SonicBoom.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SpikeCannon.vb b/P3D/Pokemon/Attacks/Normal/SpikeCannon.vb index c59f5ef2b..f22d7c0fa 100644 --- a/P3D/Pokemon/Attacks/Normal/SpikeCannon.vb +++ b/P3D/Pokemon/Attacks/Normal/SpikeCannon.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SpitUp.vb b/P3D/Pokemon/Attacks/Normal/SpitUp.vb index 838185ac0..dee9a81be 100644 --- a/P3D/Pokemon/Attacks/Normal/SpitUp.vb +++ b/P3D/Pokemon/Attacks/Normal/SpitUp.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Splash.vb b/P3D/Pokemon/Attacks/Normal/Splash.vb index 478ce0c24..61554c741 100644 --- a/P3D/Pokemon/Attacks/Normal/Splash.vb +++ b/P3D/Pokemon/Attacks/Normal/Splash.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Stockpile.vb b/P3D/Pokemon/Attacks/Normal/Stockpile.vb index a471049c6..d5b90b71f 100644 --- a/P3D/Pokemon/Attacks/Normal/Stockpile.vb +++ b/P3D/Pokemon/Attacks/Normal/Stockpile.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Stomp.vb b/P3D/Pokemon/Attacks/Normal/Stomp.vb index 76bb1b8e8..622189b7b 100644 --- a/P3D/Pokemon/Attacks/Normal/Stomp.vb +++ b/P3D/Pokemon/Attacks/Normal/Stomp.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Strength.vb b/P3D/Pokemon/Attacks/Normal/Strength.vb index bbc6d9702..0a47a2912 100644 --- a/P3D/Pokemon/Attacks/Normal/Strength.vb +++ b/P3D/Pokemon/Attacks/Normal/Strength.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Struggle.vb b/P3D/Pokemon/Attacks/Normal/Struggle.vb index ec9e05e7a..648969b00 100644 --- a/P3D/Pokemon/Attacks/Normal/Struggle.vb +++ b/P3D/Pokemon/Attacks/Normal/Struggle.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Substitute.vb b/P3D/Pokemon/Attacks/Normal/Substitute.vb index abf9ba255..98121b22d 100644 --- a/P3D/Pokemon/Attacks/Normal/Substitute.vb +++ b/P3D/Pokemon/Attacks/Normal/Substitute.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SuperFang.vb b/P3D/Pokemon/Attacks/Normal/SuperFang.vb index 9223f1378..f81539664 100644 --- a/P3D/Pokemon/Attacks/Normal/SuperFang.vb +++ b/P3D/Pokemon/Attacks/Normal/SuperFang.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Supersonic.vb b/P3D/Pokemon/Attacks/Normal/Supersonic.vb index c474313ce..c18bece50 100644 --- a/P3D/Pokemon/Attacks/Normal/Supersonic.vb +++ b/P3D/Pokemon/Attacks/Normal/Supersonic.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/Swagger.vb b/P3D/Pokemon/Attacks/Normal/Swagger.vb index 89fcac135..5c6e0af4b 100644 --- a/P3D/Pokemon/Attacks/Normal/Swagger.vb +++ b/P3D/Pokemon/Attacks/Normal/Swagger.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Swallow.vb b/P3D/Pokemon/Attacks/Normal/Swallow.vb index a1c30a2cc..a1ef0b408 100644 --- a/P3D/Pokemon/Attacks/Normal/Swallow.vb +++ b/P3D/Pokemon/Attacks/Normal/Swallow.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SweetScent.vb b/P3D/Pokemon/Attacks/Normal/SweetScent.vb index bf95fd661..48aaa0504 100644 --- a/P3D/Pokemon/Attacks/Normal/SweetScent.vb +++ b/P3D/Pokemon/Attacks/Normal/SweetScent.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Swift.vb b/P3D/Pokemon/Attacks/Normal/Swift.vb index 6d02de6ac..dd3af8751 100644 --- a/P3D/Pokemon/Attacks/Normal/Swift.vb +++ b/P3D/Pokemon/Attacks/Normal/Swift.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/SwordsDance.vb b/P3D/Pokemon/Attacks/Normal/SwordsDance.vb index 2ccce2593..120ec353f 100644 --- a/P3D/Pokemon/Attacks/Normal/SwordsDance.vb +++ b/P3D/Pokemon/Attacks/Normal/SwordsDance.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsDanceMove = True Me.IsAffectedBySubstitute = False diff --git a/P3D/Pokemon/Attacks/Normal/Tackle.vb b/P3D/Pokemon/Attacks/Normal/Tackle.vb index 9d498acf6..a9abfbd47 100644 --- a/P3D/Pokemon/Attacks/Normal/Tackle.vb +++ b/P3D/Pokemon/Attacks/Normal/Tackle.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TailSlap.vb b/P3D/Pokemon/Attacks/Normal/TailSlap.vb index 748e00060..ed6378478 100644 --- a/P3D/Pokemon/Attacks/Normal/TailSlap.vb +++ b/P3D/Pokemon/Attacks/Normal/TailSlap.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TailWhip.vb b/P3D/Pokemon/Attacks/Normal/TailWhip.vb index 364bc1d4e..b0160b2e6 100644 --- a/P3D/Pokemon/Attacks/Normal/TailWhip.vb +++ b/P3D/Pokemon/Attacks/Normal/TailWhip.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TakeDown.vb b/P3D/Pokemon/Attacks/Normal/TakeDown.vb index 025ce2f72..383f96fb1 100644 --- a/P3D/Pokemon/Attacks/Normal/TakeDown.vb +++ b/P3D/Pokemon/Attacks/Normal/TakeDown.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TearfulLook.vb b/P3D/Pokemon/Attacks/Normal/TearfulLook.vb index 4d6dc7f51..4496e7df9 100644 --- a/P3D/Pokemon/Attacks/Normal/TearfulLook.vb +++ b/P3D/Pokemon/Attacks/Normal/TearfulLook.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TechnoBlast.vb b/P3D/Pokemon/Attacks/Normal/TechnoBlast.vb index 0d2fc8a1f..9982761c3 100644 --- a/P3D/Pokemon/Attacks/Normal/TechnoBlast.vb +++ b/P3D/Pokemon/Attacks/Normal/TechnoBlast.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TeeterDance.vb b/P3D/Pokemon/Attacks/Normal/TeeterDance.vb index 98d069ce0..da0d91550 100644 --- a/P3D/Pokemon/Attacks/Normal/TeeterDance.vb +++ b/P3D/Pokemon/Attacks/Normal/TeeterDance.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsDanceMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Normal/Thrash.vb b/P3D/Pokemon/Attacks/Normal/Thrash.vb index 271fab76d..bebd8678e 100644 --- a/P3D/Pokemon/Attacks/Normal/Thrash.vb +++ b/P3D/Pokemon/Attacks/Normal/Thrash.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Tickle.vb b/P3D/Pokemon/Attacks/Normal/Tickle.vb index 636a653e1..bf66fe46d 100644 --- a/P3D/Pokemon/Attacks/Normal/Tickle.vb +++ b/P3D/Pokemon/Attacks/Normal/Tickle.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Transform.vb b/P3D/Pokemon/Attacks/Normal/Transform.vb index 00d01bc5f..7a5f21720 100644 --- a/P3D/Pokemon/Attacks/Normal/Transform.vb +++ b/P3D/Pokemon/Attacks/Normal/Transform.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TriAttack.vb b/P3D/Pokemon/Attacks/Normal/TriAttack.vb index 83b9e6222..112373007 100644 --- a/P3D/Pokemon/Attacks/Normal/TriAttack.vb +++ b/P3D/Pokemon/Attacks/Normal/TriAttack.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/TrumpCard.vb b/P3D/Pokemon/Attacks/Normal/TrumpCard.vb index e90472b8f..a008b199e 100644 --- a/P3D/Pokemon/Attacks/Normal/TrumpCard.vb +++ b/P3D/Pokemon/Attacks/Normal/TrumpCard.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Uproar.vb b/P3D/Pokemon/Attacks/Normal/Uproar.vb index f11f1f87c..26bccb4d9 100644 --- a/P3D/Pokemon/Attacks/Normal/Uproar.vb +++ b/P3D/Pokemon/Attacks/Normal/Uproar.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Normal/ViceGrip.vb b/P3D/Pokemon/Attacks/Normal/ViceGrip.vb index ec579b3e8..c0e442aed 100644 --- a/P3D/Pokemon/Attacks/Normal/ViceGrip.vb +++ b/P3D/Pokemon/Attacks/Normal/ViceGrip.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/WeatherBall.vb b/P3D/Pokemon/Attacks/Normal/WeatherBall.vb index 038170017..2d841670d 100644 --- a/P3D/Pokemon/Attacks/Normal/WeatherBall.vb +++ b/P3D/Pokemon/Attacks/Normal/WeatherBall.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Whirlwind.vb b/P3D/Pokemon/Attacks/Normal/Whirlwind.vb index 13a7e97dd..0af065ba9 100644 --- a/P3D/Pokemon/Attacks/Normal/Whirlwind.vb +++ b/P3D/Pokemon/Attacks/Normal/Whirlwind.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Wish.vb b/P3D/Pokemon/Attacks/Normal/Wish.vb index d0e2480b9..700341750 100644 --- a/P3D/Pokemon/Attacks/Normal/Wish.vb +++ b/P3D/Pokemon/Attacks/Normal/Wish.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/WorkUp.vb b/P3D/Pokemon/Attacks/Normal/WorkUp.vb index 46a63a80eceb413a4b2ba0c843ce8216fbb6fbbc..dc0c7166b117cbd1fad2fa40e966279a4a6d9552 100644 GIT binary patch delta 24 gcmeyT`axxbGxy|`Txydyb5~4eQhEj$+hGd2ehD;!xKDmL_dU7gv4M?6BBp=L>4_1)^ Ql#!jhl1ptfH%}@X0I6OQX#fBK diff --git a/P3D/Pokemon/Attacks/Normal/Wrap.vb b/P3D/Pokemon/Attacks/Normal/Wrap.vb index 055eac53a..ab1d52f70 100644 --- a/P3D/Pokemon/Attacks/Normal/Wrap.vb +++ b/P3D/Pokemon/Attacks/Normal/Wrap.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/WringOut.vb b/P3D/Pokemon/Attacks/Normal/WringOut.vb index b0129a015..168c7de58 100644 --- a/P3D/Pokemon/Attacks/Normal/WringOut.vb +++ b/P3D/Pokemon/Attacks/Normal/WringOut.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Normal Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Normal/Yawn.vb b/P3D/Pokemon/Attacks/Normal/Yawn.vb index 3d66abc09..5147b4f2e 100644 --- a/P3D/Pokemon/Attacks/Normal/Yawn.vb +++ b/P3D/Pokemon/Attacks/Normal/Yawn.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Poison/Acid.vb b/P3D/Pokemon/Attacks/Poison/Acid.vb index 2900a6ac9..8c04cbf25 100644 --- a/P3D/Pokemon/Attacks/Poison/Acid.vb +++ b/P3D/Pokemon/Attacks/Poison/Acid.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Poison/AcidArmor.vb b/P3D/Pokemon/Attacks/Poison/AcidArmor.vb index a657ac010..347a3aa0d 100644 --- a/P3D/Pokemon/Attacks/Poison/AcidArmor.vb +++ b/P3D/Pokemon/Attacks/Poison/AcidArmor.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Poison Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Poison/AcidSpray.vb b/P3D/Pokemon/Attacks/Poison/AcidSpray.vb index 6e1bdd4fa84bd8a2d6fd275b69d6dd62027bc546..fb0dc84fca7057608e31a2c731650ed3a300448f 100644 GIT binary patch delta 24 dcmeyP^iFZZdhW^PoJy0Wd8$D4=HEPxEC7Ly33UJf delta 74 zcmaE-_(y5OdhW^n>~g}M48;rq45bWt49N@`44FVWeX<^pEJ$whMeZsP%?nZ!%#aUO Nl>(F9oXgY50sua26#oDK diff --git a/P3D/Pokemon/Attacks/Poison/ClearSmog.vb b/P3D/Pokemon/Attacks/Poison/ClearSmog.vb index af0bcad1a..7d4ebad9d 100644 --- a/P3D/Pokemon/Attacks/Poison/ClearSmog.vb +++ b/P3D/Pokemon/Attacks/Poison/ClearSmog.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Poison/Coil.vb b/P3D/Pokemon/Attacks/Poison/Coil.vb index 33bb49b95f33624420cc8083c0764ab61b9cc86a..28dbe7e87bc31909d351c208949afc3371fe654a 100644 GIT binary patch delta 24 gcmdm{u|j=AC->y{Txyela#u_?~g}M48;rq45bWt49N@`44FVWeewfV>&eHtYe4e6Ao*a1e6WfX Qpp5KfZf>>Bxjg$h0pW5KR{#J2 diff --git a/P3D/Pokemon/Attacks/Psychic/HealBlock.vb b/P3D/Pokemon/Attacks/Psychic/HealBlock.vb index 637fc04e1..1544d8b98 100644 --- a/P3D/Pokemon/Attacks/Psychic/HealBlock.vb +++ b/P3D/Pokemon/Attacks/Psychic/HealBlock.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/HealPulse.vb b/P3D/Pokemon/Attacks/Psychic/HealPulse.vb index a1ee5dc5b138ca86d4a4e7f45206f1ba1a291253..67c7e82e57d846f91fc9856f68005bd2548654aa 100644 GIT binary patch delta 28 kcmca*dB$SHOzz3CoJx~fd1@v@pPOs*d!E<)0I9wUkN^Mx delta 64 zcmX?Oam#YUOzz3?Tyngg48;rq45bWt49N@`lTUEFPTtR50hbA8$Op@%Og_gdJ2{q9 KX>%;kdwu|k5)*L% diff --git a/P3D/Pokemon/Attacks/Psychic/HealingWish.vb b/P3D/Pokemon/Attacks/Psychic/HealingWish.vb index f067b13a4..9272b4690 100644 --- a/P3D/Pokemon/Attacks/Psychic/HealingWish.vb +++ b/P3D/Pokemon/Attacks/Psychic/HealingWish.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/HeartStamp.vb b/P3D/Pokemon/Attacks/Psychic/HeartStamp.vb index 69b3c5fa575c009e3ab2aff2af26e5e62cc4cc8c..e3ce3afbde4aa036ccbc760ae1423825a1c9e77a 100644 GIT binary patch delta 28 kcmdm^yiRGuWA4eG+-j49dCDdmvMWq}&&amfn75M!0Gu-kw*UYD delta 70 zcmZ3dv`2ZvWA4eZoN~gR48;rq45bWt49N@`44FVWeKH@L^<-9_Dv&%cNIsY$AFLt; QC?h-BlUr@`N}g600HGif8vpHq)$ delta 64 zcmX?Rb;WwaWbVoN>~g%G48;rq45bWt49N@`lhwFgC-3C0fXf6kChKs^PX5WI KwmF*TwEzHa+7i_O diff --git a/P3D/Pokemon/Attacks/Psychic/HyperspaceHole.vb b/P3D/Pokemon/Attacks/Psychic/HyperspaceHole.vb index 73e951e79..7549793ce 100644 --- a/P3D/Pokemon/Attacks/Psychic/HyperspaceHole.vb +++ b/P3D/Pokemon/Attacks/Psychic/HyperspaceHole.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Hypnosis.vb b/P3D/Pokemon/Attacks/Psychic/Hypnosis.vb index 0d42fbb0a..b9fbd3f1c 100644 --- a/P3D/Pokemon/Attacks/Psychic/Hypnosis.vb +++ b/P3D/Pokemon/Attacks/Psychic/Hypnosis.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Kinesis.vb b/P3D/Pokemon/Attacks/Psychic/Kinesis.vb index bf53441d9..a2862c5e3 100644 --- a/P3D/Pokemon/Attacks/Psychic/Kinesis.vb +++ b/P3D/Pokemon/Attacks/Psychic/Kinesis.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/LightScreen.vb b/P3D/Pokemon/Attacks/Psychic/LightScreen.vb index f6949c417..6669570d1 100644 --- a/P3D/Pokemon/Attacks/Psychic/LightScreen.vb +++ b/P3D/Pokemon/Attacks/Psychic/LightScreen.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/LusterPurge.vb b/P3D/Pokemon/Attacks/Psychic/LusterPurge.vb index 2bb9e5c38..51aa49479 100644 --- a/P3D/Pokemon/Attacks/Psychic/LusterPurge.vb +++ b/P3D/Pokemon/Attacks/Psychic/LusterPurge.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/MagicCoat.vb b/P3D/Pokemon/Attacks/Psychic/MagicCoat.vb index 6de869cfb..b3c00c941 100644 --- a/P3D/Pokemon/Attacks/Psychic/MagicCoat.vb +++ b/P3D/Pokemon/Attacks/Psychic/MagicCoat.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Meditate.vb b/P3D/Pokemon/Attacks/Psychic/Meditate.vb index dc73e7f85..a5bf586a9 100644 --- a/P3D/Pokemon/Attacks/Psychic/Meditate.vb +++ b/P3D/Pokemon/Attacks/Psychic/Meditate.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/MiracleEye.vb b/P3D/Pokemon/Attacks/Psychic/MiracleEye.vb index 8a9d05070..44f5d1e14 100644 --- a/P3D/Pokemon/Attacks/Psychic/MiracleEye.vb +++ b/P3D/Pokemon/Attacks/Psychic/MiracleEye.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/MirrorCoat.vb b/P3D/Pokemon/Attacks/Psychic/MirrorCoat.vb index 1d19bb42c..65269e561 100644 --- a/P3D/Pokemon/Attacks/Psychic/MirrorCoat.vb +++ b/P3D/Pokemon/Attacks/Psychic/MirrorCoat.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/MistBall.vb b/P3D/Pokemon/Attacks/Psychic/MistBall.vb index 70f4d381d..0c514931b 100644 --- a/P3D/Pokemon/Attacks/Psychic/MistBall.vb +++ b/P3D/Pokemon/Attacks/Psychic/MistBall.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/PowerSwap.vb b/P3D/Pokemon/Attacks/Psychic/PowerSwap.vb index 3ae1581838f200898ad2cb59be878db6b094079f..379e097fb5b6ed7d3edbc1d4f10c2fd0cbb7432f 100644 GIT binary patch delta 28 kcmdm>yGUolZtlsooJy0`d1@vzvMWr^=i%Bc$UC1C0FxgG>i_@% delta 56 zcmZ3avq5*mZtltZd6YN<7)lxP7?K$>Ci`)_PJYN;0TvBr$Ont3O#Z+vJGquqX>&c# GVom@Q_!2V! diff --git a/P3D/Pokemon/Attacks/Psychic/PowerTrick.vb b/P3D/Pokemon/Attacks/Psychic/PowerTrick.vb index c28a5c867..a18b48752 100644 --- a/P3D/Pokemon/Attacks/Psychic/PowerTrick.vb +++ b/P3D/Pokemon/Attacks/Psychic/PowerTrick.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/PrismaticLaser.vb b/P3D/Pokemon/Attacks/Psychic/PrismaticLaser.vb index b1a341637..5457fba89 100644 --- a/P3D/Pokemon/Attacks/Psychic/PrismaticLaser.vb +++ b/P3D/Pokemon/Attacks/Psychic/PrismaticLaser.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Psybeam.vb b/P3D/Pokemon/Attacks/Psychic/Psybeam.vb index 4bafd563a..062d13792 100644 --- a/P3D/Pokemon/Attacks/Psychic/Psybeam.vb +++ b/P3D/Pokemon/Attacks/Psychic/Psybeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Psychic.vb b/P3D/Pokemon/Attacks/Psychic/Psychic.vb index 1d73863c3..962ff3e82 100644 --- a/P3D/Pokemon/Attacks/Psychic/Psychic.vb +++ b/P3D/Pokemon/Attacks/Psychic/Psychic.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/PsychicFangs.vb b/P3D/Pokemon/Attacks/Psychic/PsychicFangs.vb index 4ce338b63..a3c79da27 100644 --- a/P3D/Pokemon/Attacks/Psychic/PsychicFangs.vb +++ b/P3D/Pokemon/Attacks/Psychic/PsychicFangs.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/PsychicTerrain.vb b/P3D/Pokemon/Attacks/Psychic/PsychicTerrain.vb index 5afd5395f..1c4f60d39 100644 --- a/P3D/Pokemon/Attacks/Psychic/PsychicTerrain.vb +++ b/P3D/Pokemon/Attacks/Psychic/PsychicTerrain.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/PsychoBoost.vb b/P3D/Pokemon/Attacks/Psychic/PsychoBoost.vb index 268d4c242..fff9bb946 100644 --- a/P3D/Pokemon/Attacks/Psychic/PsychoBoost.vb +++ b/P3D/Pokemon/Attacks/Psychic/PsychoBoost.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/PsychoCut.vb b/P3D/Pokemon/Attacks/Psychic/PsychoCut.vb index ceb1fdf9715f0ba73cd16403d99928add190bff9..83ba39b8bc59c67c83f80788bbc02b0ff5b81ad7 100644 GIT binary patch delta 28 kcmbOu*C)GSGxuakZneqEJY|y^*%c<+b8&2D&aKSt3dL+Ao*a1e6WfX Qpp5KfNp7{xl{}(M0Qof(Z~y=R diff --git a/P3D/Pokemon/Attacks/Psychic/PsychoShift.vb b/P3D/Pokemon/Attacks/Psychic/PsychoShift.vb index 33ba60ab1..ace11cb88 100644 --- a/P3D/Pokemon/Attacks/Psychic/PsychoShift.vb +++ b/P3D/Pokemon/Attacks/Psychic/PsychoShift.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Psyshock.vb b/P3D/Pokemon/Attacks/Psychic/Psyshock.vb index d874e663d..554f73e45 100644 --- a/P3D/Pokemon/Attacks/Psychic/Psyshock.vb +++ b/P3D/Pokemon/Attacks/Psychic/Psyshock.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Psystrike.vb b/P3D/Pokemon/Attacks/Psychic/Psystrike.vb index 41c04cddf..e2cde4d25 100644 --- a/P3D/Pokemon/Attacks/Psychic/Psystrike.vb +++ b/P3D/Pokemon/Attacks/Psychic/Psystrike.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Psywave.vb b/P3D/Pokemon/Attacks/Psychic/Psywave.vb index 71e03825d..0d048153b 100644 --- a/P3D/Pokemon/Attacks/Psychic/Psywave.vb +++ b/P3D/Pokemon/Attacks/Psychic/Psywave.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Reflect.vb b/P3D/Pokemon/Attacks/Psychic/Reflect.vb index f12f60451..e8c2f2e53 100644 --- a/P3D/Pokemon/Attacks/Psychic/Reflect.vb +++ b/P3D/Pokemon/Attacks/Psychic/Reflect.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Rest.vb b/P3D/Pokemon/Attacks/Psychic/Rest.vb index 08b543953..0b847b241 100644 --- a/P3D/Pokemon/Attacks/Psychic/Rest.vb +++ b/P3D/Pokemon/Attacks/Psychic/Rest.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = True Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/RolePlay.vb b/P3D/Pokemon/Attacks/Psychic/RolePlay.vb index 585ef7584..dd763fca4 100644 --- a/P3D/Pokemon/Attacks/Psychic/RolePlay.vb +++ b/P3D/Pokemon/Attacks/Psychic/RolePlay.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/SkillSwap.vb b/P3D/Pokemon/Attacks/Psychic/SkillSwap.vb index 4c76891d2..6ebd17e72 100644 --- a/P3D/Pokemon/Attacks/Psychic/SkillSwap.vb +++ b/P3D/Pokemon/Attacks/Psychic/SkillSwap.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Psychic Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/StoredPower.vb b/P3D/Pokemon/Attacks/Psychic/StoredPower.vb index c4736b8002e1905e0f9117100948c176138b3187..b704d7a72be07dedfdd158e98138c3fe498b939d 100644 GIT binary patch delta 28 kcmbQE*QdMTF85?^UbV@-JY|y;1r#R7b8~Gr~g%G48;rq45bWt49N@`lMA?ACo}Vu!DWIO^1*T`lMiq^Z(hvv GniBvhK@tZ5 diff --git a/P3D/Pokemon/Attacks/Psychic/Synchronoise.vb b/P3D/Pokemon/Attacks/Psychic/Synchronoise.vb index 21582a0f6..98f05e73c 100644 --- a/P3D/Pokemon/Attacks/Psychic/Synchronoise.vb +++ b/P3D/Pokemon/Attacks/Psychic/Synchronoise.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Psychic/Teleport.vb b/P3D/Pokemon/Attacks/Psychic/Teleport.vb index f7649706bc7552be96ecec7b5520fbb114b5961a..0ea9d04cf75078b49662588655a3b34ffcf657d4 100644 GIT binary patch delta 28 kcmaE4bj5H(C->y{Txyela#t|(GH^{+;8EXvpQo7z0I8Y^OaK4? delta 56 zcmca&_{eBOC--D~ZY9nDhEj$+hGd3}$uiuolh<=sfJK8D^1(wWd{Jq Cv=D0m diff --git a/P3D/Pokemon/Attacks/Rock/AncientPower.vb b/P3D/Pokemon/Attacks/Rock/AncientPower.vb index 42c2928f3..31c4dfda7 100644 --- a/P3D/Pokemon/Attacks/Rock/AncientPower.vb +++ b/P3D/Pokemon/Attacks/Rock/AncientPower.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/DiamondStorm.vb b/P3D/Pokemon/Attacks/Rock/DiamondStorm.vb index 235b910ed..cf4aa5c14 100644 --- a/P3D/Pokemon/Attacks/Rock/DiamondStorm.vb +++ b/P3D/Pokemon/Attacks/Rock/DiamondStorm.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/HeadSmash.vb b/P3D/Pokemon/Attacks/Rock/HeadSmash.vb index d2ebfed7c..a9b127d5f 100644 --- a/P3D/Pokemon/Attacks/Rock/HeadSmash.vb +++ b/P3D/Pokemon/Attacks/Rock/HeadSmash.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Rock Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/PowerGem.vb b/P3D/Pokemon/Attacks/Rock/PowerGem.vb index e6f7c281b..03cfda741 100644 --- a/P3D/Pokemon/Attacks/Rock/PowerGem.vb +++ b/P3D/Pokemon/Attacks/Rock/PowerGem.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/RockBlast.vb b/P3D/Pokemon/Attacks/Rock/RockBlast.vb index d1686ada8..bd15c6167 100644 --- a/P3D/Pokemon/Attacks/Rock/RockBlast.vb +++ b/P3D/Pokemon/Attacks/Rock/RockBlast.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Rock Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsBulletMove = True Me.IsAffectedBySubstitute = True diff --git a/P3D/Pokemon/Attacks/Rock/RockPolish.vb b/P3D/Pokemon/Attacks/Rock/RockPolish.vb index fceb1b6b5..850f99d4d 100644 --- a/P3D/Pokemon/Attacks/Rock/RockPolish.vb +++ b/P3D/Pokemon/Attacks/Rock/RockPolish.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/RockSlide.vb b/P3D/Pokemon/Attacks/Rock/RockSlide.vb index 2acfe2fc1..3b5a771b0 100644 --- a/P3D/Pokemon/Attacks/Rock/RockSlide.vb +++ b/P3D/Pokemon/Attacks/Rock/RockSlide.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/RockThrow.vb b/P3D/Pokemon/Attacks/Rock/RockThrow.vb index 5a4380920..02178b330 100644 --- a/P3D/Pokemon/Attacks/Rock/RockThrow.vb +++ b/P3D/Pokemon/Attacks/Rock/RockThrow.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/RockTomb.vb b/P3D/Pokemon/Attacks/Rock/RockTomb.vb index a9454ba56..58b821966 100644 --- a/P3D/Pokemon/Attacks/Rock/RockTomb.vb +++ b/P3D/Pokemon/Attacks/Rock/RockTomb.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Rock Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Rock/RockWrecker.vb b/P3D/Pokemon/Attacks/Rock/RockWrecker.vb index 6af022fb090a8c8172f9881bf2e9cf5c4c221d6a..22638bba3b2f9403ce50d6b6cb8edde9cb3a1fa4 100644 GIT binary patch delta 28 kcmdm@yi94sO76-0+-j30dCHi18Mr1l@TzbA%d?#Y0E8b1-2eap delta 52 zcmZ3cv_*NtO76+=+)A7Q45bWt49N@`lWn+NC!gmo1B(VTDU$QhEj$+hGd2ehD;!xKDm$8dU7jw6-b^JBp=L>4_1)^ Ql#!i$l1pu~CQl|K0Hqfa^Z)<= diff --git a/P3D/Pokemon/Attacks/Steel/GearUp.vb b/P3D/Pokemon/Attacks/Steel/GearUp.vb index c7c1728a4..63de58cc4 100644 --- a/P3D/Pokemon/Attacks/Steel/GearUp.vb +++ b/P3D/Pokemon/Attacks/Steel/GearUp.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/GyroBall.vb b/P3D/Pokemon/Attacks/Steel/GyroBall.vb index 34c749e19..8fd44a50d 100644 --- a/P3D/Pokemon/Attacks/Steel/GyroBall.vb +++ b/P3D/Pokemon/Attacks/Steel/GyroBall.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/HeavySlam.vb b/P3D/Pokemon/Attacks/Steel/HeavySlam.vb index a468851a2..1410d8e68 100644 --- a/P3D/Pokemon/Attacks/Steel/HeavySlam.vb +++ b/P3D/Pokemon/Attacks/Steel/HeavySlam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/IronDefense.vb b/P3D/Pokemon/Attacks/Steel/IronDefense.vb index 17ec975f8..91cf7a50d 100644 --- a/P3D/Pokemon/Attacks/Steel/IronDefense.vb +++ b/P3D/Pokemon/Attacks/Steel/IronDefense.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Steel Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/IronTail.vb b/P3D/Pokemon/Attacks/Steel/IronTail.vb index d0a72943c..2d3d9dc5d 100644 --- a/P3D/Pokemon/Attacks/Steel/IronTail.vb +++ b/P3D/Pokemon/Attacks/Steel/IronTail.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/Ironhead.vb b/P3D/Pokemon/Attacks/Steel/Ironhead.vb index c4fb5be11..ea58fa39d 100644 --- a/P3D/Pokemon/Attacks/Steel/Ironhead.vb +++ b/P3D/Pokemon/Attacks/Steel/Ironhead.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/KingsShield.vb b/P3D/Pokemon/Attacks/Steel/KingsShield.vb index b90dc3aa4..2767c4d0d 100644 --- a/P3D/Pokemon/Attacks/Steel/KingsShield.vb +++ b/P3D/Pokemon/Attacks/Steel/KingsShield.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = True - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/MagnetBomb.vb b/P3D/Pokemon/Attacks/Steel/MagnetBomb.vb index dd071a020..36cdf9686 100644 --- a/P3D/Pokemon/Attacks/Steel/MagnetBomb.vb +++ b/P3D/Pokemon/Attacks/Steel/MagnetBomb.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Steel Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/MetalBurst.vb b/P3D/Pokemon/Attacks/Steel/MetalBurst.vb index 6e14698a6..7b12a34f8 100644 --- a/P3D/Pokemon/Attacks/Steel/MetalBurst.vb +++ b/P3D/Pokemon/Attacks/Steel/MetalBurst.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/MetalClaw.vb b/P3D/Pokemon/Attacks/Steel/MetalClaw.vb index c22a1ae09..fd3dec1ba 100644 --- a/P3D/Pokemon/Attacks/Steel/MetalClaw.vb +++ b/P3D/Pokemon/Attacks/Steel/MetalClaw.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/MetalSound.vb b/P3D/Pokemon/Attacks/Steel/MetalSound.vb index 63f8e3a02..7e2a3f7c7 100644 --- a/P3D/Pokemon/Attacks/Steel/MetalSound.vb +++ b/P3D/Pokemon/Attacks/Steel/MetalSound.vb @@ -41,7 +41,7 @@ Namespace BattleSystem.Moves.Steel Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False Me.IsSoundMove = True diff --git a/P3D/Pokemon/Attacks/Steel/MeteorMash.vb b/P3D/Pokemon/Attacks/Steel/MeteorMash.vb index d363cb808..730e3c4af 100644 --- a/P3D/Pokemon/Attacks/Steel/MeteorMash.vb +++ b/P3D/Pokemon/Attacks/Steel/MeteorMash.vb @@ -44,7 +44,7 @@ Namespace BattleSystem.Moves.Steel Me.IsPunchingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/MirrorShot.vb b/P3D/Pokemon/Attacks/Steel/MirrorShot.vb index a5fda9595..5e7e30f8c 100644 --- a/P3D/Pokemon/Attacks/Steel/MirrorShot.vb +++ b/P3D/Pokemon/Attacks/Steel/MirrorShot.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/ShiftGear.vb b/P3D/Pokemon/Attacks/Steel/ShiftGear.vb index f3a0bfd0d..2913130ab 100644 --- a/P3D/Pokemon/Attacks/Steel/ShiftGear.vb +++ b/P3D/Pokemon/Attacks/Steel/ShiftGear.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/SmartStrike.vb b/P3D/Pokemon/Attacks/Steel/SmartStrike.vb index 3a427af36..3053ada15 100644 --- a/P3D/Pokemon/Attacks/Steel/SmartStrike.vb +++ b/P3D/Pokemon/Attacks/Steel/SmartStrike.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Steel Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/SteelBeam.vb b/P3D/Pokemon/Attacks/Steel/SteelBeam.vb index 110e6bbd0..16b5d16ce 100644 --- a/P3D/Pokemon/Attacks/Steel/SteelBeam.vb +++ b/P3D/Pokemon/Attacks/Steel/SteelBeam.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Steel Me.IsHealingMove = False Me.IsRecoilMove = True - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Steel/SteelWing.vb b/P3D/Pokemon/Attacks/Steel/SteelWing.vb index 5ce348b4d..4f99e1e89 100644 --- a/P3D/Pokemon/Attacks/Steel/SteelWing.vb +++ b/P3D/Pokemon/Attacks/Steel/SteelWing.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/TheDerpMove.vb b/P3D/Pokemon/Attacks/TheDerpMove.vb index db7c3242c..efb88b1ca 100644 --- a/P3D/Pokemon/Attacks/TheDerpMove.vb +++ b/P3D/Pokemon/Attacks/TheDerpMove.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = True diff --git a/P3D/Pokemon/Attacks/Water/AquaRing.vb b/P3D/Pokemon/Attacks/Water/AquaRing.vb index 3361d1e07..04d972cce 100644 --- a/P3D/Pokemon/Attacks/Water/AquaRing.vb +++ b/P3D/Pokemon/Attacks/Water/AquaRing.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Aquajet.vb b/P3D/Pokemon/Attacks/Water/Aquajet.vb index 616110057..89e3ec887 100644 --- a/P3D/Pokemon/Attacks/Water/Aquajet.vb +++ b/P3D/Pokemon/Attacks/Water/Aquajet.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Aquatail.vb b/P3D/Pokemon/Attacks/Water/Aquatail.vb index fd00aec6b..4333898ea 100644 --- a/P3D/Pokemon/Attacks/Water/Aquatail.vb +++ b/P3D/Pokemon/Attacks/Water/Aquatail.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Brine.vb b/P3D/Pokemon/Attacks/Water/Brine.vb index 296e7c25b..b814964ee 100644 --- a/P3D/Pokemon/Attacks/Water/Brine.vb +++ b/P3D/Pokemon/Attacks/Water/Brine.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Bubble.vb b/P3D/Pokemon/Attacks/Water/Bubble.vb index 26ce652d1..51a4a4602 100644 --- a/P3D/Pokemon/Attacks/Water/Bubble.vb +++ b/P3D/Pokemon/Attacks/Water/Bubble.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/BubbleBeam.vb b/P3D/Pokemon/Attacks/Water/BubbleBeam.vb index ff2a7d771..94d6e0354 100644 --- a/P3D/Pokemon/Attacks/Water/BubbleBeam.vb +++ b/P3D/Pokemon/Attacks/Water/BubbleBeam.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Clamp.vb b/P3D/Pokemon/Attacks/Water/Clamp.vb index e12e75887..6689aaece 100644 --- a/P3D/Pokemon/Attacks/Water/Clamp.vb +++ b/P3D/Pokemon/Attacks/Water/Clamp.vb @@ -41,10 +41,10 @@ Namespace BattleSystem.Moves.Water Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Crabhammer.vb b/P3D/Pokemon/Attacks/Water/Crabhammer.vb index faf259675..e00a8c156 100644 --- a/P3D/Pokemon/Attacks/Water/Crabhammer.vb +++ b/P3D/Pokemon/Attacks/Water/Crabhammer.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Dive.vb b/P3D/Pokemon/Attacks/Water/Dive.vb index 165db79ac..366afacd0 100644 --- a/P3D/Pokemon/Attacks/Water/Dive.vb +++ b/P3D/Pokemon/Attacks/Water/Dive.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/HydroPump.vb b/P3D/Pokemon/Attacks/Water/HydroPump.vb index 08bc1e3ab..1598b374e 100644 --- a/P3D/Pokemon/Attacks/Water/HydroPump.vb +++ b/P3D/Pokemon/Attacks/Water/HydroPump.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Hydrocannon.vb b/P3D/Pokemon/Attacks/Water/Hydrocannon.vb index e9195dc8f..7eadfe336 100644 --- a/P3D/Pokemon/Attacks/Water/Hydrocannon.vb +++ b/P3D/Pokemon/Attacks/Water/Hydrocannon.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Liquidation.vb b/P3D/Pokemon/Attacks/Water/Liquidation.vb index 9d4c46169..d16d264c8 100644 --- a/P3D/Pokemon/Attacks/Water/Liquidation.vb +++ b/P3D/Pokemon/Attacks/Water/Liquidation.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Muddywater.vb b/P3D/Pokemon/Attacks/Water/Muddywater.vb index 8c48df311..c35a77a2c 100644 --- a/P3D/Pokemon/Attacks/Water/Muddywater.vb +++ b/P3D/Pokemon/Attacks/Water/Muddywater.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/Octazooka.vb b/P3D/Pokemon/Attacks/Water/Octazooka.vb index c9632e8b2..dbe8487f2 100644 --- a/P3D/Pokemon/Attacks/Water/Octazooka.vb +++ b/P3D/Pokemon/Attacks/Water/Octazooka.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/OriginPulse.vb b/P3D/Pokemon/Attacks/Water/OriginPulse.vb index b8d326887..5e87e8432 100644 --- a/P3D/Pokemon/Attacks/Water/OriginPulse.vb +++ b/P3D/Pokemon/Attacks/Water/OriginPulse.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/RainDance.vb b/P3D/Pokemon/Attacks/Water/RainDance.vb index 63c0db9b4..86f1754d1 100644 --- a/P3D/Pokemon/Attacks/Water/RainDance.vb +++ b/P3D/Pokemon/Attacks/Water/RainDance.vb @@ -41,10 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - Me.IsPunchingMove = False + Me.IsDamagingMove = False Me.IsProtectMove = False - Me.IsSoundMove = False + Me.IsAffectedBySubstitute = False Me.IsOneHitKOMove = False diff --git a/P3D/Pokemon/Attacks/Water/RazorShell.vb b/P3D/Pokemon/Attacks/Water/RazorShell.vb index 1fb5e9acedda7bd580fc6b689c6ce9de56ffabff..85a62e66cabbca0adb622aa99360f5b5fd2bdf87 100644 GIT binary patch delta 28 kcmX@3vQK%#Lhi}udDJEg@{~<}&!#YWKP%VfuRP(b0IGKj0RR91 delta 64 zcmdm|d`4x%Lhi}$d6YN<7)lxP7?K$>CSTwdovhEp2NIopoVyGx8_bXomQR_iz@s>s Mn_FpfI!`z&0KL%@z5oCK diff --git a/P3D/Pokemon/Attacks/Water/Scald.vb b/P3D/Pokemon/Attacks/Water/Scald.vb index 618327635749388d7cef0369192e4db01bffec5a..4a3cbf1fc2c6b8eeec9bd924998a3d0d2bfab020 100644 GIT binary patch delta 24 gcmZqC_@=g@pL_CN9<|B;xyvSh