From 92a3e6252085b6b8831bfcfd144ec60e034cf480 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Tue, 20 Dec 2022 10:53:00 -0600 Subject: [PATCH] Mark slicing moves --- P3D/Pokemon/Attacks/Bug/FuryCutter.vb | 3 +-- P3D/Pokemon/Attacks/Bug/Xscissor.vb | 3 +-- P3D/Pokemon/Attacks/Dark/Nightslash.vb | 3 +-- P3D/Pokemon/Attacks/Fighting/SacredSword.vb | 2 +- P3D/Pokemon/Attacks/Fighting/SecretSword.vb | 3 +-- P3D/Pokemon/Attacks/Flying/AerialAce.vb | 3 +-- P3D/Pokemon/Attacks/Flying/AirCutter.vb | 3 +-- P3D/Pokemon/Attacks/Flying/AirSlash.vb | 3 +-- P3D/Pokemon/Attacks/Grass/LeafBlade.vb | 3 +-- P3D/Pokemon/Attacks/Grass/RazorLeaf.vb | 3 +-- P3D/Pokemon/Attacks/Grass/SolarBlade.vb | 3 +-- P3D/Pokemon/Attacks/Normal/Cut.vb | 3 +-- P3D/Pokemon/Attacks/Normal/Slash.vb | 3 +-- P3D/Pokemon/Attacks/Poison/Crosspoison.vb | 3 +-- P3D/Pokemon/Attacks/Psychic/PsychoCut.vb | Bin 3726 -> 3792 bytes P3D/Pokemon/Attacks/Water/RazorShell.vb | Bin 4542 -> 4608 bytes 16 files changed, 14 insertions(+), 27 deletions(-) diff --git a/P3D/Pokemon/Attacks/Bug/FuryCutter.vb b/P3D/Pokemon/Attacks/Bug/FuryCutter.vb index 76b3cb461..12725f134 100644 --- a/P3D/Pokemon/Attacks/Bug/FuryCutter.vb +++ b/P3D/Pokemon/Attacks/Bug/FuryCutter.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Bug/Xscissor.vb b/P3D/Pokemon/Attacks/Bug/Xscissor.vb index 4918438b7..7e491a9d1 100644 --- a/P3D/Pokemon/Attacks/Bug/Xscissor.vb +++ b/P3D/Pokemon/Attacks/Bug/Xscissor.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Dark/Nightslash.vb b/P3D/Pokemon/Attacks/Dark/Nightslash.vb index 45d9fbe13..e18edcc80 100644 --- a/P3D/Pokemon/Attacks/Dark/Nightslash.vb +++ b/P3D/Pokemon/Attacks/Dark/Nightslash.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Fighting/SacredSword.vb b/P3D/Pokemon/Attacks/Fighting/SacredSword.vb index f61793ad9..39b0e810d 100644 --- a/P3D/Pokemon/Attacks/Fighting/SacredSword.vb +++ b/P3D/Pokemon/Attacks/Fighting/SacredSword.vb @@ -41,7 +41,7 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False diff --git a/P3D/Pokemon/Attacks/Fighting/SecretSword.vb b/P3D/Pokemon/Attacks/Fighting/SecretSword.vb index d5df9b7c7..a01081a4d 100644 --- a/P3D/Pokemon/Attacks/Fighting/SecretSword.vb +++ b/P3D/Pokemon/Attacks/Fighting/SecretSword.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True 'P3D Only Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Flying/AerialAce.vb b/P3D/Pokemon/Attacks/Flying/AerialAce.vb index d53171a20..93d5265e6 100644 --- a/P3D/Pokemon/Attacks/Flying/AerialAce.vb +++ b/P3D/Pokemon/Attacks/Flying/AerialAce.vb @@ -41,11 +41,10 @@ Namespace BattleSystem.Moves.Flying Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Flying/AirCutter.vb b/P3D/Pokemon/Attacks/Flying/AirCutter.vb index f5bea5136..620c3a121 100644 --- a/P3D/Pokemon/Attacks/Flying/AirCutter.vb +++ b/P3D/Pokemon/Attacks/Flying/AirCutter.vb @@ -41,11 +41,10 @@ Namespace BattleSystem.Moves.Flying Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Flying/AirSlash.vb b/P3D/Pokemon/Attacks/Flying/AirSlash.vb index dec3df485..d1102c222 100644 --- a/P3D/Pokemon/Attacks/Flying/AirSlash.vb +++ b/P3D/Pokemon/Attacks/Flying/AirSlash.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Grass/LeafBlade.vb b/P3D/Pokemon/Attacks/Grass/LeafBlade.vb index 02e59c62a..f8eae401c 100644 --- a/P3D/Pokemon/Attacks/Grass/LeafBlade.vb +++ b/P3D/Pokemon/Attacks/Grass/LeafBlade.vb @@ -41,11 +41,10 @@ Namespace BattleSystem.Moves.Grass Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb b/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb index ccd4a880c..495c6d4fc 100644 --- a/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb +++ b/P3D/Pokemon/Attacks/Grass/RazorLeaf.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Grass/SolarBlade.vb b/P3D/Pokemon/Attacks/Grass/SolarBlade.vb index 0b5c6bbab..1d70fbf8f 100644 --- a/P3D/Pokemon/Attacks/Grass/SolarBlade.vb +++ b/P3D/Pokemon/Attacks/Grass/SolarBlade.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Normal/Cut.vb b/P3D/Pokemon/Attacks/Normal/Cut.vb index dc8d097e3..030d60de5 100644 --- a/P3D/Pokemon/Attacks/Normal/Cut.vb +++ b/P3D/Pokemon/Attacks/Normal/Cut.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Normal/Slash.vb b/P3D/Pokemon/Attacks/Normal/Slash.vb index 72b19e923..d534bfc88 100644 --- a/P3D/Pokemon/Attacks/Normal/Slash.vb +++ b/P3D/Pokemon/Attacks/Normal/Slash.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Poison/Crosspoison.vb b/P3D/Pokemon/Attacks/Poison/Crosspoison.vb index 44abbeb0b..c72eb67cc 100644 --- a/P3D/Pokemon/Attacks/Poison/Crosspoison.vb +++ b/P3D/Pokemon/Attacks/Poison/Crosspoison.vb @@ -41,11 +41,10 @@ Me.IsHealingMove = False Me.IsRecoilMove = False - + Me.IsSlicingMove = True Me.IsDamagingMove = True Me.IsProtectMove = False - Me.IsAffectedBySubstitute = True Me.IsOneHitKOMove = False Me.IsWonderGuardAffected = True diff --git a/P3D/Pokemon/Attacks/Psychic/PsychoCut.vb b/P3D/Pokemon/Attacks/Psychic/PsychoCut.vb index 83ba39b8bc59c67c83f80788bbc02b0ff5b81ad7..b9f33d5f27292a8f3d9f6fc436f926d23604672a 100644 GIT binary patch delta 40 wcmeB^y&$_`Gxy}*ta99*48;t=3^@#$49SxpaXU}G$z3&BmRo6aC66c*02~+$>Hq)$ delta 20 ccmca0+b6qWGxuakZneqsJXM>g@>nwg08Z5gtpET3 diff --git a/P3D/Pokemon/Attacks/Water/RazorShell.vb b/P3D/Pokemon/Attacks/Water/RazorShell.vb index 85a62e66cabbca0adb622aa99360f5b5fd2bdf87..395d47f1f2fbb695163d86e4d03d35d2755dae59 100644 GIT binary patch delta 36 scmdm|+@P{yA@}6>JWA}r3^@#$49Sx(a63;v&RsQ`n_FpfI!`z&0PZFX0RR91 delta 24 gcmZor*{8f=A@^i