From 5ea19d78f5051a38b5d8112f6937e9ccb81902b1 Mon Sep 17 00:00:00 2001
From: MELERIX <MELERIX@users.noreply.github.com>
Date: Wed, 5 Sep 2012 00:13:41 +0000
Subject: [PATCH] BETA: Skill Fixes / Updates...  * Fixed "Black Talisman -
 Free Speech" skill, added "silence_all_two" in negateAbnormals (as Temp Fix),
 to remove second effect on "silecen_all" skills (Reported & Tested by:
 facheme).  * Added abnormalType "silence_all_two" (as Temp Fix) in the second
 effect of "silecen_all" skills.  * Fixed/Updated most of Improved related
 skills, also added a Temp Fix in replace of blockBuff effect (that is not
 done yet).  * Few other minor things fixed/updated.

---
 .../game/data/stats/skills/00400-00499.xml    |   4 +-
 .../game/data/stats/skills/01300-01399.xml    | 220 ++++++++------
 .../game/data/stats/skills/01400-01499.xml    |  25 +-
 .../game/data/stats/skills/01500-01599.xml    | 281 +++++++++++-------
 .../game/data/stats/skills/02000-02099.xml    |   3 +-
 .../game/data/stats/skills/02700-02799.xml    |  11 +-
 .../game/data/stats/skills/03100-03199.xml    |   2 +-
 .../game/data/stats/skills/03200-03299.xml    |   2 +-
 .../game/data/stats/skills/04000-04099.xml    |  18 +-
 .../game/data/stats/skills/04200-04299.xml    |   2 +-
 .../game/data/stats/skills/04400-04499.xml    |  13 +-
 .../game/data/stats/skills/05100-05199.xml    |   2 +-
 .../game/data/stats/skills/05600-05699.xml    |   2 +-
 .../game/data/stats/skills/06100-06199.xml    |   8 +-
 .../game/data/stats/skills/06200-06299.xml    |  98 +++---
 .../game/data/stats/skills/06300-06399.xml    |   6 +-
 .../game/data/stats/skills/07000-07099.xml    |  90 ++++--
 .../game/data/stats/skills/23200-23299.xml    | 197 ++++++++----
 18 files changed, 598 insertions(+), 386 deletions(-)

diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
index f7e4f7c88a..e02cd6361b 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
@@ -1334,11 +1334,11 @@
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
 		<for>
 			<effect name="Mute" abnormalTime="120" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="120" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="120" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 		<enchant2for>
 			<effect name="Mute" abnormalTime="#ench2Time" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="#ench2Time" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</enchant2for>
 	</skill>
 	<skill id="438" levels="1" name="Soul of the Phoenix">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
index 9a34c895af..2c56340896 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
@@ -818,11 +818,11 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<for>
 			<effect name="Mute" abnormalTime="60" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="60" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="60" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 		<enchant2for>
 			<effect name="Mute" abnormalTime="#ench2Time" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="#ench2Time" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</enchant2for>
 	</skill>
 	<skill id="1337" levels="1" name="Curse of Abyss" enchantGroup1="6" enchantGroup2="6">
@@ -1726,141 +1726,167 @@
 		</enchant3for>
 	</skill>
 	<skill id="1358" levels="1" name="Block Shield" enchantGroup1="5" enchantGroup2="5">
+		<!-- Confirmed CT2.5 -->
 		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 82 83 84 86 87 88 90 91 92 94 95 96 97 99 100 </table>
-		<table name="#ench2mpInitialConsume"> 13 13 12 12 11 11 10 10 10 9 9 8 8 7 7 </table>
-		<table name="#ench2mpConsume"> 54 52 50 48 46 44 42 41 38 37 34 33 30 29 26 </table>
+		<table name="#ench2mpConsume"> 54 52 50 48 46 44 42 41 39 37 35 33 31 29 27 </table>
+		<table name="#ench2mpInitialConsume"> 13 13 12 12 11 11 10 10 9 9 8 8 7 7 6 </table>
 		<table name="#ench2Time"> 128 136 144 152 160 168 176 184 192 200 208 216 224 232 240 </table>
-		<set name="mpInitialConsume" val="14" />
-		<set name="mpConsume" val="56" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="1100" />
+		<set name="hitTime" val="4000" />
+		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="lvlDepend" val="2" />
 		<set name="magicLvl" val="77" />
+		<set name="mpConsume" val="56" />
+		<set name="mpInitialConsume" val="14" />
+		<set name="negateAbnormals" val="pd_up;improve_pa_pd_up" />
+		<set name="operateType" val="A2" />
 		<set name="power" val="80" /> <!-- Base Land Rate -->
-		<set name="lvlDepend" val="2" />
-		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="8000" />
-		<set name="hitTime" val="4000" />
-		<set name="isDebuff" val="true" />
 		<set name="saveVs" val="MEN" />
 		<set name="skillType" val="DEBUFF" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="operateType" val="A2" />
-		<set name="castRange" val="600" />
-		<set name="effectRange" val="1100" />
+		<set name="target" val="TARGET_ONE" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
-		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
+		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="100" abnormalType="pd_up"> <!-- pd_up is here for remove pDef buffs on target -->
+			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_shield_up">
 				<mul order="0x30" stat="pDef" val="0.9" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_pa_pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 		<enchant2for>
-			<effect name="Debuff" abnormalTime="#ench2Time" val="0" abnormalLvl="100" abnormalType="pd_up"> <!-- pd_up is here for remove pDef buffs on target -->
+			<effect name="Debuff" abnormalTime="#ench2Time" val="0" abnormalLvl="10" abnormalType="block_shield_up">
 				<mul order="0x30" stat="pDef" val="0.9" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_pa_pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</enchant2for>
 	</skill>
 	<skill id="1359" levels="1" name="Block Wind Walk" enchantGroup1="5" enchantGroup2="5">
+		<!-- Confirmed CT2.5 -->
 		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 82 83 84 86 87 88 90 91 92 94 95 96 97 99 100 </table>
-		<table name="#ench2mpInitialConsume"> 13 13 12 12 11 11 10 10 10 9 9 8 8 7 7 </table>
-		<table name="#ench2mpConsume"> 54 52 50 48 46 44 42 41 38 37 34 33 30 29 26 </table>
+		<table name="#ench2mpConsume"> 54 52 50 48 46 44 42 41 39 37 35 33 31 29 27 </table>
+		<table name="#ench2mpInitialConsume"> 13 13 12 12 11 11 10 10 9 9 8 8 7 7 6 </table>
 		<table name="#ench2Time"> 128 136 144 152 160 168 176 184 192 200 208 216 224 232 240 </table>
-		<set name="mpInitialConsume" val="14" />
-		<set name="mpConsume" val="56" />
+		<set name="castRange" val="600" />
+		<set name="effectRange" val="1100" />
+		<set name="hitTime" val="4000" />
+		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="lvlDepend" val="2" />
 		<set name="magicLvl" val="77" />
+		<set name="mpConsume" val="56" />
+		<set name="mpInitialConsume" val="14" />
+		<set name="negateAbnormals" val="improve_speed_avoid_up;speed_up" />
+		<set name="operateType" val="A2" />
 		<set name="power" val="80" /> <!-- Base Land Rate -->
-		<set name="lvlDepend" val="2" />
-		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="8000" />
-		<set name="hitTime" val="4000" />
-		<set name="isDebuff" val="true" />
 		<set name="saveVs" val="MEN" />
 		<set name="skillType" val="DEBUFF" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="operateType" val="A2" />
-		<set name="castRange" val="600" />
-		<set name="effectRange" val="1100" />
+		<set name="target" val="TARGET_ONE" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
-		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
+		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="100" abnormalType="speed_up"> <!-- speed_up here is for remove speed buffs on target -->
+			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_speed_up">
 				<mul order="0x30" stat="runSpd" val="0.9" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 		<enchant2for>
-			<effect name="Debuff" abnormalTime="#ench2Time" val="0" abnormalLvl="100" abnormalType="speed_up"> <!-- speed_up here is for remove speed buffs on target -->
+			<effect name="Debuff" abnormalTime="#ench2Time" val="0" abnormalLvl="10" abnormalType="block_speed_up">
 				<mul order="0x30" stat="runSpd" val="0.9" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Debuff" abnormalTime="#ench2Time" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</enchant2for>
 	</skill>
 	<skill id="1360" levels="1" name="Mass Block Shield" enchantGroup1="5" enchantGroup2="5">
+		<!-- Confirmed CT2.5 -->
 		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 42 45 48 50 53 56 58 61 64 66 69 72 74 77 80 </table>
 		<table name="#ench2Power"> 41 42 44 45 46 48 49 50 52 53 54 56 57 58 60 </table>
-		<table name="#ench2mpInitialConsume"> 20 19 19 18 17 17 16 15 14 14 13 12 12 11 10 </table>
-		<table name="#ench2mpConsume"> 81 78 74 72 69 66 64 61 58 54 53 50 46 44 41 </table>
-		<set name="mpInitialConsume" val="21" />
-		<set name="mpConsume" val="84" />
+		<table name="#ench2mpConsume"> 81 78 75 72 69 67 64 61 58 55 53 50 47 44 41 </table>
+		<table name="#ench2mpInitialConsume"> 20 19 18 18 17 16 16 15 14 13 13 12 11 11 10 </table>
+		<set name="hitTime" val="4000" />
+		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="lvlDepend" val="1" />
 		<set name="magicLvl" val="77" />
+		<set name="mpConsume" val="84" />
+		<set name="mpInitialConsume" val="21" />
+		<set name="negateAbnormals" val="improve_pa_pd_up;pd_up" />
+		<set name="operateType" val="A2" />
 		<set name="power" val="40" /> <!-- Base Land Rate -->
-		<set name="lvlDepend" val="1" />
-		<set name="target" val="TARGET_AURA" />
-		<set name="skillRadius" val="200" />
 		<set name="reuseDelay" val="30000" />
-		<set name="hitTime" val="4000" />
 		<set name="saveVs" val="MEN" />
+		<set name="skillRadius" val="200" />
 		<set name="skillType" val="DEBUFF" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="isDebuff" val="true" />
-		<set name="operateType" val="A2" />
+		<set name="target" val="TARGET_AURA" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="power" val="#ench2Power" />
-		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
+		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="100" abnormalType="pd_up"> <!-- pd_up is here for remove pDef buffs in target aura -->
+			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_shield_up">
 				<mul order="0x30" stat="pDef" val="0.9" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_pa_pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1361" levels="1" name="Mass Block Wind Walk" enchantGroup1="5" enchantGroup2="5">
+		<!-- Confirmed CT2.5 -->
 		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 42 45 48 50 53 56 58 61 64 66 69 72 74 77 80 </table>
 		<table name="#ench2Power"> 41 42 44 45 46 48 49 50 52 53 54 56 57 58 60 </table>
-		<table name="#ench2mpInitialConsume"> 20 19 19 18 17 17 16 15 14 14 13 12 12 11 10 </table>
-		<table name="#ench2mpConsume"> 81 78 74 72 69 66 64 61 58 54 53 50 46 44 41 </table>
-		<set name="mpInitialConsume" val="22" />
-		<set name="mpConsume" val="85" />
+		<table name="#ench2mpConsume"> 81 78 75 72 69 67 64 61 58 55 53 50 47 44 41 </table>
+		<table name="#ench2mpInitialConsume"> 20 19 18 18 17 16 16 15 14 13 13 12 11 11 10 </table>
+		<set name="hitTime" val="4000" />
+		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="lvlDepend" val="1" />
 		<set name="magicLvl" val="78" />
+		<set name="mpConsume" val="85" />
+		<set name="mpInitialConsume" val="22" />
+		<set name="negateAbnormals" val="improve_speed_avoid_up;speed_up" />
+		<set name="operateType" val="A2" />
 		<set name="power" val="40" /> <!-- Base Land Rate -->
-		<set name="lvlDepend" val="1" />
-		<set name="target" val="TARGET_AURA" />
-		<set name="skillRadius" val="200" />
 		<set name="reuseDelay" val="30000" />
-		<set name="hitTime" val="4000" />
-		<set name="isDebuff" val="true" />
 		<set name="saveVs" val="MEN" />
+		<set name="skillRadius" val="200" />
 		<set name="skillType" val="DEBUFF" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="operateType" val="A2" />
+		<set name="target" val="TARGET_AURA" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="power" val="#ench2Power" />
-		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
+		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="100" abnormalType="speed_up"> <!-- SpeedUp here is for remove speed buffs on target -->
+			<effect name="Debuff" abnormalTime="120" val="0" abnormalLvl="10" abnormalType="block_speed_up">
 				<mul order="0x30" stat="runSpd" val="0.9" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Debuff" abnormalTime="120" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1362" levels="1" name="Chant of Spirit" enchantGroup1="5" enchantGroup2="5">
@@ -1969,69 +1995,83 @@
 		</enchant3for>
 	</skill>
 	<skill id="1364" levels="1" name="Eye of Pa'agrio" enchantGroup1="5" enchantGroup2="5">
+		<!-- Confirmed CT2.5 -->
+		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Time"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 </table>
-		<table name="#ench2mpInitialConsume"> 54 52 50 48 46 45 43 41 39 37 35 33 31 30 28 </table>
-		<table name="#ench2mpConsume"> 216 209 201 194 186 178 170 164 156 149 141 134 126 118 112 </table>
-		<set name="mpInitialConsume" val="56" />
-		<set name="mpConsume" val="224" />
-		<set name="target" val="TARGET_PARTY_CLAN" />
-		<set name="skillRadius" val="900" />
-		<set name="reuseDelay" val="5000" />
+		<table name="#ench2mpConsume"> 216 209 201 194 186 179 171 164 156 149 141 134 126 119 112 </table>
+		<table name="#ench2mpInitialConsume"> 54 52 50 48 46 44 42 41 39 37 35 33 31 29 28 </table>
+		<set name="aggroPoints" val="666" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="77" />
+		<set name="mpConsume" val="224" />
+		<set name="mpInitialConsume" val="56" />
+		<set name="negateAbnormals" val="hit_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="666" />
-		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
+		<set name="reuseDelay" val="5000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY_CLAN" />
+		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
+		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
+		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="9" abnormalType="hit_up">
+			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="improve_hit_defence_crt_rate_up">
 				<add order="0x40" stat="accCombat" val="4" />
-			</effect>
-			<effect name="Buff" abnormalTime="1200" noicon="1" val="0" abnormalLvl="90" abnormalType="critDamEvas">
 				<mul order="0x30" stat="critDamEvas" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="1200" noicon="1" val="0" abnormalLvl="100" abnormalType="hit_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 		<enchant1for>
-			<effect name="Buff" abnormalTime="#ench1Time" val="0" abnormalLvl="9" abnormalType="hit_up">
+			<effect name="Buff" abnormalTime="#ench1Time" val="0" abnormalLvl="1" abnormalType="improve_hit_defence_crt_rate_up">
 				<add order="0x40" stat="accCombat" val="4" />
-			</effect>
-			<effect name="Buff" abnormalTime="#ench1Time" noicon="1" val="0" abnormalLvl="90" abnormalType="critDamEvas">
 				<mul order="0x30" stat="critDamEvas" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="#ench1Time" noicon="1" val="0" abnormalLvl="100" abnormalType="hit_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</enchant1for>
 	</skill>
 	<skill id="1365" levels="1" name="Soul of Pa'agrio" enchantGroup1="5" enchantGroup2="5">
+		<!-- Confirmed CT2.5 -->
+		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Time"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 </table>
-		<table name="#ench2mpInitialConsume"> 54 52 50 48 46 45 43 41 39 37 35 33 31 30 28 </table>
-		<table name="#ench2mpConsume"> 216 209 201 194 186 178 170 164 156 149 141 134 126 118 112 </table>
-		<set name="mpInitialConsume" val="56" />
-		<set name="mpConsume" val="224" />
-		<set name="target" val="TARGET_PARTY_CLAN" />
-		<set name="skillRadius" val="900" />
-		<set name="reuseDelay" val="5000" />
+		<table name="#ench2mpConsume"> 216 209 201 194 186 179 171 164 156 149 141 134 126 119 112 </table>
+		<table name="#ench2mpInitialConsume"> 54 52 50 48 46 44 42 41 39 37 35 33 31 29 28 </table>
+		<set name="aggroPoints" val="666" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="77" />
+		<set name="mpConsume" val="224" />
+		<set name="mpInitialConsume" val="56" />
+		<set name="negateAbnormals" val="ma_up,9;md_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="666" />
-		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
+		<set name="reuseDelay" val="5000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY_CLAN" />
+		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
+		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
+		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="9" abnormalType="ma_up">
+			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="1" abnormalType="improve_ma_md_up">
 				<mul order="0x30" stat="mAtk" val="1.75" />
-			</effect>
-			<effect name="Buff" abnormalTime="1200" noicon="1" val="0" abnormalLvl="9" abnormalType="md_up">
 				<mul order="0x30" stat="mDef" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="1200" noicon="1" val="0" abnormalLvl="100" abnormalType="ma_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="1200" noicon="1" val="0" abnormalLvl="100" abnormalType="md_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 		<enchant1for>
-			<effect name="Buff" abnormalTime="#ench1Time" val="0" abnormalLvl="9" abnormalType="ma_up">
+			<effect name="Buff" abnormalTime="#ench1Time" val="0" abnormalLvl="1" abnormalType="improve_ma_md_up">
 				<mul order="0x30" stat="mAtk" val="1.75" />
-			</effect>
-			<effect name="Buff" abnormalTime="#ench1Time" noicon="1" val="0" abnormalLvl="9" abnormalType="md_up">
 				<mul order="0x30" stat="mDef" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="#ench1Time" noicon="1" val="0" abnormalLvl="100" abnormalType="ma_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="#ench1Time" noicon="1" val="0" abnormalLvl="100" abnormalType="md_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</enchant1for>
 	</skill>
 	<skill id="1366" levels="1" name="Seal of Despair" enchantGroup1="5" enchantGroup2="5">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
index b3db015fd6..6738dfbcfb 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
@@ -2756,23 +2756,28 @@
 		</for>
 	</skill>
 	<skill id="1499" levels="1" name="Improved Combat">
-		<set name="mpConsume" val="27" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="679" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="21" />
+		<set name="mpInitialConsume" val="6" />
+		<set name="negateAbnormals" val="pa_up,9;pd_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="pa_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_pa_pd_up">
 				<mul order="0x30" stat="pAtk" val="1.15" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="pd_up" noicon="1">
 				<mul order="0x30" stat="pDef" val="1.15" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="pa_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 </list>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
index 3273a99ed1..889ccad9db 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
@@ -1,103 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="1500" levels="1" name="Improved Magic">
-		<set name="mpConsume" val="28" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="679" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="22" />
+		<set name="mpInitialConsume" val="6" />
+		<set name="negateAbnormals" val="ma_up,9;md_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="ma_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_ma_md_up">
 				<mul order="0x30" stat="mAtk" val="1.75" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="md_up" noicon="1">
 				<mul order="0x30" stat="mDef" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="ma_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="md_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1501" levels="1" name="Improved Condition">
-		<set name="mpConsume" val="28" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="679" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="22" />
+		<set name="mpInitialConsume" val="6" />
+		<set name="negateAbnormals" val="max_hp_up,9;max_mp_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="max_hp_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_hp_mp_up">
 				<mul order="0x30" stat="maxHp" val="1.35" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="max_mp_up" noicon="1">
 				<mul order="0x30" stat="maxMp" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="max_hp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="max_mp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1502" levels="1" name="Improved Critical Attack">
-		<set name="mpConsume" val="28" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="679" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="22" />
+		<set name="mpInitialConsume" val="6" />
+		<set name="negateAbnormals" val="critical_prob_up,9;critical_dmg_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="critical_prob_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_crt_rate_dmg_up">
 				<basemul order="0x30" stat="rCrit" val="0.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="critical_dmg_up" noicon="1">
 				<mul order="0x30" stat="cAtk" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_dmg_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1503" levels="1" name="Improved Shield Defense">
-		<set name="mpConsume" val="27" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="679" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="21" />
+		<set name="mpInitialConsume" val="6" />
+		<set name="negateAbnormals" val="shield_prob_up,9;shield_defence_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="shield_prob_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_shield_rate_defence_up">
 				<mul order="0x30" stat="rShld" val="1.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="shield_defence_up" noicon="1">
 				<mul order="0x30" stat="sDef" val="1.5" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="shield_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="shield_defence_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1504" levels="1" name="Improved Movement">
-		<set name="mpConsume" val="28" />
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="679" />
+		<set name="castRange" val="400" />
+		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="22" />
+		<set name="mpInitialConsume" val="6" />
+		<set name="negateAbnormals" val="speed_up,9;avoid_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="speed_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_speed_avoid_up">
 				<add order="0x40" stat="runSpd" val="33" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="avoid_up" noicon="1">
 				<add order="0x40" stat="rEvas" val="4" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1505" levels="1" name="Sublime Self-Sacrifice">
@@ -438,63 +463,75 @@
 		<enchant2 name="pvpPower" val="#ench2Duel" />
 	</skill>
 	<skill id="1517" levels="1" name="Chant of Combat">
-		<set name="mpConsume" val="65" />
-		<set name="target" val="TARGET_PARTY" />
-		<set name="skillType" val="BUFF" />
-		<set name="skillRadius" val="1000" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="635" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="52" />
+		<set name="mpInitialConsume" val="17" />
+		<set name="negateAbnormals" val="pa_up,9;pd_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="pa_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_pa_pd_up">
 				<mul order="0x30" stat="pAtk" val="1.15" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="pd_up" noicon="1">
 				<mul order="0x30" stat="pDef" val="1.15" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="pa_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1518" levels="1" name="Chant of Critical Attack">
-		<set name="mpConsume" val="67" />
-		<set name="target" val="TARGET_PARTY" />
-		<set name="skillType" val="BUFF" />
-		<set name="skillRadius" val="1000" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="646" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="53" />
+		<set name="mpInitialConsume" val="14" />
+		<set name="negateAbnormals" val="critical_prob_up,9;critical_dmg_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="critical_prob_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_crt_rate_dmg_up">
 				<basemul order="0x30" stat="rCrit" val="0.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="critical_dmg_up" noicon="1">
 				<mul order="0x30" stat="cAtk" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_dmg_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1519" levels="1" name="Chant of Blood Awakening">
-		<set name="mpConsume" val="69" />
-		<set name="target" val="TARGET_PARTY" />
-		<set name="skillType" val="BUFF" />
-		<set name="skillRadius" val="1000" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="655" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="55" />
+		<set name="mpInitialConsume" val="14" />
+		<set name="negateAbnormals" val="vampiric_attack,9;attack_time_down,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="vampiric_attack">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_vampiric_haste">
 				<add order="0x40" stat="absorbDam" val="9" /> <!-- absorb 9% HP from damage inflicted on enemies -->
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="attack_time_down" noicon="1">
 				<mul order="0x30" stat="pAtkSpd" val="1.33" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="vampiric_attack" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="attack_time_down" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1520" levels="1" name="Inquisitor">
@@ -836,85 +873,99 @@
 		</for>
 	</skill>
 	<skill id="1535" levels="1" name="Chant of Movement">
-		<set name="mpConsume" val="69" />
-		<set name="target" val="TARGET_PARTY" />
-		<set name="skillType" val="BUFF" />
-		<set name="skillRadius" val="1000" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="1" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="55" />
+		<set name="mpInitialConsume" val="14" />
+		<set name="negateAbnormals" val="speed_up,9;avoid_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="speed_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_speed_avoid_up">
 				<add order="0x40" stat="runSpd" val="33" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="avoid_up" noicon="1">
 				<add order="0x40" stat="rEvas" val="4" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1536" levels="1" name="Combat of Pa'agrio">
-		<set name="mpConsume" val="272" />
-		<set name="target" val="TARGET_PARTY_CLAN" />
-		<set name="skillType" val="BUFF" />
-		<set name="skillRadius" val="900" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="1" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="217" />
+		<set name="mpInitialConsume" val="55" />
+		<set name="negateAbnormals" val="pa_up,9;pd_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="castRange" val="400" />
-		<set name="effectRange" val="900" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY_CLAN" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="pa_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_pa_pd_up">
 				<mul order="0x30" stat="pAtk" val="1.15" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="pd_up" noicon="1">
 				<mul order="0x30" stat="pDef" val="1.15" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="pa_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1537" levels="1" name="Critical of Pa'agrio">
-		<set name="mpConsume" val="272" />
-		<set name="target" val="TARGET_PARTY_CLAN" />
-		<set name="skillType" val="BUFF" />
-		<set name="skillRadius" val="900" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="1" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="217" />
+		<set name="mpInitialConsume" val="55" />
+		<set name="negateAbnormals" val="critical_prob_up,9;critical_dmg_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY_CLAN" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="critical_prob_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_crt_rate_dmg_up">
 				<basemul order="0x30" stat="rCrit" val="0.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="critical_dmg_up" noicon="1">
 				<mul order="0x30" stat="cAtk" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_dmg_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1538" levels="1" name="Condition of Pa'agrio">
-		<set name="mpConsume" val="272" />
-		<set name="target" val="TARGET_PARTY_CLAN" />
-		<set name="skillType" val="BUFF" />
-		<set name="skillRadius" val="900" />
-		<set name="reuseDelay" val="2000" />
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="1" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="217" />
+		<set name="mpInitialConsume" val="55" />
+		<set name="negateAbnormals" val="max_hp_up,9;max_mp_up,9" />
 		<set name="operateType" val="A2" />
-		<set name="aggroPoints" val="655" />
+		<set name="reuseDelay" val="2000" />
+		<set name="skillRadius" val="1000" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_PARTY_CLAN" />
 		<for>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="max_hp_up">
+			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="1" abnormalType="improve_hp_mp_up">
 				<mul order="0x30" stat="maxHp" val="1.35" />
-			</effect>
-			<effect name="Buff" abnormalTime="2400" val="0" abnormalLvl="9" abnormalType="max_mp_up" noicon="1">
 				<mul order="0x30" stat="maxMp" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="max_hp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="2400" noicon="1" val="0" abnormalLvl="100" abnormalType="max_mp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="1539" levels="4" name="Stigma of Shilen" enchantGroup1="1">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml
index 4820276abf..094e11fd56 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02000-02099.xml
@@ -556,8 +556,7 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
-		<set name="negateAbnormals" val="fatal_poison,1" />
-		<set name="negateId" val="4082" /> <!-- TODO: This is a TEMP-FIX (to clean all effects from skill 4082), this should be removed if somebody fix the cancel/negate effect/skill handlers (and when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes) -->
+		<set name="negateAbnormals" val="fatal_poison,1;fatal_poison_two,1" /> <!-- TODO: This ";fatal_poison_two,1" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" in skill 4082 works like main skill attributes and not effect attributes -->
 		<set name="operateType" val="A1" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml
index 6f7d35a01e..41b294f86f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02700-02799.xml
@@ -1886,19 +1886,18 @@
 		</for>
 	</skill>
 	<skill id="2797" levels="1" name="Stone of Great Speed">
+		<!-- Confirmed CT2.5 -->
+		<set name="hitTime" val="4000" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
-		<set name="magicLvl" val="1" />
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A2" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
-		<set name="hitTime" val="4000" />
 		<for>
 			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="3" abnormalType="attack_time_down">
-				<mul order="0x30" stat="pAtkSpd" val="1.15" />
-			</effect>
-			<effect name="Buff" abnormalTime="1200" val="0" abnormalLvl="2" abnormalType="casting_time_down" noicon="1">
-				<mul order="0x30" stat="mAtkSpd" val="1.23" />
+				<mul order="0x30" stat="pAtkSpd" val="1.33" />
+				<mul order="0x30" stat="mAtkSpd" val="1.3" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
index 5663716076..bf480eaa40 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
@@ -1909,7 +1909,7 @@
 		<set name="trait" val="DERANGEMENT" />
 		<for>
 			<effect name="Mute" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="30" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="30" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="3199" levels="3" name="Item Skill: Skill Refresh">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
index 6b990ae4e7..96848e3543 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
@@ -1229,7 +1229,7 @@
 		<set name="magicLvl" val="55" />
 		<set name="mpConsume" val="40" />
 		<set name="mpInitialConsume" val="10" />
-		<set name="negateAbnormals" val="silence_all,9" />
+		<set name="negateAbnormals" val="silence_all,9;silence_all_two,9" /> <!-- TODO: This ";silence_all_two,9" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="360000" />
 		<set name="target" val="TARGET_SELF" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
index 23a25fb12b..6ba3fe0a17 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
@@ -1274,20 +1274,20 @@
 		<set name="effectRange" val="1100" />
 	</skill>
 	<skill id="4082" levels="1" name="Poison of Death">
-		<!-- Freya retail confirmed -->
-		<set name="target" val="TARGET_ONE" />
-		<set name="reuseDelay" val="50" />
-		<set name="skillType" val="DEBUFF" />
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="operateType" val="A2" />
-		<set name="isDebuff" val="true" />
+		<!-- Confirmed CT2.5 -->
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
+		<set name="isDebuff" val="true" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="killByDOT" val="true" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="50" />
+		<set name="skillType" val="DEBUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<for>
+			<!-- 20HP * 3 during 4200 seconds -->
 			<effect count="1400" name="DamOverTime" abnormalTime="3" val="60" abnormalVisualEffect="poison" abnormalLvl="1" abnormalType="fatal_poison" />
-			<effect name="Root" abnormalTime="4200" noicon="1" val="0" />
-			<effect name="ImmobileBuff" abnormalTime="4200" noicon="1" val="0" />
+			<effect name="Root" abnormalTime="4200" noicon="1" val="0" abnormalLvl="1" abnormalType="fatal_poison_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="fatal_poison_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="4083" levels="1" name="Die! You fool!">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
index c036a6dbbb..83ce3a92ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
@@ -310,7 +310,7 @@
 		<set name="canBeDispeled" val="false" />
 		<for>
 			<effect name="Mute" abnormalTime="3600" val="0" abnormalLvl="99" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="3600" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="3600" noicon="1" val="0" abnormalLvl="99" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="99" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="4216" levels="1" name="Scatter Enemy">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
index a9028e18f6..828989b402 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04400-04499.xml
@@ -916,9 +916,9 @@
 		<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
 		<table name="#mpConsume"> 10 16 21 28 36 44 52 55 58 60 61 62 </table>
 		<table name="#mpInitialConsume"> 3 4 6 7 9 11 13 14 15 15 16 16 </table>
-		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="aggroPoints" val="100" />
 		<set name="hitTime" val="1800" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
@@ -926,17 +926,10 @@
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
-			<!-- FIXME Custom Implementation -->
-			<effect name="Buff" abnormalTime="300" val="0" abnormalLvl="#abnormalLvl" abnormalType="pa_up">
+			<effect name="Buff" abnormalTime="300" val="0" abnormalLvl="#abnormalLvl" abnormalType="pa_pd_up">
 				<mul order="0x30" stat="pAtk" val="#pAtkDef" />
-			</effect>
-			<effect name="Buff" abnormalTime="300" val="0" abnormalLvl="#abnormalLvl" abnormalType="pd_up" noicon="1">
 				<mul order="0x30" stat="pDef" val="#pAtkDef" />
 			</effect>
-			<!-- effect name="Buff" abnormalTime="300" val="0" abnormalLvl="#abnormalLvl" abnormalType="pa_pd_up" -->
-			<!-- mul order="0x30" stat="pAtk" val="#pAtkDef" / -->
-			<!-- mul order="0x30" stat="pDef" val="#pAtkDef" / -->
-			<!-- /effect -->
 		</for>
 	</skill>
 	<skill id="4472" levels="12" name="NPC Strike Golem">
@@ -1139,7 +1132,7 @@
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="Mute" abnormalTime="120" val="0" abnormalLvl="99" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="120" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="120" noicon="1" val="0" abnormalLvl="99" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="99" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="4483" levels="12" name="Hold">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
index ccafd0ed05..003945af63 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
@@ -1226,7 +1226,7 @@
 		<set name="trait" val="DERANGEMENT" />
 		<for>
 			<effect name="Mute" abnormalTime="10" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="10" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="10" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="5178" levels="1" name="NPC Burn">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
index c5f42c1e57..38442d24c8 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
@@ -1447,7 +1447,7 @@
 		<set name="trait" val="DERANGEMENT" />
 		<for>
 			<effect name="Mute" abnormalTime="10" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="10" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="10" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="5698" levels="37" name="Bless the Blood">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06100-06199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06100-06199.xml
index e6bc38a5e5..d413e31c32 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06100-06199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06100-06199.xml
@@ -208,9 +208,13 @@
 		</for>
 	</skill>
 	<skill id="6127" levels="1" name="Anti-limit">
-		<set name="target" val="TARGET_NONE" />
-		<set name="skillType" val="NOTDONE" />
+		<!-- Confirmed CT2.5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
+		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="Buff" abnormalTime="-1" val="0" abnormalLvl="100" abnormalType="limit" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+		</for>
 	</skill>
 	<skill id="6128" levels="1" name="Presentation - Cow Rage">
 		<set name="target" val="TARGET_NONE" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
index 76a3eca417..d57ceb4467 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
@@ -7,77 +7,91 @@
 		<set name="hitTime" val="500" />
 	</skill>
 	<skill id="6201" levels="1" name="Transformation Condition - Frog">
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="10" />
+		<set name="castRange" val="900" />
+		<set name="effectRange" val="1500" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
+		<set name="negateAbnormals" val="improve_speed_avoid_up;speed_up" />
 		<set name="operateType" val="A2" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<set name="transformId" val="111" />
 		<for>
-			<!-- speed_up here is for block speed buffs on target -->
-			<effect name="Transformation" abnormalTime="520" val="0" abnormalLvl="99" abnormalType="speed_up">
-				<set order="0x08" stat="STR" val="40" />
-				<set order="0x08" stat="DEX" val="30" />
-				<set order="0x08" stat="CON" val="43" />
-				<set order="0x08" stat="INT" val="21" />
-				<set order="0x08" stat="WIT" val="13" />
-				<set order="0x08" stat="MEN" val="23" />
+			<effect name="Transformation" abnormalTime="520" val="0" abnormalLvl="99" abnormalType="transform">
+				<mul order="0x30" stat="weightLimit" val="11" />
+				<add order="0x40" stat="weightPenalty" val="9000" />
+				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Buff" abnormalTime="520" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="520" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="6202" levels="1" name="Transformation Condition - Young Child">
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="10" />
+		<set name="castRange" val="900" />
+		<set name="effectRange" val="1500" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
+		<set name="negateAbnormals" val="improve_speed_avoid_up;speed_up" />
 		<set name="operateType" val="A2" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<set name="transformId" val="112" />
 		<for>
-			<!-- speed_up here is for block speed buffs on target -->
-			<effect name="Transformation" abnormalTime="460" val="0" abnormalLvl="99" abnormalType="speed_up">
-				<set order="0x08" stat="STR" val="40" />
-				<set order="0x08" stat="DEX" val="30" />
-				<set order="0x08" stat="CON" val="43" />
-				<set order="0x08" stat="INT" val="21" />
-				<set order="0x08" stat="WIT" val="13" />
-				<set order="0x08" stat="MEN" val="23" />
+			<effect name="Transformation" abnormalTime="460" val="0" abnormalLvl="99" abnormalType="transform">
+				<mul order="0x30" stat="weightLimit" val="11" />
+				<add order="0x40" stat="weightPenalty" val="9000" />
+				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Buff" abnormalTime="460" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="460" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="6203" levels="1" name="Transformed Condition - Native">
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="10" />
+		<set name="castRange" val="900" />
+		<set name="effectRange" val="1500" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
+		<set name="negateAbnormals" val="improve_speed_avoid_up;speed_up" />
 		<set name="operateType" val="A2" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<set name="transformId" val="124" />
 		<for>
-			<!-- speed_up here is for block speed buffs on target -->
-			<effect name="Transformation" abnormalTime="220" val="0" abnormalLvl="99" abnormalType="speed_up">
-				<set order="0x08" stat="STR" val="40" />
-				<set order="0x08" stat="DEX" val="30" />
-				<set order="0x08" stat="CON" val="43" />
-				<set order="0x08" stat="INT" val="21" />
-				<set order="0x08" stat="WIT" val="13" />
-				<set order="0x08" stat="MEN" val="23" />
+			<effect name="Transformation" abnormalTime="215" val="0" abnormalLvl="99" abnormalType="transform">
+				<mul order="0x30" stat="weightLimit" val="11" />
+				<add order="0x40" stat="weightPenalty" val="9000" />
+				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Buff" abnormalTime="215" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="215" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="6204" levels="1" name="Transformed Condition - Guards of the Dawn">
-		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="BUFF" />
-		<set name="operateType" val="A2" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<!-- Confirmed CT2.5 -->
+		<set name="aggroPoints" val="10" />
 		<set name="castRange" val="900" />
 		<set name="effectRange" val="1500" />
+		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="negateAbnormals" val="improve_speed_avoid_up;speed_up" />
+		<set name="operateType" val="A2" />
+		<set name="skillType" val="BUFF" />
+		<set name="target" val="TARGET_ONE" />
 		<set name="transformId" val="113" />
 		<for>
-			<!-- speed_up here is for block speed buffs on target -->
-			<effect name="Transformation" abnormalTime="-1" val="0" abnormalLvl="99" abnormalType="speed_up">
-				<set order="0x08" stat="STR" val="40" />
-				<set order="0x08" stat="DEX" val="30" />
-				<set order="0x08" stat="CON" val="43" />
-				<set order="0x08" stat="INT" val="21" />
-				<set order="0x08" stat="WIT" val="11" />
-				<set order="0x08" stat="MEN" val="25" />
+			<effect name="Transformation" abnormalTime="-1" val="0" abnormalLvl="99" abnormalType="transform">
+				<mul order="0x30" stat="weightLimit" val="11" />
+				<add order="0x40" stat="weightPenalty" val="9000" />
+				<add order="0x40" stat="inventoryLimit" val="8" />
 			</effect>
+			<effect name="Cancel" noicon="1" val="0" effectPower="100" effectType="CANCEL" />
+			<effect name="Buff" abnormalTime="-1" noicon="1" val="0" abnormalLvl="100" abnormalType="improve_speed_avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="-1" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="6205" levels="19" name="Strider Bite">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml
index af8e02ce92..74f33ded26 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml
@@ -994,7 +994,7 @@
 		<set name="trait" val="DERANGEMENT" />
 		<for>
 			<effect name="Mute" abnormalTime="20" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="20" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="20" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="6381" levels="2" name="Bistakon Soul Beam">
@@ -1016,7 +1016,7 @@
 		<set name="trait" val="DERANGEMENT" />
 		<for>
 			<effect name="Mute" abnormalTime="20" val="0" abnormalLvl="#abnormalLvl" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="20" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="20" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="6382" levels="1" name="Bistakon Rolling Claw">
@@ -1058,7 +1058,7 @@
 		<set name="trait" val="DERANGEMENT" />
 		<for>
 			<effect name="Mute" abnormalTime="20" val="0" abnormalLvl="1" abnormalType="silence_all" />
-			<effect name="PhysicalMute" abnormalTime="20" noicon="1" val="0" />
+			<effect name="PhysicalMute" abnormalTime="20" noicon="1" val="0" abnormalLvl="1" abnormalType="silence_all_two" /> <!-- TODO: This abnormalLvl="1" & abnormalType="silence_all_two" is a TEMP FIX, should be removed when "abnormalType & abnormalLvl" works like main skill attributes and not effect attributes -->
 		</for>
 	</skill>
 	<skill id="6384" levels="2" name="Bistakon Deadly Blow">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
index 7d2581b463..668bfd9fe0 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
@@ -981,129 +981,159 @@
 		<set name="hitTime" val="1000" />
 	</skill>
 	<skill id="7088" levels="1" name="Master's Blessing - Improve Combat">
+		<!-- Confirmed CT2.5 -->
 		<!-- GM Skill -->
-		<set name="aggroPoints" val="655" />
+		<set name="aggroPoints" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume" val="2" />
+		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="pa_up,9;pd_up,9" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="pa_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_pa_pd_up">
 				<mul order="0x30" stat="pAtk" val="1.15" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="pd_up" noicon="1">
 				<mul order="0x30" stat="pDef" val="1.15" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="pa_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="7089" levels="1" name="Master's Blessing - Improve Magic">
+		<!-- Confirmed CT2.5 -->
 		<!-- GM Skill -->
-		<set name="aggroPoints" val="655" />
+		<set name="aggroPoints" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume" val="2" />
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="ma_up,9;md_up,9" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="ma_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_ma_md_up">
 				<mul order="0x30" stat="mAtk" val="1.75" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="md_up" noicon="1">
 				<mul order="0x30" stat="mDef" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="ma_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="md_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="7090" levels="1" name="Master's Blessing - Improve Condition">
+		<!-- Confirmed CT2.5 -->
 		<!-- GM Skill -->
-		<set name="aggroPoints" val="655" />
+		<set name="aggroPoints" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume" val="2" />
+		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="max_hp_up,9;max_mp_up,9" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="max_hp_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_hp_mp_up">
 				<mul order="0x30" stat="maxHp" val="1.35" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="max_mp_up" noicon="1">
 				<mul order="0x30" stat="maxMp" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="max_hp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="max_mp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="7091" levels="1" name="Master's Blessing - Improve Critical">
+		<!-- Confirmed CT2.5 -->
 		<!-- GM Skill -->
-		<set name="aggroPoints" val="655" />
+		<set name="aggroPoints" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume" val="2" />
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="critical_prob_up,9;critical_dmg_up,9" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="critical_prob_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_crt_rate_dmg_up">
 				<basemul order="0x30" stat="rCrit" val="0.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="critical_dmg_up" noicon="1">
 				<mul order="0x30" stat="cAtk" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_dmg_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="7092" levels="1" name="Master's Blessing - Improve Shield Defense">
+		<!-- Confirmed CT2.5 -->
 		<!-- GM Skill -->
-		<set name="aggroPoints" val="655" />
+		<set name="aggroPoints" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume" val="2" />
+		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="shield_prob_up,9;shield_defence_up,9" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="shield_prob_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_shield_rate_defence_up">
 				<mul order="0x30" stat="rShld" val="1.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="shield_defence_up" noicon="1">
 				<mul order="0x30" stat="sDef" val="1.5" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="shield_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="shield_defence_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="7093" levels="1" name="Master's Blessing - Improve Movement">
+		<!-- Confirmed CT2.5 -->
 		<!-- GM Skill -->
-		<set name="aggroPoints" val="655" />
+		<set name="aggroPoints" val="1" />
 		<set name="castRange" val="400" />
 		<set name="effectRange" val="900" />
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="mpConsume" val="2" />
+		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="speed_up,9;avoid_up,9" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="2000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="speed_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_speed_avoid_up">
 				<add order="0x40" stat="runSpd" val="33" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="avoid_up" noicon="1">
 				<add order="0x40" stat="rEvas" val="4" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="7094" levels="1" name="Master's Blessing - Sharpen Edge">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml
index 7e289f8383..75ffb97c4c 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml
@@ -308,20 +308,24 @@
 	<skill id="23238" levels="1" name="Master's Blessing - Eye of Pa'agrio">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
-		<set name="aggroPoints" val="495" />
+		<set name="aggroPoints" val="666" />
 		<set name="castRange" val="900" />
 		<set name="effectRange" val="1400" />
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="hitTime" val="2500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="77" />
+		<set name="negateAbnormals" val="hit_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="5000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="hit_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_hit_defence_crt_rate_up">
 				<add order="0x40" stat="accCombat" val="4" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="90" abnormalType="critDamEvas">
 				<mul order="0x30" stat="critDamEvas" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="hit_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23239" levels="1" name="Master's Blessing - Soul of Pa'agrio">
@@ -330,17 +334,22 @@
 		<set name="aggroPoints" val="666" />
 		<set name="castRange" val="900" />
 		<set name="effectRange" val="1400" />
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="hitTime" val="2500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="77" />
+		<set name="negateAbnormals" val="ma_up,9;md_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="5000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="ma_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_ma_md_up">
 				<mul order="0x30" stat="mAtk" val="1.75" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="9" abnormalType="md_up">
 				<mul order="0x30" stat="mDef" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="ma_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="md_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23240" levels="1" name="Master's Blessing - Chant of Magnus">
@@ -379,18 +388,22 @@
 		<set name="aggroPoints" val="655" />
 		<set name="castRange" val="900" />
 		<set name="effectRange" val="1400" />
-		<set name="hitTime" val="500" />
+		<set name="hitTime" val="1500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="74" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="negateAbnormals" val="vampiric_attack,9;attack_time_down,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="vampiric_attack">
-				<add order="0x40" stat="absorbDam" val="9" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="attack_time_down" noicon="1">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_vampiric_haste">
+				<add order="0x40" stat="absorbDam" val="9" /> <!-- absorb 9% HP from damage inflicted on enemies -->
 				<mul order="0x30" stat="pAtkSpd" val="1.33" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="vampiric_attack" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="attack_time_down" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23242" levels="1" name="Master's Blessing - Spike">
@@ -954,103 +967,151 @@
 	<skill id="23277" levels="1" name="Master's Blessing - Improve Combat">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="aggroPoints" val="1" />
+		<set name="hitTime" val="1500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="pa_up,9;pd_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="pa_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_pa_pd_up">
 				<mul order="0x30" stat="pAtk" val="1.15" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="pd_up" noicon="1">
 				<mul order="0x30" stat="pDef" val="1.15" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="pa_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="pd_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23278" levels="1" name="Master's Blessing - Improve Magic">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="aggroPoints" val="1" />
+		<set name="hitTime" val="1500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="ma_up,9;md_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="ma_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_ma_md_up">
 				<mul order="0x30" stat="mAtk" val="1.75" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="md_up" noicon="1">
 				<mul order="0x30" stat="mDef" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="ma_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="md_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23279" levels="1" name="Master's Blessing - Improve Condition">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="aggroPoints" val="1" />
+		<set name="hitTime" val="1500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="max_hp_up,9;max_mp_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="max_hp_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_hp_mp_up">
 				<mul order="0x30" stat="maxHp" val="1.35" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="max_mp_up" noicon="1">
 				<mul order="0x30" stat="maxMp" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="max_hp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="max_mp_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23280" levels="1" name="Master's Blessing - Improve Critical">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="aggroPoints" val="1" />
+		<set name="hitTime" val="1500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="74" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="critical_prob_up,9;critical_dmg_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="critical_prob_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_crt_rate_dmg_up">
 				<basemul order="0x30" stat="rCrit" val="0.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="critical_dmg_up" noicon="1">
 				<mul order="0x30" stat="cAtk" val="1.35" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="critical_dmg_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23281" levels="1" name="Master's Blessing - Improve Shield Defense">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="aggroPoints" val="1" />
+		<set name="hitTime" val="1500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="70" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="shield_prob_up,9;shield_defence_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="shield_prob_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_shield_rate_defence_up">
 				<mul order="0x30" stat="rShld" val="1.3" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="shield_defence_up" noicon="1">
 				<mul order="0x30" stat="sDef" val="1.5" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="shield_prob_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="shield_defence_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23282" levels="1" name="Master's Blessing - Improve Movement">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
-		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="aggroPoints" val="1" />
+		<set name="hitTime" val="1500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="72" />
+		<set name="mpConsume" val="1" />
+		<set name="mpInitialConsume" val="1" />
+		<set name="negateAbnormals" val="speed_up,9;avoid_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="speed_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_speed_avoid_up">
 				<add order="0x40" stat="runSpd" val="33" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="avoid_up" noicon="1">
 				<add order="0x40" stat="rEvas" val="4" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="speed_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="avoid_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23283" levels="1" name="Master's Blessing - Sharpen Edge">
@@ -1106,35 +1167,46 @@
 	<skill id="23286" levels="1" name="Master's Blessing - Eye of Pa'agrio">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
+		<set name="aggroPoints" val="666" />
 		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="77" />
+		<set name="negateAbnormals" val="hit_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="5000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="hit_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_hit_defence_crt_rate_up">
 				<add order="0x40" stat="accCombat" val="4" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="90" abnormalType="critDamEvas">
 				<mul order="0x30" stat="critDamEvas" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="hit_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23287" levels="1" name="Master's Blessing - Soul of Pa'agrio">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
+		<set name="aggroPoints" val="666" />
 		<set name="hitTime" val="500" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="77" />
+		<set name="negateAbnormals" val="ma_up,9;md_up,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="5000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="ma_up">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_ma_md_up">
 				<mul order="0x30" stat="mAtk" val="1.75" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="9" abnormalType="md_up">
 				<mul order="0x30" stat="mDef" val="1.3" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="ma_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="md_up" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23288" levels="1" name="Master's Blessing - Chant of Magnus">
@@ -1169,19 +1241,24 @@
 	<skill id="23289" levels="1" name="Master's Blessing - Chant of Blood Awakening">
 		<!-- High Five Skill -->
 		<!-- GM Skill -->
+		<set name="aggroPoints" val="655" />
 		<set name="hitTime" val="500" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="74" />
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="negateAbnormals" val="vampiric_attack,9;attack_time_down,9" />
+		<set name="operateType" val="A2" />
+		<set name="reuseDelay" val="2000" />
 		<set name="skillRadius" val="200" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="vampiric_attack">
-				<add order="0x40" stat="absorbDam" val="9" />
-			</effect>
-			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="9" abnormalType="attack_time_down" noicon="1">
+			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="1" abnormalType="improve_vampiric_haste">
+				<add order="0x40" stat="absorbDam" val="9" /> <!-- absorb 9% HP from damage inflicted on enemies -->
 				<mul order="0x30" stat="pAtkSpd" val="1.33" />
 			</effect>
+			<effect name="Negate" noicon="1" val="0" />
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="vampiric_attack" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
+			<effect name="Buff" abnormalTime="3600" noicon="1" val="0" abnormalLvl="100" abnormalType="attack_time_down" /> <!-- FIXME: Temp Fix until support for blockBuff by abnormalType is done -->
 		</for>
 	</skill>
 	<skill id="23290" levels="1" name="Master's Blessing - Spike">
-- 
GitLab