From 8ec0c0731bf1e9fe5d71029b6e74edd544d5dc9b Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 8 May 2019 23:33:50 +0000
Subject: [PATCH] Exclude dual certifications from check. Contributed by
 Liamxroy.

---
 .../game/data/stats/skills/01900-01999.xml    | 21 +++++++++-------
 .../game/data/stats/skills/01900-01999.xml    | 21 +++++++++-------
 .../game/data/stats/skills/01900-01999.xml    | 21 +++++++++-------
 .../game/data/stats/skills/01900-01999.xml    | 24 ++++++++++++-------
 .../game/data/stats/skills/01900-01999.xml    | 24 ++++++++++++-------
 .../game/data/stats/skills/01900-01999.xml    | 24 ++++++++++++-------
 .../game/data/stats/skills/01900-01999.xml    | 10 +++++++-
 .../game/data/stats/skills/02000-02099.xml    |  1 +
 8 files changed, 97 insertions(+), 49 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml
index 2c30e5509f..d2815d08f9 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml
@@ -75,16 +75,15 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<excludedFromCheck>true</excludedFromCheck>
+		<targetConditions>
+			<condition name="OpTargetPc" />
+		</targetConditions>
 		<effects>
-			<effect name="DispelBySlot">
-				<dispel>POISON,9;ROOT_MAGICALLY,9;ROOT_PHYSICALLY,9;BLEEDING,9;STUN,9</dispel>
-			</effect>
-			<effect name="DefenceTrait">
-				<POISON>100</POISON>
-				<BLEED>100</BLEED>
-				<SHOCK>100</SHOCK>
-				<HOLD>100</HOLD>
+			<effect name="CallSkill">
+				<skillId>7002</skillId> <!-- Dispel Debuff -->
+				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DebuffBlock" />
 		</effects>
 	</skill>
 	<skill id="1905" toLevel="1" name="Swiftness">
@@ -1589,6 +1588,7 @@
 		<!-- Max HP + 6%. -->
 		<icon>icon.skill0211</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2017,6 +2017,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2046,6 +2047,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2078,6 +2080,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2106,6 +2109,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2117,6 +2121,7 @@
 		<icon>icon.skill0917</icon>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml
index 3f777e071b..30f5551c78 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml
@@ -75,16 +75,15 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<excludedFromCheck>true</excludedFromCheck>
+		<targetConditions>
+			<condition name="OpTargetPc" />
+		</targetConditions>
 		<effects>
-			<effect name="DispelBySlot">
-				<dispel>POISON,9;ROOT_MAGICALLY,9;ROOT_PHYSICALLY,9;BLEEDING,9;STUN,9</dispel>
-			</effect>
-			<effect name="DefenceTrait">
-				<POISON>100</POISON>
-				<BLEED>100</BLEED>
-				<SHOCK>100</SHOCK>
-				<HOLD>100</HOLD>
+			<effect name="CallSkill">
+				<skillId>7002</skillId> <!-- Dispel Debuff -->
+				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DebuffBlock" />
 		</effects>
 	</skill>
 	<skill id="1905" toLevel="1" name="Swiftness">
@@ -1589,6 +1588,7 @@
 		<!-- Max HP + $s1. -->
 		<icon>icon.skill0211</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2017,6 +2017,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2046,6 +2047,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2078,6 +2080,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2106,6 +2109,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2117,6 +2121,7 @@
 		<icon>icon.skill0917</icon>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml
index 1975aac55a..8387ca49af 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml
@@ -75,16 +75,15 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<excludedFromCheck>true</excludedFromCheck>
+		<targetConditions>
+			<condition name="OpTargetPc" />
+		</targetConditions>
 		<effects>
-			<effect name="DispelBySlot">
-				<dispel>POISON,9;ROOT_MAGICALLY,9;ROOT_PHYSICALLY,9;BLEEDING,9;STUN,9</dispel>
-			</effect>
-			<effect name="DefenceTrait">
-				<POISON>100</POISON>
-				<BLEED>100</BLEED>
-				<SHOCK>100</SHOCK>
-				<HOLD>100</HOLD>
+			<effect name="CallSkill">
+				<skillId>7002</skillId> <!-- Dispel Debuff -->
+				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DebuffBlock" />
 		</effects>
 	</skill>
 	<skill id="1905" toLevel="1" name="Swiftness">
@@ -1589,6 +1588,7 @@
 		<!-- Max HP + $s1. -->
 		<icon>icon.skill0211</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2017,6 +2017,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2046,6 +2047,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2078,6 +2080,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2106,6 +2109,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2117,6 +2121,7 @@
 		<icon>icon.skill0917</icon>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
index 82b7982aea..06714b3a25 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
@@ -75,16 +75,15 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<excludedFromCheck>true</excludedFromCheck>
+		<targetConditions>
+			<condition name="OpTargetPc" />
+		</targetConditions>
 		<effects>
-			<effect name="DispelBySlot">
-				<dispel>POISON,9;ROOT_MAGICALLY,9;ROOT_PHYSICALLY,9;BLEEDING,9;STUN,9</dispel>
-			</effect>
-			<effect name="DefenceTrait">
-				<POISON>100</POISON>
-				<BLEED>100</BLEED>
-				<SHOCK>100</SHOCK>
-				<HOLD>100</HOLD>
+			<effect name="CallSkill">
+				<skillId>7002</skillId> <!-- Dispel Debuff -->
+				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DebuffBlock" />
 		</effects>
 	</skill>
 	<skill id="1905" toLevel="1" name="Swiftness">
@@ -1589,6 +1588,7 @@
 		<!-- Max HP + $s1. -->
 		<icon>icon.skill0211</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2017,6 +2017,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2046,6 +2047,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2078,6 +2080,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2106,6 +2109,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2117,6 +2121,7 @@
 		<icon>icon.skill0917</icon>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2342,6 +2347,9 @@
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml
index bd31123d70..665e55b26c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml
@@ -75,16 +75,15 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<excludedFromCheck>true</excludedFromCheck>
+		<targetConditions>
+			<condition name="OpTargetPc" />
+		</targetConditions>
 		<effects>
-			<effect name="DispelBySlot">
-				<dispel>POISON,9;ROOT_MAGICALLY,9;ROOT_PHYSICALLY,9;BLEEDING,9;STUN,9</dispel>
-			</effect>
-			<effect name="DefenceTrait">
-				<POISON>100</POISON>
-				<BLEED>100</BLEED>
-				<SHOCK>100</SHOCK>
-				<HOLD>100</HOLD>
+			<effect name="CallSkill">
+				<skillId>7002</skillId> <!-- Dispel Debuff -->
+				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DebuffBlock" />
 		</effects>
 	</skill>
 	<skill id="1905" toLevel="1" name="Swiftness">
@@ -1589,6 +1588,7 @@
 		<!-- Max HP +$s1. -->
 		<icon>icon.skill0211</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2017,6 +2017,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2046,6 +2047,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2078,6 +2080,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2106,6 +2109,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2117,6 +2121,7 @@
 		<icon>icon.skill0917</icon>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2348,6 +2353,9 @@
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml
index 2121f3605c..74a7842ac0 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml
@@ -75,16 +75,15 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<excludedFromCheck>true</excludedFromCheck>
+		<targetConditions>
+			<condition name="OpTargetPc" />
+		</targetConditions>
 		<effects>
-			<effect name="DispelBySlot">
-				<dispel>POISON,9;ROOT_MAGICALLY,9;ROOT_PHYSICALLY,9;BLEEDING,9;STUN,9</dispel>
-			</effect>
-			<effect name="DefenceTrait">
-				<POISON>100</POISON>
-				<BLEED>100</BLEED>
-				<SHOCK>100</SHOCK>
-				<HOLD>100</HOLD>
+			<effect name="CallSkill">
+				<skillId>7002</skillId> <!-- Dispel Debuff -->
+				<skillLevel>1</skillLevel>
 			</effect>
+			<effect name="DebuffBlock" />
 		</effects>
 	</skill>
 	<skill id="1905" toLevel="1" name="Swiftness">
@@ -1589,6 +1588,7 @@
 		<!-- Increases Max HP/ MP/ CP by $s1. -->
 		<icon>icon.skill1501</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2017,6 +2017,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2046,6 +2047,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2078,6 +2080,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2106,6 +2109,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2117,6 +2121,7 @@
 		<icon>icon.skill0917</icon>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2348,6 +2353,9 @@
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
index 05c057e1af..bfeff15e7e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
@@ -1588,6 +1588,7 @@
 		<!-- Increases Max HP/ MP/ CP by $s1. -->
 		<icon>icon.skill1501</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -1871,7 +1872,7 @@
 				<magicTypes>0;1;2;3;4;22</magicTypes>
 				<skillId>1977</skillId> <!-- Dual Certification - Master's Rage -->
 				<skillLevel>1</skillLevel>
-				<chance>2</chance>
+				<chance>10</chance>
 				<targetType>SELF</targetType>
 			</effect>
 		</effects>
@@ -2016,6 +2017,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2045,6 +2047,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2077,6 +2080,7 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
+		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2105,6 +2109,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2116,6 +2121,7 @@
 		<icon>icon.skill0917</icon>
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">90</value>
@@ -2407,6 +2413,7 @@
 		<!-- Increases Acquired XP/ SP in Vitality state by 10%. -->
 		<icon>icon.skill10336</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="VitalityExpRate">
 				<amount>10</amount>
@@ -2418,6 +2425,7 @@
 		<!-- Decreases skill cooldown by 4%. -->
 		<icon>icon.skill11226</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="Reuse">
 				<amount>-4</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml
index 9ddee61485..927aa5ae76 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml
@@ -4,6 +4,7 @@
 		<!-- Increases P. Critical Damage and P./ M. Skill Critical Damage by 5%. -->
 		<icon>icon.skill10655</icon>
 		<operateType>P</operateType>
+		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="CriticalDamage">
 				<amount>5</amount>