From 294426e90d9faa3096a60380fac82b5c66e19ec2 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 14 Aug 2022 06:57:23 +0000
Subject: [PATCH] Updated skills 00100-00199. Contributed by forcecat and
 nasseka.

---
 .../game/data/stats/skills/00100-00199.xml    | 858 ++++++------------
 1 file changed, 280 insertions(+), 578 deletions(-)

diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml
index cf00e7d42a..7218f96797 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00100-00199.xml
@@ -4,11 +4,7 @@
 		<!-- When using a sword/ blunt weapon/ spear/ dual swords Shock Atk. Rate +$s1 -->
 		<icon>icon.skill0100</icon>
 		<magicLevel>
-			<value level="1">20</value>
-			<value level="2">20</value>
-			<value level="3">20</value>
-			<value level="4">20</value>
-			<value level="5">20</value>
+			<value fromLevel="1" toLevel="5">20</value>
 			<value level="6">21</value>
 			<value level="7">22</value>
 			<value level="8">23</value>
@@ -21,12 +17,11 @@
 			<value level="15">30</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
-					<item>BLUNT</item>
 					<item>SWORD</item>
+					<item>BLUNT</item>
 					<item>POLE</item>
 					<item>DUAL</item>
 				</weaponType>
@@ -59,6 +54,9 @@
 		<icon>icon.skill0101</icon>
 		<castRange>700</castRange>
 		<coolTime>500</coolTime>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>3</abnormalTime>
+		<abnormalType>STUN</abnormalType>
 		<effectPoint>
 			<value level="1">-190</value>
 			<value level="2">-195</value>
@@ -109,8 +107,12 @@
 			<value level="47">-435</value>
 			<value level="48">-440</value>
 		</effectPoint>
-		<effectRange>1400</effectRange>
+		<effectRange>1200</effectRange>
+		<activateRate>80</activateRate>
+		<lvlBonusRate>30</lvlBonusRate>
 		<hitTime>3000</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
+		<isDebuff>true</isDebuff>
 		<magicLevel>
 			<value level="1">34</value>
 			<value level="2">35</value>
@@ -336,38 +338,7 @@
 	<skill id="102" toLevel="30" name="Entangle">
 		<!-- <Suppression skill> The effect lasts for $s1 The enemy's Speed -$s2 -->
 		<icon>icon.skill0102</icon>
-		<abnormalLevel>
-			<value level="1">2</value>
-			<value level="2">3</value>
-			<value level="3">3</value>
-			<value level="4">3</value>
-			<value level="5">3</value>
-			<value level="6">3</value>
-			<value level="7">3</value>
-			<value level="8">3</value>
-			<value level="9">3</value>
-			<value level="10">3</value>
-			<value level="11">3</value>
-			<value level="12">3</value>
-			<value level="13">3</value>
-			<value level="14">3</value>
-			<value level="15">3</value>
-			<value level="16">3</value>
-			<value level="17">3</value>
-			<value level="18">3</value>
-			<value level="19">4</value>
-			<value level="20">4</value>
-			<value level="21">4</value>
-			<value level="22">4</value>
-			<value level="23">4</value>
-			<value level="24">4</value>
-			<value level="25">4</value>
-			<value level="26">4</value>
-			<value level="27">4</value>
-			<value level="28">4</value>
-			<value level="29">4</value>
-			<value level="30">4</value>
-		</abnormalLevel>
+		<abnormalLevel>10</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
 		<activateRate>80</activateRate>
@@ -407,6 +378,7 @@
 		</effectPoint>
 		<effectRange>1100</effectRange>
 		<hitTime>1000</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<isDebuff>true</isDebuff>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<lvlBonusRate>30</lvlBonusRate>
@@ -488,74 +460,30 @@
 		</effects>
 	</skill>
 	<skill id="103" toLevel="5" name="Slaughter">
-		<!-- <Infection Skill> Causes a poison cloud to pour out from a corpse. Inflicts poison on enemies near the corpse. -->
-		<icon>icon.skill0103</icon>
-		<abnormalLevel>
-			<value level="1">5</value>
-			<value level="2">6</value>
-			<value level="3">7</value>
-			<value level="4">8</value>
-			<value level="5">9</value>
-		</abnormalLevel>
-		<abnormalTime>30</abnormalTime>
-		<subordinationAbnormalType>POISON</subordinationAbnormalType>
-		<abnormalType>POISON</abnormalType>
-		<abnormalVisualEffect>DOT_POISON</abnormalVisualEffect>
-		<activateRate>35</activateRate>
-		<affectLimit>10-10</affectLimit>
-		<affectRange>150</affectRange>
-		<basicProperty>PHYSICAL</basicProperty>
-		<castRange>400</castRange>
-		<effectPoint>
-			<value level="1">-920</value>
-			<value level="2">-1160</value>
-			<value level="3">-1240</value>
-			<value level="4">-1400</value>
-			<value level="5">-1560</value>
-		</effectPoint>
-		<effectRange>900</effectRange>
-		<hitTime>1500</hitTime>
-		<isDebuff>true</isDebuff>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
-		<lvlBonusRate>20</lvlBonusRate>
-		<magicLevel>
-			<value level="1">46</value>
-			<value level="2">58</value>
-			<value level="3">62</value>
-			<value level="4">70</value>
-			<value level="5">78</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">45</value>
-			<value level="2">50</value>
-			<value level="3">55</value>
-			<value level="4">60</value>
-			<value level="5">65</value>
-		</mpConsume>
-		<operateType>A2</operateType>
-		<reuseDelay>5000</reuseDelay>
-		<magicCriticalRate>5</magicCriticalRate>
-		<trait>INFECTION</trait>
-		<targetType>NPC_BODY</targetType>
-		<affectScope>RANGE</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
-		<conditions>
-			<condition name="ConsumeBody" />
-		</conditions>
-		<effects>
-			<effect name="DamOverTime">
-				<power>
-					<value level="1">50</value>
-					<value level="2">60</value>
-					<value level="3">70</value>
-					<value level="4">80</value>
-					<value level="5">90</value>
-				</power>
-				<ticks>5</ticks>
-			</effect>
-			<effect name="ConsumeBody" />
-		</effects>
-	</skill>
+        <!-- <Infection Skill> Causes a poison cloud to pour out from a corpse. Inflicts poison on enemies near the corpse. -->
+        <icon>icon.skill0103</icon>
+        <operateType>P</operateType>
+        <magicLevel>
+            <value level="1">46</value>
+            <value level="2">58</value>
+            <value level="3">62</value>
+            <value level="4">70</value>
+            <value level="5">78</value>
+        </magicLevel>
+        <effects>
+            <effect name="TriggerSkillByKill">
+                <chance>100</chance>
+                <skillId>47291</skillId> <!-- Slaughter -->
+                <skillLevel>
+                    <value level="1">1</value>
+                    <value level="2">2</value>
+                    <value level="3">3</value>
+                    <value level="4">4</value>
+                    <value level="5">5</value>
+                </skillLevel>
+            </effect>
+        </effects>
+    </skill>
 	<skill id="104" toLevel="1" name="Acumen">
 		<!-- Removes debuffs that decrease P. Accuracy and P. Evasion. -->
 		<icon>icon.skill0104</icon>
@@ -584,9 +512,8 @@
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>FREEZING</abnormalType>
-		<castRange>40</castRange>
-		<effectRange>400</effectRange>
-		<hitTime>3000</hitTime>
+		<hitTime>1200</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<magicLevel>
 			<value level="1">30</value>
@@ -633,10 +560,12 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
-			<condition name="OpCheckSkill">
-				<skillId>223</skillId> <!-- Blood Attack -->
-				<affectType>CASTER</affectType>
-			</condition>
+			<condition name="OpNotAffectedBySkill">
+                <skillId>223</skillId> <!-- Blood Attack -->
+            </condition>
+			<condition name="OpNotAffectedBySkill">
+                <skillId>47285</skillId> <!-- Blood Attack -->
+            </condition>
 		</conditions>
 		<effects>
 			<effect name="TriggerSkillByAttack">
@@ -644,6 +573,7 @@
 				<minDamage>1</minDamage>
 				<targetType>TARGET</targetType>
 				<isCritical>false</isCritical>
+				<allowSkillAttack>true</allowSkillAttack>
 				<allowWeapons>ALL</allowWeapons>
 				<skillId>45255</skillId> <!-- Freezing Strike -->
 				<skillLevel>
@@ -698,6 +628,7 @@
 		<castRange>500</castRange>
 		<effectRange>900</effectRange>
 		<hitTime>1200</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<isDebuff>true</isDebuff>
 		<magicLevel>
 			<value level="1">43</value>
@@ -748,6 +679,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<castRange>400</castRange>
 		<hitTime>2000</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<magicLevel>
 			<value level="1">55</value>
 			<value level="2">60</value>
@@ -837,10 +769,14 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 		</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
+		<abnormalTime>1200</abnormalTime>
 		<abnormalType>POSSESSION</abnormalType>
 		<hitTime>2000</hitTime>
-		<itemConsumeCount>10</itemConsumeCount>
+		<hitCancelTime>0.5</hitCancelTime>
+		<itemConsumeCount>
+			<value level="1">5</value>
+			<value level="2">10</value>
+		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<magicLevel>
 			<value level="1">45</value>
@@ -856,64 +792,27 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<conditions>
-			<condition name="OpCheckSkillList">
-				<skillIds>
-					<item>298</item> <!-- Rabbit Spirit Totem -->
-					<item>282</item> <!-- Puma Spirit Totem -->
-				</skillIds>
-				<affectType>CASTER</affectType>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="MaxHp">
 				<amount>
 					<value level="1">2</value>
-					<value level="2">5</value>
+					<value level="2">10</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PveMagicalSkillDefenceBonus">
+			<effect name="DamageByAttack">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">3</value>
 				</amount>
-				<mode>PER</mode>
+				<type>PK</type>
 			</effect>
-			<effect name="PvpMagicalSkillDefenceBonus">
+			<effect name="DamageByAttack">
 				<amount>
 					<value level="1">1</value>
 					<value level="2">3</value>
 				</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvePhysicalAttackDefenceBonus">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">3</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalAttackDefenceBonus">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">3</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvePhysicalSkillDefenceBonus">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">3</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvpPhysicalSkillDefenceBonus">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">3</value>
-				</amount>
-				<mode>PER</mode>
+				<type>ENEMY_ALL</type>
 			</effect>
 			<effect name="TriggerSkill" fromLevel="2" toLevel="2">
 				<castSkillId>109</castSkillId>
@@ -925,21 +824,31 @@
 	</skill>
 	<skill id="110" toLevel="3" name="Ultimate Defense">
 		<!-- The effect lasts for $s1 P. Def. +$s2 M. Def. +$s3 Buff Cancel Resistance +$s4 The target is unable to move. -->
-		<icon>icon.skill0110</icon>
+		<icon>
+			<value fromLevel="1" toLevel="2">icon.skill0110</value>
+			<value level="3">icon.skill0110_a</value>
+		</icon>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
 		</abnormalLevel>
-		<abnormalTime>30</abnormalTime>
+		<abnormalTime>
+			<value fromLevel="1" toLevel="2">30</value>
+			<value level="3">15</value>
+		</abnormalTime>
 		<abnormalType>PD_UP_SPECIAL</abnormalType>
-		<abnormalVisualEffect>ULTIMATE_DEFENCE</abnormalVisualEffect>
+		<abnormalVisualEffect>
+			<value fromLevel="1" toLevel="2">ULTIMATE_DEFENCE</value>
+			<value level="3">H_ULTIMATE_DEFENCE_B_AVE</value>
+		</abnormalVisualEffect>
 		<effectPoint>
 			<value level="1">204</value>
 			<value level="2">438</value>
 			<value level="3">438</value>
 		</effectPoint>
 		<hitTime>1000</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<magicLevel>
 			<value level="1">20</value>
 			<value level="2">46</value>
@@ -958,8 +867,7 @@
 		</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>
-			<value level="1">900000</value>
-			<value level="2">900000</value>
+			<value fromLevel="1" toLevel="2">900000</value>
 			<value level="3">300000</value>
 		</reuseDelay>
 		<basicProperty>NONE</basicProperty>
@@ -992,6 +900,8 @@
 				</amount>
 				<slot>BUFF</slot>
 			</effect>
+			<!-- TODO 3 lvl skill - Defense Ignore Removal -->
+			<!-- TODO 3 lvl skill - Shield Defense Ignore Removal -->
 		</effects>
 	</skill>
 	<skill id="111" toLevel="3" name="Ultimate Evasion">
@@ -1010,6 +920,7 @@
 			<value level="3">778</value>
 		</effectPoint>
 		<hitTime>1000</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<magicLevel>
 			<value level="1">28</value>
 			<value level="2">55</value>
@@ -1022,8 +933,7 @@
 		</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>
-			<value level="1">900000</value>
-			<value level="2">900000</value>
+			<value fromLevel="1" toLevel="2">900000</value>
 			<value level="3">600000</value>
 		</reuseDelay>
 		<basicProperty>NONE</basicProperty>
@@ -1034,8 +944,7 @@
 			<effect name="PhysicalEvasion">
 				<amount>
 					<value level="1">20</value>
-					<value level="2">25</value>
-					<value level="3">25</value>
+					<value fromLevel="2" toLevel="3">25</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1043,8 +952,7 @@
 				<magicType>0</magicType>
 				<amount>
 					<value level="1">25</value>
-					<value level="2">40</value>
-					<value level="3">40</value>
+					<value fromLevel="2" toLevel="3">40</value>
 				</amount>
 			</effect>
 			<effect name="ResistDispelByCategory">
@@ -1053,16 +961,14 @@
 			</effect>
 			<effect name="ResistAbnormalByCategory">
 				<amount>
-					<value level="1">0</value>
-					<value level="2">0</value>
+					<value fromLevel="1" toLevel="2">0</value>
 					<value level="3">20</value>
 				</amount>
 				<slot>DEBUFF</slot>
 			</effect>
 			<effect name="DefenceTrait">
 				<ANOMALY>
-					<value level="1">0</value>
-					<value level="2">0</value>
+					<value fromLevel="1" toLevel="2">0</value>
 					<value level="3">20</value>
 				</ANOMALY>
 			</effect>
@@ -1078,7 +984,6 @@
 			<value level="4">49</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="DefenceTrait">
 				<BOW>
@@ -1098,7 +1003,6 @@
 			<value level="2">40</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalAttackRange">
 				<amount>
@@ -1116,42 +1020,16 @@
 		<!-- The effect lasts for $s1 Target's P. Atk. -$s2 -->
 		<icon>icon.skill0115</icon>
 		<abnormalLevel>
-			<value level="1">2</value>
-			<value level="2">2</value>
-			<value level="3">3</value>
-			<value level="4">3</value>
-			<value level="5">3</value>
-			<value level="6">3</value>
-			<value level="7">3</value>
-			<value level="8">3</value>
-			<value level="9">3</value>
-			<value level="10">3</value>
-			<value level="11">3</value>
-			<value level="12">3</value>
-			<value level="13">3</value>
-			<value level="14">3</value>
-			<value level="15">3</value>
-			<value level="16">3</value>
-			<value level="17">3</value>
-			<value level="18">3</value>
-			<value level="19">3</value>
-			<value level="20">4</value>
-			<value level="21">4</value>
-			<value level="22">4</value>
-			<value level="23">4</value>
-			<value level="24">4</value>
-			<value level="25">4</value>
-			<value level="26">4</value>
-			<value level="27">4</value>
-			<value level="28">4</value>
-			<value level="29">4</value>
-			<value level="30">4</value>
+			<value fromLevel="1" toLevel="2">2</value>
+			<value fromLevel="3" toLevel="19">3</value>
+			<value fromLevel="20" toLevel="24">4</value>
+			<value fromLevel="25" toLevel="30">5</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>PA_DOWN</abnormalType>
 		<activateRate>80</activateRate>
 		<basicProperty>MAGIC</basicProperty>
-		<castRange>600</castRange>
+		<castRange>150</castRange>
 		<effectPoint>
 			<value level="1">-320</value>
 			<value level="2">-360</value>
@@ -1182,10 +1060,11 @@
 			<value level="27">-870</value>
 			<value level="28">-880</value>
 			<value level="29">-890</value>
-			<value level="30">-9000</value>
+			<value level="30">-900</value>
 		</effectPoint>
-		<effectRange>1100</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1200</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<isDebuff>true</isDebuff>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<lvlBonusRate>30</lvlBonusRate>
@@ -1253,38 +1132,6 @@
 			<value level="29">68</value>
 			<value level="30">70</value>
 		</mpConsume>
-		<mpInitialConsume>
-			<value level="1">3</value>
-			<value level="2">3</value>
-			<value level="3">4</value>
-			<value level="4">4</value>
-			<value level="5">5</value>
-			<value level="6">5</value>
-			<value level="7">5</value>
-			<value level="8">5</value>
-			<value level="9">6</value>
-			<value level="10">6</value>
-			<value level="11">6</value>
-			<value level="12">6</value>
-			<value level="13">7</value>
-			<value level="14">7</value>
-			<value level="15">7</value>
-			<value level="16">7</value>
-			<value level="17">7</value>
-			<value level="18">8</value>
-			<value level="19">8</value>
-			<value level="20">9</value>
-			<value level="21">9</value>
-			<value level="22">9</value>
-			<value level="23">9</value>
-			<value level="24">9</value>
-			<value level="25">9</value>
-			<value level="26">10</value>
-			<value level="27">10</value>
-			<value level="28">10</value>
-			<value level="29">10</value>
-			<value level="30">10</value>
-		</mpInitialConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1293,8 +1140,7 @@
 		<effects>
 			<effect name="PAtk">
 				<amount>
-					<value level="1">-20</value>
-					<value level="2">-20</value>
+					<value fromLevel="1" toLevel="2">-20</value>
 					<value fromLevel="3" toLevel="19">-23</value>
 					<value fromLevel="20" toLevel="24">-30</value>
 					<value fromLevel="25" toLevel="30">-40</value>
@@ -1306,12 +1152,16 @@
 	<skill id="116" toLevel="30" name="Howl">
 		<!-- Hurts nearby enemies by a loud scream. The effect lasts for $s1 P. Atk. $s2 -->
 		<icon>icon.skill0116</icon>
-		<abnormalLevel>3</abnormalLevel>
+		<abnormalLevel>
+			<value fromLevel="1" toLevel="19">3</value>
+			<value fromLevel="20" toLevel="24">4</value>
+			<value fromLevel="25" toLevel="30">5</value>
+		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>PA_DOWN</abnormalType>
-		<activateRate>40</activateRate>
-		<affectLimit>10-10</affectLimit>
-		<affectRange>200</affectRange>
+		<activateRate>70</activateRate>
+		<affectLimit>9-10</affectLimit>
+		<affectRange>400</affectRange>
 		<basicProperty>MAGIC</basicProperty>
 		<effectPoint>
 			<value level="1">-860</value>
@@ -1346,6 +1196,7 @@
 			<value level="30">-1800</value>
 		</effectPoint>
 		<hitTime>1200</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<isDebuff>true</isDebuff>
 		<lvlBonusRate>30</lvlBonusRate>
 		<magicLevel>
@@ -1420,7 +1271,11 @@
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
 			<effect name="PAtk">
-				<amount>-23</amount>
+				<amount>
+					<value fromLevel="1" toLevel="19">-23</value>
+					<value fromLevel="20" toLevel="24">-30</value>
+					<value fromLevel="25" toLevel="30">-40</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
@@ -1430,7 +1285,6 @@
 		<icon>icon.skill0118</icon>
 		<magicLevel>1</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalAttackSpeed">
 				<amount>-20</amount>
@@ -1441,17 +1295,29 @@
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>-20</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>NONE</item>
+					<item>LIGHT</item>
+					<item>HEAVY</item>
+				</armorType>
+			</effect>
+			<effect name="MpRegen">
+				<amount>20</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>MAGIC</item>
+				</armorType>
+			</effect>	
 		</effects>
 	</skill>
 	<skill id="120" toLevel="15" name="Stunning Fist">
 		<!-- When using a fist weapon Shock Atk. Rate $s1 -->
 		<icon>icon.skill0120</icon>
 		<magicLevel>
-			<value level="1">20</value>
-			<value level="2">20</value>
-			<value level="3">20</value>
-			<value level="4">20</value>
-			<value level="5">20</value>
+			<value fromLevel="1" toLevel="5">20</value>
 			<value level="6">21</value>
 			<value level="7">22</value>
 			<value level="8">23</value>
@@ -1508,6 +1374,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>MAX_HP_UP</abnormalType>
 		<hitTime>1500</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<magicLevel>
 			<value level="1">28</value>
 			<value level="2">40</value>
@@ -1548,7 +1415,10 @@
 	<skill id="122" toLevel="30" name="Hex">
 		<!-- Weakens target's defense. The effect lasts for $s1 P. Def. -$s2 -->
 		<icon>icon.skill0122</icon>
-		<abnormalLevel>3</abnormalLevel>
+		<abnormalLevel>
+			<value fromLevel="1" toLevel="19">1</value>
+			<value fromLevel="20" toLevel="30">2</value>
+		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>PD_DOWN</abnormalType>
 		<activateRate>80</activateRate>
@@ -1588,6 +1458,7 @@
 		</effectPoint>
 		<effectRange>1100</effectRange>
 		<hitTime>1200</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<isDebuff>true</isDebuff>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<lvlBonusRate>30</lvlBonusRate>
@@ -1662,7 +1533,10 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalDefence">
-				<amount>-23</amount>
+				<amount>
+					<value fromLevel="1" toLevel="19">-23</value>
+					<value fromLevel="20" toLevel="30">-30</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 		</effects>
@@ -1676,7 +1550,6 @@
 			<value level="3">55</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MagicalDefence">
 				<amount>
@@ -1731,6 +1604,7 @@
 		</effectPoint>
 		<effectRange>1100</effectRange>
 		<hitTime>1500</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<isDebuff>true</isDebuff>
 		<lvlBonusRate>30</lvlBonusRate>
 		<magicLevel>
@@ -1763,8 +1637,7 @@
 			<value level="3">18</value>
 			<value level="4">19</value>
 			<value level="5">20</value>
-			<value level="6">22</value>
-			<value level="7">22</value>
+			<value fromLevel="6" toLevel="7">22</value>
 			<value level="8">23</value>
 			<value level="9">24</value>
 			<value level="10">25</value>
@@ -1774,36 +1647,20 @@
 			<value level="14">28</value>
 			<value level="15">31</value>
 			<value level="16">34</value>
-			<value level="17">35</value>
-			<value level="18">37</value>
-			<value level="19">38</value>
-			<value level="20">41</value>
-			<value level="21">43</value>
-			<value level="22">46</value>
+			<value level="17">36</value>
+			<value level="18">38</value>
+			<value level="19">40</value>
+			<value level="20">42</value>
+			<value level="21">45</value>
+			<value level="22">48</value>
 		</mpConsume>
 		<mpInitialConsume>
 			<value level="1">4</value>
-			<value level="2">5</value>
-			<value level="3">5</value>
-			<value level="4">5</value>
-			<value level="5">5</value>
-			<value level="6">6</value>
-			<value level="7">6</value>
-			<value level="8">6</value>
-			<value level="9">6</value>
-			<value level="10">7</value>
-			<value level="11">7</value>
-			<value level="12">7</value>
-			<value level="13">7</value>
-			<value level="14">7</value>
-			<value level="15">8</value>
-			<value level="16">8</value>
-			<value level="17">9</value>
-			<value level="18">9</value>
-			<value level="19">10</value>
-			<value level="20">10</value>
-			<value level="21">11</value>
-			<value level="22">11</value>
+			<value fromLevel="2" toLevel="5">5</value>
+			<value fromLevel="6" toLevel="9">6</value>
+			<value fromLevel="10" toLevel="14">7</value>
+			<value fromLevel="15" toLevel="19">8</value>
+			<value fromLevel="20" toLevel="22">9</value>
 		</mpInitialConsume>
 		<trait>SUPPRESSION</trait>
 		<operateType>A2</operateType>
@@ -1829,7 +1686,6 @@
 			<value level="5">70</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="CriticalDamage">
 				<amount>
@@ -1863,6 +1719,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>THRILL_FIGHT</abnormalType>
 		<hitTime>1500</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<magicLevel>
 			<value level="1">46</value>
 			<value level="2">55</value>
@@ -1903,7 +1760,6 @@
 			<value level="3">58</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -1928,12 +1784,10 @@
 		<icon>icon.skill0134</icon>
 		<magicLevel>1</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="DefenceTrait">
-				<HOLD>20</HOLD>
-				<INFECTION>20</INFECTION>
 				<SLEEP>20</SLEEP>
+				<HOLD>10</HOLD>
 			</effect>
 		</effects>
 	</skill>
@@ -1947,7 +1801,6 @@
 			<value level="4">58</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="CriticalRate">
 				<amount>
@@ -1975,6 +1828,12 @@
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>PINCH</abnormalType>
 		<hitTime>1500</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
+		<itemConsumeId>3031</itemConsumeId>
+		<itemConsumeCount>
+			<value fromLevel="1" toLevel="6">2</value>
+			<value level="7">3</value>
+		</itemConsumeCount>
 		<magicLevel>
 			<value level="1">36</value>
 			<value level="2">43</value>
@@ -1982,7 +1841,7 @@
 			<value level="4">64</value>
 			<value level="5">74</value>
 			<value level="6">79</value>
-			<value level="7">85</value>
+			<value level="7">95</value>
 		</magicLevel>
 		<hpConsume>
 			<value level="1">100</value>
@@ -1994,25 +1853,18 @@
 			<value level="7">500</value>
 		</hpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>180000</reuseDelay>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="6">300000</value>
+			<value level="7">180000</value>
+		</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<itemConsumeCount>
-			<value level="1">2</value>
-			<value level="2">2</value>
-			<value level="3">2</value>
-			<value level="4">2</value>
-			<value level="5">2</value>
-			<value level="6">2</value>
-			<value level="7">3</value>
-		</itemConsumeCount>
-		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<conditions>
-			<condition name="OpCheckSkill">
+			<condition name="OpNotAffectedBySkill">
 				<skillId>176</skillId> <!-- Frenzy -->
-				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -2042,13 +1894,13 @@
 			</effect>
 			<effect name="ResistAbnormalByCategory">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">25</value>
-					<value level="3">30</value>
-					<value level="4">35</value>
-					<value level="5">40</value>
-					<value level="6">45</value>
-					<value level="7">50</value>
+					<value level="1">-5</value>
+					<value level="2">-25</value>
+					<value level="3">-30</value>
+					<value level="4">-35</value>
+					<value level="5">-40</value>
+					<value level="6">-45</value>
+					<value level="7">-50</value>
 				</amount>
 				<slot>DEBUFF</slot>
 			</effect>
@@ -2063,6 +1915,17 @@
 					<value level="7">50</value>
 				</ANOMALY>
 			</effect>
+			<effect name="ManaHeal">
+				<power>
+					<value level="1">80</value>
+					<value level="2">100</value>
+					<value level="3">110</value>
+					<value level="4">120</value>
+					<value level="5">130</value>
+					<value level="6">140</value>
+					<value level="7">150</value>
+				</power>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="141" toLevel="5" name="Weapon Mastery">
@@ -2076,7 +1939,6 @@
 			<value level="5">76</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -2101,7 +1963,6 @@
 			<value level="5">15</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -2137,7 +1998,6 @@
 			<value level="2">56</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="CubicMastery">
 				<amount>
@@ -2204,7 +2064,6 @@
 			<value level="51">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -2332,7 +2191,6 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MagicalDefence">
 				<amount>
@@ -2400,65 +2258,13 @@
 			</effect>
 			<effect name="ResistDDMagic">
 				<amount>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">5</value>
-					<value level="4">5</value>
-					<value level="5">5</value>
-					<value level="6">5</value>
-					<value level="7">10</value>
-					<value level="8">10</value>
-					<value level="9">10</value>
-					<value level="10">10</value>
-					<value level="11">10</value>
-					<value level="12">10</value>
-					<value level="13">15</value>
-					<value level="14">15</value>
-					<value level="15">15</value>
-					<value level="16">15</value>
-					<value level="17">15</value>
-					<value level="18">15</value>
-					<value level="19">15</value>
-					<value level="20">15</value>
-					<value level="21">15</value>
-					<value level="22">20</value>
-					<value level="23">20</value>
-					<value level="24">20</value>
-					<value level="25">20</value>
-					<value level="26">20</value>
-					<value level="27">20</value>
-					<value level="28">20</value>
-					<value level="29">20</value>
-					<value level="30">20</value>
-					<value level="31">20</value>
-					<value level="32">20</value>
-					<value level="33">20</value>
-					<value level="34">25</value>
-					<value level="35">25</value>
-					<value level="36">25</value>
-					<value level="37">25</value>
-					<value level="38">25</value>
-					<value level="39">25</value>
-					<value level="40">30</value>
-					<value level="41">30</value>
-					<value level="42">30</value>
-					<value level="43">30</value>
-					<value level="44">30</value>
-					<value level="45">30</value>
-					<value level="46">30</value>
-					<value level="47">30</value>
-					<value level="48">30</value>
-					<value level="49">30</value>
-					<value level="50">30</value>
-					<value level="51">30</value>
-					<value level="52">30</value>
-					<value level="53">30</value>
-					<value level="54">30</value>
-					<value level="55">30</value>
-					<value level="56">30</value>
-					<value level="57">30</value>
-					<value level="58">30</value>
-					<value level="59">30</value>
+					<value fromLevel="1" toLevel="2">0</value>
+					<value fromLevel="3" toLevel="6">5</value>
+					<value fromLevel="7" toLevel="12">10</value>
+					<value fromLevel="13" toLevel="21">15</value>
+					<value fromLevel="22" toLevel="33">20</value>
+					<value fromLevel="34" toLevel="39">25</value>
+					<value fromLevel="40" toLevel="59">30</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -2468,8 +2274,7 @@
 		<!-- M. Def. +$s1 -->
 		<icon>icon.skill0147</icon>
 		<magicLevel>
-			<value level="1">20</value>
-			<value level="2">20</value>
+			<value fromLevel="1" toLevel="2">20</value>
 			<value level="3">22</value>
 			<value level="4">23</value>
 			<value level="5">24</value>
@@ -2482,9 +2287,7 @@
 			<value level="12">34</value>
 			<value level="13">35</value>
 			<value level="14">36</value>
-			<value level="15">40</value>
-			<value level="16">40</value>
-			<value level="17">40</value>
+			<value fromLevel="15" toLevel="17">40</value>
 			<value level="18">41</value>
 			<value level="19">42</value>
 			<value level="20">43</value>
@@ -2535,7 +2338,6 @@
 			<value level="65">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MagicalDefence">
 				<amount>
@@ -2609,71 +2411,11 @@
 			</effect>
 			<effect name="ResistDDMagic">
 				<amount>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">0</value>
-					<value level="4">0</value>
-					<value level="5">0</value>
-					<value level="6">0</value>
-					<value level="7">0</value>
-					<value level="8">0</value>
-					<value level="9">0</value>
-					<value level="10">0</value>
-					<value level="11">0</value>
-					<value level="12">0</value>
-					<value level="13">0</value>
-					<value level="14">0</value>
-					<value level="15">5</value>
-					<value level="16">5</value>
-					<value level="17">5</value>
-					<value level="18">5</value>
-					<value level="19">5</value>
-					<value level="20">5</value>
-					<value level="21">5</value>
-					<value level="22">5</value>
-					<value level="23">5</value>
-					<value level="24">5</value>
-					<value level="25">5</value>
-					<value level="26">5</value>
-					<value level="27">10</value>
-					<value level="28">10</value>
-					<value level="29">10</value>
-					<value level="30">10</value>
-					<value level="31">10</value>
-					<value level="32">10</value>
-					<value level="33">10</value>
-					<value level="34">10</value>
-					<value level="35">10</value>
-					<value level="36">10</value>
-					<value level="37">10</value>
-					<value level="38">10</value>
-					<value level="39">10</value>
-					<value level="40">15</value>
-					<value level="41">15</value>
-					<value level="42">15</value>
-					<value level="43">15</value>
-					<value level="44">15</value>
-					<value level="45">15</value>
-					<value level="46">20</value>
-					<value level="47">20</value>
-					<value level="48">20</value>
-					<value level="49">20</value>
-					<value level="50">20</value>
-					<value level="51">20</value>
-					<value level="52">20</value>
-					<value level="53">20</value>
-					<value level="54">20</value>
-					<value level="55">15</value>
-					<value level="56">20</value>
-					<value level="57">20</value>
-					<value level="58">20</value>
-					<value level="59">20</value>
-					<value level="60">20</value>
-					<value level="61">20</value>
-					<value level="62">20</value>
-					<value level="63">20</value>
-					<value level="64">20</value>
-					<value level="65">20</value>
+					<value fromLevel="1" toLevel="14">0</value>
+					<value fromLevel="15" toLevel="26">5</value>
+					<value fromLevel="27" toLevel="39">10</value>
+					<value fromLevel="40" toLevel="45">15</value>
+					<value fromLevel="46" toLevel="65">20</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -2693,7 +2435,6 @@
 			<value level="8">72</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="StatByMoveType">
 				<stat>REGENERATE_HP_RATE</stat>
@@ -2734,7 +2475,6 @@
 			<value level="3">46</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="WeightLimit">
 				<amount>
@@ -2758,8 +2498,31 @@
 			<value level="6">81</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
+			<effect name="PhysicalAttack">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">60</value>
+					<value level="3">100</value>
+					<value level="4">150</value>
+					<value level="5">200</value>
+					<value level="6">250</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value fromLevel="1" toLevel="2">0</value>
+					<value level="3">81</value>
+					<value level="4">131</value>
+					<value level="5">180</value>
+					<value level="6">230</value>
+				</amount>
+				<mode>DIFF</mode>
+				<armorType>
+					<item>HEAVY</item>
+				</armorType>
+			</effect>
 			<effect name="ShieldDefenceRate">
 				<amount>
 					<value level="1">10</value>
@@ -2775,38 +2538,12 @@
 				<amount>
 					<value level="1">30</value>
 					<value level="2">40</value>
-					<value level="3">50</value>
-					<value level="4">60</value>
+					<value fromLevel="3" toLevel="4">50</value>
 					<value level="5">55</value>
 					<value level="6">60</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PAtk">
-				<amount>
-					<value level="1">50</value>
-					<value level="2">60</value>
-					<value level="3">100</value>
-					<value level="4">150</value>
-					<value level="5">200</value>
-					<value level="6">250</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="PhysicalDefence">
-				<amount>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">81</value>
-					<value level="4">131</value>
-					<value level="5">180</value>
-					<value level="6">230</value>
-				</amount>
-				<mode>DIFF</mode>
-				<armorType>
-					<item>HEAVY</item>
-				</armorType>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="163" toLevel="1" name="Spellcraft">
@@ -2814,8 +2551,14 @@
 		<icon>icon.skill0163</icon>
 		<magicLevel>1</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
+			<effect name="MagicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>MAGIC</item>
+				</armorType>
+			</effect>
 			<effect name="MagicalAttackSpeed">
 				<amount>-50</amount>
 				<mode>PER</mode>
@@ -2836,7 +2579,6 @@
 			<value level="3">48</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="Reuse">
 				<amount>
@@ -2849,19 +2591,6 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="165" toLevel="5" name="Trade">
-		<!-- Enables you to purchase high quality weapons with a discount up to $s1. -->
-		<icon>icon.skill0165</icon>
-		<magicLevel>
-			<value level="1">15</value>
-			<value level="2">24</value>
-			<value level="3">36</value>
-			<value level="4">43</value>
-			<value level="5">49</value>
-		</magicLevel>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-	</skill>
 	<skill id="168" toLevel="3" name="Attack Speed Boost">
 		<!-- Atk. Spd. +$s1. -->
 		<icon>icon.skill0168</icon>
@@ -2871,7 +2600,6 @@
 			<value level="3">58</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalAttackSpeed">
 				<amount>
@@ -2891,7 +2619,6 @@
 			<value level="2">43</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="Speed">
 				<amount>
@@ -2917,7 +2644,6 @@
 			<value level="9">76</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="StatByMoveType">
 				<stat>REGENERATE_HP_RATE</stat>
@@ -2966,7 +2692,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="172" toLevel="14" name="Create Item">
+	<skill id="172" toLevel="9" name="Create Item">
 		<!-- Allows to craft Lv. $s1 items. -->
 		<icon>icon.skill0172</icon>
 		<magicLevel>
@@ -2979,14 +2705,8 @@
 			<value level="7">55</value>
 			<value level="8">62</value>
 			<value level="9">70</value>
-			<value level="10">82</value>
-			<value level="11">85</value>
-			<value level="12">90</value>
-			<value level="13">95</value>
-			<value level="14">99</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 	</skill>
 	<skill id="173" toLevel="2" name="Acrobatics">
 		<!-- Maximum height user can fall without taking damage +$s1. -->
@@ -2996,7 +2716,6 @@
 			<value level="2">55</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="SafeFallHeight">
 				<amount>
@@ -3007,7 +2726,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="176" toLevel="9" name="Frenzy">
+	<skill id="176" toLevel="7" name="Frenzy">
 		<!-- For $s9 P. Atk. $s1 Atk. Spd. $s2 P. Critical Rate $s3 P. Critical Damage $s4 P. Skill Critical Rate $s5 P. Skill Critical Damage $s5 Speed $s6 When using a two-handed sword/ blunt weapon or a spear P. Atk. $s7 P. Accuracy $s8 Cannot be used with Guts. -->
 		<icon>icon.skill0176</icon>
 		<abnormalLevel>
@@ -3022,6 +2741,12 @@
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>PINCH</abnormalType>
 		<hitTime>1500</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
+		<itemConsumeId>3031</itemConsumeId>
+		<itemConsumeCount>
+			<value fromLevel="1" toLevel="6">2</value>
+			<value level="7">3</value>
+		</itemConsumeCount>
 		<magicLevel>
 			<value level="1">32</value>
 			<value level="2">46</value>
@@ -3029,7 +2754,9 @@
 			<value level="4">64</value>
 			<value level="5">74</value>
 			<value level="6">79</value>
-			<value level="7">85</value>
+			<value level="7">95</value>
+			<value level="8">95</value>
+			<value level="9">99</value>
 		</magicLevel>
 		<hpConsume>
 			<value level="1">100</value>
@@ -3041,25 +2768,17 @@
 			<value level="7">500</value>
 		</hpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>180000</reuseDelay>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="6">300000</value>
+			<value level="7">180000</value>
+		</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<itemConsumeCount>
-			<value level="1">2</value>
-			<value level="2">2</value>
-			<value level="3">2</value>
-			<value level="4">2</value>
-			<value level="5">2</value>
-			<value level="6">2</value>
-			<value level="7">3</value>
-		</itemConsumeCount>
-		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<conditions>
-			<condition name="OpCheckSkill">
+			<condition name="OpNotAffectedBySkill">
 				<skillId>139</skillId> <!-- Guts -->
-				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
 		<effects>
@@ -3089,49 +2808,37 @@
 			</effect>
 			<effect name="CriticalRate">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">5</value>
-					<value level="3">6</value>
-					<value level="4">6</value>
-					<value level="5">7</value>
-					<value level="6">7</value>
+					<value fromLevel="1" toLevel="2">5</value>
+					<value fromLevel="3" toLevel="4">6</value>
+					<value fromLevel="5" toLevel="6">7</value>
 					<value level="7">8</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
-					<value level="1">5</value>
-					<value level="2">5</value>
-					<value level="3">6</value>
-					<value level="4">6</value>
-					<value level="5">7</value>
-					<value level="6">7</value>
+					<value fromLevel="1" toLevel="2">5</value>
+					<value fromLevel="3" toLevel="4">6</value>
+					<value fromLevel="5" toLevel="6">7</value>
 					<value level="7">8</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillCriticalDamage">
-				<amount>
-					<value level="1">4</value>
-					<value level="2">5</value>
-					<value level="3">5</value>
-					<value level="4">6</value>
-					<value level="5">6</value>
-					<value level="6">7</value>
-					<value level="7">7</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="PhysicalSkillCriticalRate">
 				<amount>
 					<value level="1">4</value>
-					<value level="2">5</value>
-					<value level="3">5</value>
-					<value level="4">6</value>
-					<value level="5">6</value>
-					<value level="6">7</value>
-					<value level="7">7</value>
+					<value fromLevel="2" toLevel="3">5</value>
+					<value fromLevel="4" toLevel="5">6</value>
+					<value fromLevel="6" toLevel="7">7</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalSkillCriticalDamage">
+				<amount>
+					<value level="1">4</value>
+					<value fromLevel="2" toLevel="3">5</value>
+					<value fromLevel="4" toLevel="5">6</value>
+					<value fromLevel="6" toLevel="7">7</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -3159,6 +2866,17 @@
 				<accuracyAmount>8</accuracyAmount>
 				<accuracyMode>DIFF</accuracyMode>
 			</effect>
+			<effect name="ManaHeal">
+				<power>
+					<value level="1">80</value>
+					<value level="2">100</value>
+					<value level="3">110</value>
+					<value level="4">120</value>
+					<value level="5">130</value>
+					<value level="6">140</value>
+					<value level="7">150</value>
+				</power>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="181" toLevel="2" name="Revival">
@@ -3169,6 +2887,7 @@
 			<value level="2">565</value>
 		</effectPoint>
 		<hitTime>1500</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<magicLevel>
 			<value level="1">55</value>
 			<value level="2">79</value>
@@ -3196,19 +2915,13 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
-			<effect name="DispelBySlot">
-				<dispel>
-					<value level="1">POISON,3;BLEEDING,3;DOT_MP,3</value>
-					<value level="2">POISON,7;BLEEDING,7;DOT_MP,7;SPEED_DOWN,7;ATTACK_TIME_UP,7;CASTING_TIME_UP,7</value>
-				</dispel>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="190" toLevel="55" name="Fatal Strike">
 		<!-- A powerful strike. Attacks the target with $s1 power. Ignores Shield Defense. Ignores $s2 of the target's defense. Critical. -->
 		<icon>icon.skill0190</icon>
 		<castRange>40</castRange>
-		<coolTime>720</coolTime>
+		<coolTime>500</coolTime>
 		<effectPoint>
 			<value level="1">-200</value>
 			<value level="2">-205</value>
@@ -3267,7 +2980,8 @@
 			<value level="55">-470</value>
 		</effectPoint>
 		<effectRange>400</effectRange>
-		<hitTime>780</hitTime>
+		<hitTime>1000</hitTime>
+		<hitCancelTime>0.5</hitCancelTime>
 		<magicLevel>
 			<value level="1">40</value>
 			<value level="2">40</value>
@@ -3474,11 +3188,10 @@
 			<value level="4">55</value>
 			<value level="5">64</value>
 			<value level="6">72</value>
-			<value level="7">78</value>
-			<value level="8">86</value>
+			<value level="7">72</value>
+			<value level="8">72</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MpRegen">
 				<amount>
@@ -3508,7 +3221,6 @@
 			<value level="7">74</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3524,13 +3236,10 @@
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
-					<value level="1">0</value>
-					<value level="2">0</value>
-					<value level="3">0</value>
-					<value level="4">0</value>
-					<value level="5">0</value>
-					<value level="6">20</value>
-					<value level="7">30</value>
+					<value fromLevel="1" toLevel="4">0</value>
+					<value level="5">20</value>
+					<value level="6">30</value>
+					<value level="7">35</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -3554,7 +3263,6 @@
 			<value level="2">55</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="Breath">
 				<amount>
@@ -3570,19 +3278,15 @@
 		<icon>icon.skill0196</icon>
 		<magicLevel>43</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">10</value>
-				</amount>
+				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PAtk">
 				<amount>
 					<value level="1">60</value>
-					<value level="2">60</value>
+					<value level="2">120</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -3596,12 +3300,11 @@
 			<value level="2">46</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
 					<value level="1">80</value>
-					<value level="2">80</value>
+					<value level="2">140</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -3616,7 +3319,6 @@
 			<value level="3">58</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalEvasion">
 				<amount>