From db1588b1b87e04a917ee8b6da40980b770170567 Mon Sep 17 00:00:00 2001
From: Zealar <Zealar@users.noreply.github.com>
Date: Mon, 3 Nov 2014 22:27:38 +0200
Subject: [PATCH] Fix follow skills after Triggers Rework: 	- (992)Sonic
 Mastery 	- (993)Force Mastery 	- (5550)NPC Trigger Stun 	-
 (6920)Collector's Fortune 	- (8307)Boing Hammer's Effect of Doubt 	-
 (23321)Draconic Evolver

Patch by: dedmoped
Reviewed by: Zealar
---
 .../game/data/stats/skills/00200-00299.xml    | 16 +++++------
 .../game/data/stats/skills/00400-00499.xml    |  2 +-
 .../game/data/stats/skills/00600-00699.xml    |  8 ++----
 .../game/data/stats/skills/00700-00799.xml    |  6 ++--
 .../game/data/stats/skills/00800-00899.xml    |  6 ++--
 .../game/data/stats/skills/00900-00999.xml    | 16 +++++------
 .../game/data/stats/skills/01400-01499.xml    |  2 +-
 .../game/data/stats/skills/01500-01599.xml    | 11 ++++----
 .../game/data/stats/skills/03400-03499.xml    |  5 ++--
 .../game/data/stats/skills/03600-03699.xml    | 28 ++++++-------------
 .../game/data/stats/skills/03800-03899.xml    | 16 +++++------
 .../game/data/stats/skills/05500-05599.xml    |  8 ++----
 .../game/data/stats/skills/05600-05699.xml    |  2 +-
 .../game/data/stats/skills/05800-05899.xml    |  2 +-
 .../game/data/stats/skills/05900-05999.xml    |  6 ++--
 .../game/data/stats/skills/06900-06999.xml    |  2 +-
 .../game/data/stats/skills/08200-08299.xml    |  2 +-
 .../game/data/stats/skills/08300-08399.xml    |  2 +-
 .../game/data/stats/skills/21200-21299.xml    | 12 ++++----
 .../game/data/stats/skills/23300-23399.xml    |  1 +
 20 files changed, 67 insertions(+), 86 deletions(-)

diff --git a/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml b/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml
index 9aa6ba0ec2..0b81d36db0 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00200-00299.xml
@@ -26,7 +26,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="50" />
-				<param skillId="#triggeredId" skillLevel="1" />
+				<param skillId="#triggeredId" skillLevel="1" /> <!-- Blunt Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="SWORD,BLUNT" />
 			</effect>
@@ -44,7 +44,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="50" />
-				<param skillId="5604" skillLevel="1" />
+				<param skillId="5604" skillLevel="1" /> <!-- Blunt Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="SWORD,BLUNT" />
 			</effect>
@@ -62,7 +62,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="50" />
-				<param skillId="5604" skillLevel="1" />
+				<param skillId="5604" skillLevel="1" /> <!-- Blunt Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="SWORD,BLUNT" />
 			</effect>
@@ -80,7 +80,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="50" />
-				<param skillId="5604" skillLevel="1" />
+				<param skillId="5604" skillLevel="1" /> <!-- Blunt Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="SWORD,BLUNT" />
 			</effect>
@@ -146,7 +146,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="33" />
-				<param skillId="#triggeredId" skillLevel="1" />
+				<param skillId="#triggeredId" skillLevel="1" /> <!-- Dagger Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="DAGGER,DUALDAGGER" />
 			</effect>
@@ -161,7 +161,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="33" />
-				<param skillId="5603" skillLevel="1" />
+				<param skillId="5603" skillLevel="1" /> <!-- Dagger Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="DAGGER,DUALDAGGER" />
 			</effect>
@@ -179,7 +179,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="33" />
-				<param skillId="5603" skillLevel="1" />
+				<param skillId="5603" skillLevel="1" /> <!-- Dagger Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="DAGGER,DUALDAGGER" />
 			</effect>
@@ -197,7 +197,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="33" />
-				<param skillId="5603" skillLevel="1" />
+				<param skillId="5603" skillLevel="1" /> <!-- Dagger Mastery -->
 				<param targetType="SELF" />
 				<param allowWeapons="DAGGER,DUALDAGGER" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml
index c696a3ba55..c57157a7d5 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00400-00499.xml
@@ -2240,7 +2240,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="#activationChance" />
-				<param skillId="5548" skillLevel="1" />
+				<param skillId="5548" skillLevel="1" /> <!-- Critical Spiritual Energy Attack -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml b/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml
index de399f3819..6a3eee4670 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00600-00699.xml
@@ -891,13 +891,12 @@
 		<set name="icon" val="icon.skill1086" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="2" />
-				<param skillId="5572" skillLevel="1" />
+				<param skillId="5572" skillLevel="1" /> <!-- Warrior Ability - Haste -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -930,7 +929,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="2" />
-				<param skillId="5574" skillLevel="1" />
+				<param skillId="5574" skillLevel="1" /> <!-- Log Ability - Critical Chance -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -947,7 +946,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="2" />
-				<param skillId="5575" skillLevel="1" />
+				<param skillId="5575" skillLevel="1" /> <!-- Wizard Ability - Mana Steal -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -959,7 +958,6 @@
 		<set name="icon" val="icon.skill1418" />
 		<set name="magicLvl" val="75" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml
index 5332357a5b..b36dcb4048 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00700-00799.xml
@@ -1476,7 +1476,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="3" />
-				<param skillId="5559" skillLevel="1" />
+				<param skillId="5559" skillLevel="1" /> <!-- Physical Pose -->
 				<param targetType="SELF" />
 				<param allowWeapons="SWORD,BLUNT,DUAL,DUALFIST,DAGGER,DUALDAGGER,POLE,ANCIENTSWORD,RAPIER" />
 			</effect>
@@ -1500,9 +1500,9 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="3" />
-				<param skillId="5559" skillLevel="1" />
+				<param skillId="5559" skillLevel="1" /> <!-- Physical Pose -->
 				<param targetType="SELF" />
-				<param allowWeapons="SWORD,BLUNT,DUAL,DUALFIST,DAGGER,DUALDAGGER,POLE,ANCIENTSWORD,RAPIER" />
+				<param allowWeapons="CROSSBOW,BOW" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml b/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml
index 89286243be..cfffa5bafd 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00800-00899.xml
@@ -394,7 +394,7 @@
 		<for>
 			<effect name="TriggerSkillByAvoid">
 				<param chance="10" />
-				<param skillId="5673" skillLevel="1" />
+				<param skillId="5673" skillLevel="1" /> <!-- Evasion Counter -->
 				<param targetType="ONE" />
 			</effect>
 		</for>
@@ -407,7 +407,7 @@
 		<for>
 			<effect name="TriggerSkillByAvoid">
 				<param chance="10" />
-				<param skillId="5674" skillLevel="1" />
+				<param skillId="5674" skillLevel="1" /> <!-- Evasion Chance -->
 				<param targetType="SELF" />
 			</effect>
 		</for>
@@ -420,7 +420,7 @@
 		<for>
 			<effect name="TriggerSkillByAvoid">
 				<param chance="10" />
-				<param skillId="5675" skillLevel="1" />
+				<param skillId="5675" skillLevel="1" /> <!-- Evasion Haste -->
 				<param targetType="SELF" />
 			</effect>
 		</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml
index 6db686860a..19055cae83 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/00900-00999.xml
@@ -1196,9 +1196,9 @@
 				<mul order="0x30" stat="rShld" val="#rShld" />
 			</effect>
 			<effect name="TriggerSkillBySkill">
-				<param castSkillId="997" />
+				<param castSkillId="997" /> <!-- Crushing Strike -->
 				<param chance="30" />
-				<param skillId="6920" skillLevel="1" />
+				<param skillId="6920" skillLevel="1" /> <!-- Collector's Fortune -->
 				<param targetType="SELF" />
 			</effect>
 		</for>
@@ -2141,7 +2141,7 @@
 	<skill id="992" levels="8" name="Sonic Mastery">
 		<!-- High Five Skill -->
 		<table name="#magicLvl"> 40 43 49 55 60 66 70 79 </table>
-		<table name="#triggeredLevel"> 1 2 3 4 5 6 7 8 </table>
+		<table name="#skillLevel"> 1 2 3 4 5 6 7 8 </table>
 		<set name="icon" val="icon.skill0992" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="P" />
@@ -2150,7 +2150,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="15" />
-				<param skillId="6813" skillLevel="1" />
+				<param skillId="6813" skillLevel="#skillLevel" /> <!-- Focus Sonic -->
 				<param targetType="SELF" />
 				<param allowWeapons="DUAL,SWORD,BLUNT" />
 			</effect>
@@ -2158,7 +2158,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="30" />
-				<param skillId="6813" skillLevel="1" />
+				<param skillId="6813" skillLevel="#skillLevel" /> <!-- Focus Sonic -->
 				<param targetType="SELF" />
 				<param allowWeapons="DUAL,SWORD,BLUNT" />
 			</effect>
@@ -2167,7 +2167,7 @@
 	<skill id="993" levels="8" name="Force Mastery">
 		<!-- High Five Skill -->
 		<table name="#magicLvl"> 24 32 40 52 60 66 72 79 </table>
-		<table name="#triggeredLevel"> 1 2 3 4 5 6 7 8 </table>
+		<table name="#skillLevel"> 1 2 3 4 5 6 7 8 </table>
 		<set name="icon" val="icon.skill0993" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="P" />
@@ -2177,7 +2177,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="15" />
-				<param skillId="6814" skillLevel="1" />
+				<param skillId="6814" skillLevel="#skillLevel" /> <!-- Focus Force -->
 				<param targetType="SELF" />
 				<param allowWeapons="DUALFIST" />
 			</effect>
@@ -2185,7 +2185,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="30" />
-				<param skillId="6814" skillLevel="1" />
+				<param skillId="6814" skillLevel="#skillLevel" /> <!-- Focus Force -->
 				<param targetType="SELF" />
 				<param allowWeapons="DUALFIST" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml
index e021fbaccd..eda6e22f4c 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/01400-01499.xml
@@ -3358,7 +3358,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="5" />
-				<param skillId="5571" skillLevel="1" />
+				<param skillId="5571" skillLevel="1" /> <!-- Mutual Response -->
 				<param targetType="SUMMON" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml b/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
index a7bd9705d1..388b5ff893 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
@@ -865,13 +865,12 @@
 		<set name="icon" val="icon.skill1526" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="true" />
 				<param minDamage="#minDamage" chance="10" />
-				<param skillId="#triggeredId" skillLevel="1" />
+				<param skillId="#triggeredId" skillLevel="1" /> <!-- Steal Mana -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1363,9 +1362,9 @@
 		<set name="operateType" val="P" />
 		<for>
 			<effect name="TriggerSkillBySkill">
-				<param castSkillId="927" />
+				<param castSkillId="927" /> <!-- Burning Chop -->
 				<param chance="30" />
-				<param skillId="6060" skillLevel="1" />
+				<param skillId="6060" skillLevel="1" /> <!-- Great Fury -->
 				<param targetType="PARTY" />
 			</effect>
 		</for>
@@ -1778,9 +1777,9 @@
 		<for>
 			<effect name="MagicalAttack" />
 			<effect name="TriggerSkillBySkill">
-				<param castSkillId="1558" />
+				<param castSkillId="1558" /> <!-- Dimension Spiral -->
 				<param chance="5" />
-				<param skillId="5571" skillLevel="1" />
+				<param skillId="5571" skillLevel="1" /> <!-- Mutual Response -->
 				<param targetType="SUMMON" />
 			</effect>
 		</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03400-03499.xml b/L2J_DataPack/dist/game/data/stats/skills/03400-03499.xml
index f2ee05da87..3d6068f7f3 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03400-03499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03400-03499.xml
@@ -371,13 +371,12 @@
 		<!-- Rapier +4 Skill -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="5" />
-				<param skillId="5547" skillLevel="1" />
+				<param skillId="5547" skillLevel="1" /> <!-- Maximum Ability -->
 				<param targetType="PARTY" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -404,7 +403,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="5" />
-				<param skillId="5547" skillLevel="1" />
+				<param skillId="5547" skillLevel="1" /> <!-- Maximum Ability -->
 				<param targetType="PARTY" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml b/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml
index 807e013479..43ea8671db 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03600-03699.xml
@@ -990,7 +990,7 @@
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="50" chance="20" />
-				<param skillId="5681" skillLevel="1" />
+				<param skillId="5681" skillLevel="1" /> <!-- PvP Weapon - CP Drain -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1001,13 +1001,12 @@
 		<set name="icon" val="icon.skill1056" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="50" chance="10" />
-				<param skillId="5682" skillLevel="1" />
+				<param skillId="5682" skillLevel="1" /> <!-- PvP Weapon - Cancel -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1023,7 +1022,7 @@
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="50" chance="20" />
-				<param skillId="5683" skillLevel="1" />
+				<param skillId="5683" skillLevel="1" /> <!-- PvP Weapon - Ignore Shield Defense -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1039,7 +1038,7 @@
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="50" chance="10" />
-				<param skillId="5684" skillLevel="1" />
+				<param skillId="5684" skillLevel="1" /> <!-- PvP Weapon - Attack Chance -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1050,7 +1049,6 @@
 		<set name="icon" val="icon.skill0228" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1071,7 +1069,7 @@
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="50" chance="10" />
-				<param skillId="5686" skillLevel="1" />
+				<param skillId="5686" skillLevel="1" /> <!-- PvP Weapon - Rapid Fire -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1087,7 +1085,7 @@
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="50" chance="10" />
-				<param skillId="5687" skillLevel="1" />
+				<param skillId="5687" skillLevel="1" /> <!-- PvP Weapon - Decrease Range -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1098,13 +1096,12 @@
 		<set name="icon" val="icon.skill0756" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="50" chance="10" />
-				<param skillId="5688" skillLevel="1" />
+				<param skillId="5688" skillLevel="1" /> <!-- PvP Weapon - Decrease Resist -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1115,7 +1112,6 @@
 		<set name="icon" val="icon.skill0086" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1131,7 +1127,6 @@
 		<set name="icon" val="icon.skill1040" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1147,7 +1142,6 @@
 		<set name="icon" val="icon.skill1242" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1163,12 +1157,11 @@
 		<set name="icon" val="icon.skill1011" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillBySkill">
-				<param castSkillId="1401" />
+				<param castSkillId="1401" /> <!-- Major Heal -->
 				<param chance="5" />
-				<param skillId="5692" skillLevel="1" />
+				<param skillId="5692" skillLevel="1" /> <!-- PvP Armor - Heal -->
 				<param targetType="ONE" />
 			</effect>
 		</for>
@@ -1178,7 +1171,6 @@
 		<set name="icon" val="icon.skill1160" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1194,7 +1186,6 @@
 		<set name="icon" val="icon.skill0445" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1253,7 +1244,6 @@
 		<set name="icon" val="icon.etc_talisman_i02" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
diff --git a/L2J_DataPack/dist/game/data/stats/skills/03800-03899.xml b/L2J_DataPack/dist/game/data/stats/skills/03800-03899.xml
index 9db3979bdc..0cbcbf17a5 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/03800-03899.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/03800-03899.xml
@@ -377,7 +377,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="6" />
-				<param skillId="5665" skillLevel="1" />
+				<param skillId="5665" skillLevel="1" /> <!-- Stun -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -440,13 +440,12 @@
 		<set name="icon" val="icon.skill0100" />
 		<set name="magicLvl" val="70" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="6" />
-				<param skillId="5666" skillLevel="1" />
+				<param skillId="5666" skillLevel="1" /> <!-- Stun -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -509,13 +508,12 @@
 		<set name="icon" val="icon.skill0100" />
 		<set name="magicLvl" val="70" />
 		<set name="operateType" val="P" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="6" />
-				<param skillId="5667" skillLevel="1" />
+				<param skillId="5667" skillLevel="1" /> <!-- Stun -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -787,7 +785,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="5" />
-				<param skillId="5668" skillLevel="1" />
+				<param skillId="5668" skillLevel="1" /> <!-- Poison -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -978,7 +976,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="6" />
-				<param skillId="5669" skillLevel="1" />
+				<param skillId="5669" skillLevel="1" /> <!-- Stun -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1059,7 +1057,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="6" />
-				<param skillId="5670" skillLevel="1" />
+				<param skillId="5670" skillLevel="1" /> <!-- Stun -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -1103,7 +1101,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="#activationChance" />
-				<param skillId="#triggeredId" skillLevel="1" />
+				<param skillId="#triggeredId" skillLevel="1" /> <!-- Stun -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml b/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml
index 59a5d203a8..fa3100ff58 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05500-05599.xml
@@ -864,8 +864,8 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="15" />
-				<param skillId="5551" skillLevel="#triggeredLvl" />
-				<param targetType="SELF" />
+				<param skillId="5551" skillLevel="#triggeredLvl" /> <!-- Stun -->
+				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
 		</for>
@@ -1042,7 +1042,6 @@
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="81" />
 		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1072,7 +1071,6 @@
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="81" />
 		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1103,7 +1101,6 @@
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="81" />
 		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
@@ -1133,7 +1130,6 @@
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="81" />
 		<set name="operateType" val="A2" />
-		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml b/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml
index 7b3d8ab157..f7534e452c 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05600-05699.xml
@@ -1423,7 +1423,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="60" />
-				<param skillId="5680" skillLevel="1" />
+				<param skillId="5680" skillLevel="1" /> <!-- Oblivion Trap -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml b/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml
index 15d9ee645c..8ea1da24dc 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05800-05899.xml
@@ -663,7 +663,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="20" />
-				<param skillId="5846" skillLevel="#skillLevel" />
+				<param skillId="5846" skillLevel="#skillLevel" /> <!-- Bleed -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml b/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml
index e838576bb4..1d06b8519b 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05900-05999.xml
@@ -23,7 +23,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="90" />
-				<param skillId="5902" skillLevel="1" />
+				<param skillId="5902" skillLevel="1" /> <!-- NPC Trigger Target Cancel -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -52,7 +52,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="90" />
-				<param skillId="5902" skillLevel="1" />
+				<param skillId="5902" skillLevel="1" /> <!-- NPC Trigger Target Cancel -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -246,7 +246,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="100" />
-				<param skillId="5914" skillLevel="1" />
+				<param skillId="5914" skillLevel="1" /> <!-- Putrefaction Cleanse -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml b/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml
index 03393c3d13..9d3b80f66f 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/06900-06999.xml
@@ -143,7 +143,7 @@
 		<set name="icon" val="BranchSys2.icon.skill0952" />
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="74" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A2" /> <!-- FIXME: value unconfirmed -->
 		<set name="reuseDelay" val="15000" /> <!-- FIXME: value unconfirmed -->
 		<set name="targetType" val="SELF" />
 		<for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml b/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml
index f05c0e77d9..8e5cec2b01 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/08200-08299.xml
@@ -982,7 +982,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="true" />
 				<param minDamage="1" chance="99" />
-				<param skillId="5760" skillLevel="1" />
+				<param skillId="5760" skillLevel="1" /> <!-- Critical Hit -->
 				<param targetType="SELF" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/08300-08399.xml b/L2J_DataPack/dist/game/data/stats/skills/08300-08399.xml
index 2d4be66ce6..90833fe806 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/08300-08399.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/08300-08399.xml
@@ -185,7 +185,7 @@
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="33" />
-				<param skillId="21007" skillLevel="1" />
+				<param skillId="5994" skillLevel="1" /> <!-- Effect of Doubt -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/21200-21299.xml b/L2J_DataPack/dist/game/data/stats/skills/21200-21299.xml
index 256fa3c263..c9676f829c 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/21200-21299.xml
@@ -618,7 +618,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="3" />
-				<param skillId="23319" skillLevel="1" />
+				<param skillId="23319" skillLevel="1" /> <!-- Blood Seeker -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -634,7 +634,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="3" />
-				<param skillId="23320" skillLevel="1" />
+				<param skillId="23320" skillLevel="1" /> <!-- Greedy Throat -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -650,7 +650,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="3" />
-				<param skillId="23321" skillLevel="1" />
+				<param skillId="23321" skillLevel="1" /> <!-- Draconic Evolver -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -666,7 +666,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="3" />
-				<param skillId="23322" skillLevel="10" />
+				<param skillId="23322" skillLevel="10" /> <!-- Demonic Desire -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -682,7 +682,7 @@
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="3" />
-				<param skillId="23323" skillLevel="10" />
+				<param skillId="23323" skillLevel="10" /> <!-- Fury of Darkness -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
@@ -698,7 +698,7 @@
 				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param minDamage="1" />
 				<param chance="3" />
-				<param skillId="23324" skillLevel="1" />
+				<param skillId="23324" skillLevel="1" /> <!-- Jet Black Typhoon -->
 				<param targetType="SELF" />
 			</effect>
 		</for>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/23300-23399.xml b/L2J_DataPack/dist/game/data/stats/skills/23300-23399.xml
index 014de8132a..d009f54845 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/23300-23399.xml
@@ -204,6 +204,7 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="TURN_FLEE" />
+		<set name="abnormalVisualEffect" val="TURN_FLEE" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="MEN" />
 		<set name="blockedInOlympiad" val="true" />
-- 
GitLab