diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml
index bcc9b5adc5..57ae008232 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml
@@ -65,17 +65,8 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<passiveConditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-					<item>BLUNT</item>
-				</weaponType>
-			</condition>
-		</passiveConditions>
 		<effects>
-			<effect name="TriggerSkillByAttack" fromLevel="9" toLevel="53">
+			<effect name="TriggerSkillByAttack" fromLevel="9" toLevel="59">
 				<!-- Blunt Mastery -->
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
@@ -85,6 +76,7 @@
 				<allowWeapons>SWORD,BLUNT</allowWeapons>
 				<skillId>5604</skillId> <!-- Blessing of Stun -->
 				<skillLevel>1</skillLevel>
+				<allowSkillAttack>true</allowSkillAttack>
 			</effect>
 			<effect name="PAtk"> <!-- Increase while wearing Sword/Blunt -->
 				<amount>
@@ -228,7 +220,6 @@
 			<value level="66">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -371,7 +362,6 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -508,7 +498,6 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -578,7 +567,6 @@
 				</weaponType>
 			</effect>
 			<effect name="TriggerSkillByAttack" fromLevel="11" toLevel="59">
-				<!-- Slow -->
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
 				<chance>10</chance>
@@ -589,7 +577,6 @@
 				<skillLevel>1</skillLevel>
 			</effect>
 			<effect name="TriggerSkillByAttack" fromLevel="11" toLevel="59">
-				<!-- Slow -->
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
 				<chance>20</chance>
@@ -617,7 +604,6 @@
 			<value level="10">74</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MaxHp">
 				<amount>
@@ -650,7 +636,6 @@
 			<value level="8">74</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="HpRegen">
 				<amount>
@@ -681,7 +666,6 @@
 			<value level="8">72</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MaxMp">
 				<amount>
@@ -690,7 +674,7 @@
 					<value level="3">70</value>
 					<value level="4">100</value>
 					<value level="5">140</value>
-					<value level="6">152</value>
+					<value level="6">150</value>
 					<value level="7">180</value>
 					<value level="8">200</value>
 				</amount>
@@ -703,7 +687,6 @@
 		<icon>icon.skill0214</icon>
 		<magicLevel>1</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MpRegen">
 				<amount>20</amount>
@@ -779,7 +762,6 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -858,57 +840,7 @@
 					<value level="6">5</value>
 					<value level="7">5</value>
 					<value level="8">5</value>
-					<value level="9">10</value>
-					<value level="10">10</value>
-					<value level="11">10</value>
-					<value level="12">10</value>
-					<value level="13">10</value>
-					<value level="14">10</value>
-					<value level="15">10</value>
-					<value level="16">10</value>
-					<value level="17">10</value>
-					<value level="18">10</value>
-					<value level="19">10</value>
-					<value level="20">10</value>
-					<value level="21">10</value>
-					<value level="22">10</value>
-					<value level="23">10</value>
-					<value level="24">10</value>
-					<value level="25">10</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>
-					<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">10</value>
-					<value level="41">10</value>
-					<value level="42">10</value>
-					<value level="43">10</value>
-					<value level="44">10</value>
-					<value level="45">10</value>
-					<value level="46">10</value>
-					<value level="47">10</value>
-					<value level="48">10</value>
-					<value level="49">10</value>
-					<value level="50">10</value>
-					<value level="51">10</value>
-					<value level="52">10</value>
-					<value level="53">10</value>
-					<value level="54">10</value>
-					<value level="55">10</value>
-					<value level="56">10</value>
-					<value level="57">10</value>
-					<value level="58">10</value>
-					<value level="59">10</value>
+					<value fromLevel="9" toLevel="59">10</value>
 				</amount>
 				<mode>DIFF</mode>
 				<weaponType>
@@ -982,7 +914,6 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -1061,7 +992,6 @@
 		<magicLevel>40</magicLevel>
 		<mpConsume>7</mpConsume>
 		<operateType>T</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
 		<effects>
 			<effect name="ManaDamOverTime">
@@ -1077,34 +1007,27 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="222" toLevel="4" name="Fury Fists">
+	<skill id="222" toLevel="1" name="Fury Fists">
 		<!-- When using a fist weapon Atk. Spd. $s1 -->
 		<icon>icon.skill0222</icon>
 		<magicLevel>43</magicLevel>
-		<operateType>T</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>DUALFIST</item>
-				</weaponType>
-			</condition>
-		</conditions>
+		<operateType>P</operateType>
 		<effects>
 			<effect name="PhysicalAttackSpeed">
 				<amount>15</amount>
 				<mode>PER</mode>
+				<weaponType>
+					<item>DUALFIST</item>
+				</weaponType>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="223" toLevel="65" name="Bloody Weapon">
 		<!-- Sharpens a weapon. The effect lasts for $s1 Uses Bloody Strike after a physical attack. Cannot be used with Freezing Weapon. <Bloody Strike> Attacks the enemy with $s2 power. For $s3 deals additional damage. -->
 		<icon>icon.skill0223</icon>
-		<abnormalLevel>2</abnormalLevel>
+		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
-		<abnormalType>BLEEDING</abnormalType>
-		<castRange>40</castRange>
-		<effectRange>400</effectRange>
+		<abnormalType>BLOODY_FREEZING_WEAPON</abnormalType>
 		<hitTime>1200</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<magicLevel>
@@ -1181,12 +1104,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<conditions>
-			<condition name="OpCheckSkill">
-				<skillId>105</skillId> <!-- Freezing Weapon -->
-				<affectType>CASTER</affectType>
-			</condition>
-		</conditions>
+        <conditions>
+            <condition name="OpNotAffectedBySkill">
+                <skillId>105</skillId> <!-- Freezing Weapon -->
+            </condition>
+            <condition name="OpNotAffectedBySkill">
+                <skillId>47288</skillId> <!-- Freezing Weapon -->
+            </condition>
+        </conditions>
 		<effects>
 			<effect name="TriggerSkillByAttack">
 				<attackerType>Creature</attackerType>
@@ -1263,6 +1188,7 @@
 					<value level="65">65</value>
 				</skillLevel>
 				<chance>50</chance>
+				<allowSkillAttack>true</allowSkillAttack>
 			</effect>
 		</effects>
 	</skill>
@@ -1275,7 +1201,6 @@
 			<value level="3">55</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="StatByMoveType">
 				<stat>EVASION_RATE</stat>
@@ -1294,7 +1219,6 @@
 		<magicLevel>5</magicLevel>
 		<mpConsume>2</mpConsume>
 		<operateType>T</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
 		<effects>
 			<effect name="Relax">
@@ -1377,7 +1301,6 @@
 			<value level="64">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -1457,62 +1380,7 @@
 					<value level="2">3</value>
 					<value level="3">5</value>
 					<value level="4">5</value>
-					<value level="5">6</value>
-					<value level="6">6</value>
-					<value level="7">6</value>
-					<value level="8">6</value>
-					<value level="9">6</value>
-					<value level="10">6</value>
-					<value level="11">6</value>
-					<value level="12">6</value>
-					<value level="13">6</value>
-					<value level="14">6</value>
-					<value level="15">6</value>
-					<value level="16">6</value>
-					<value level="17">6</value>
-					<value level="18">6</value>
-					<value level="19">6</value>
-					<value level="20">6</value>
-					<value level="21">6</value>
-					<value level="22">6</value>
-					<value level="23">6</value>
-					<value level="24">6</value>
-					<value level="25">6</value>
-					<value level="26">6</value>
-					<value level="27">6</value>
-					<value level="28">6</value>
-					<value level="29">6</value>
-					<value level="30">6</value>
-					<value level="31">6</value>
-					<value level="32">6</value>
-					<value level="33">6</value>
-					<value level="34">6</value>
-					<value level="35">6</value>
-					<value level="36">6</value>
-					<value level="37">6</value>
-					<value level="38">6</value>
-					<value level="39">6</value>
-					<value level="40">6</value>
-					<value level="41">6</value>
-					<value level="42">6</value>
-					<value level="43">6</value>
-					<value level="44">6</value>
-					<value level="45">6</value>
-					<value level="46">6</value>
-					<value level="47">6</value>
-					<value level="48">6</value>
-					<value level="49">6</value>
-					<value level="50">6</value>
-					<value level="51">6</value>
-					<value level="52">6</value>
-					<value level="53">6</value>
-					<value level="54">6</value>
-					<value level="55">6</value>
-					<value level="56">6</value>
-					<value level="57">6</value>
-					<value level="58">6</value>
-					<value level="59">6</value>
-					<value level="60">6</value>
+					<value fromLevel="5" toLevel="60">6</value>
 					<value level="61">7</value>
 					<value level="62">8</value>
 					<value level="63">9</value>
@@ -1534,7 +1402,6 @@
 			<value level="3">56</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MagicalAttackSpeed">
 				<amount>
@@ -1559,7 +1426,6 @@
 			<value level="7">74</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MpRegen">
 				<amount>
@@ -1580,10 +1446,9 @@
 		<icon>icon.skill0230</icon>
 		<magicLevel>
 			<value level="1">30</value>
-			<value level="2">52</value>
+			<value level="2">50</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalAttackSpeed">
 				<amount>
@@ -1601,7 +1466,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="231" toLevel="66" name="Heavy Armor Mastery">
+	<skill id="231" toLevel="64" name="Heavy Armor Mastery">
 		<!-- When using heavy armor P. Def. +$s1 -->
 		<icon>icon.skill0231</icon>
 		<magicLevel>
@@ -1655,7 +1520,7 @@
 			<value level="48">72</value>
 			<value level="49">73</value>
 			<value level="50">74</value>
-			<value level="51">73</value>
+			<value level="51">76</value>
 			<value level="52">77</value>
 			<value level="53">78</value>
 			<value level="54">80</value>
@@ -1671,7 +1536,6 @@
 			<value level="64">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -1819,7 +1683,6 @@
 			<value level="66">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -1897,78 +1760,24 @@
 			</effect>
 			<effect name="DefenceCriticalDamage">
 				<amount>
-					<value level="1">15</value>
-					<value level="2">15</value>
-					<value level="3">15</value>
-					<value level="4">15</value>
-					<value level="5">15</value>
-					<value level="6">15</value>
-					<value level="7">15</value>
-					<value level="8">15</value>
-					<value level="9">15</value>
-					<value level="10">15</value>
-					<value level="11">15</value>
-					<value level="12">15</value>
-					<value level="13">15</value>
-					<value level="14">15</value>
-					<value level="15">15</value>
-					<value level="16">25</value>
-					<value level="17">25</value>
-					<value level="18">25</value>
-					<value level="19">25</value>
-					<value level="20">25</value>
-					<value level="21">25</value>
-					<value level="22">25</value>
-					<value level="23">25</value>
-					<value level="24">25</value>
-					<value level="25">25</value>
-					<value level="26">25</value>
-					<value level="27">25</value>
-					<value level="28">25</value>
-					<value level="29">25</value>
-					<value level="30">25</value>
-					<value level="31">25</value>
-					<value level="32">25</value>
-					<value level="33">25</value>
-					<value level="34">25</value>
-					<value level="35">25</value>
-					<value level="36">25</value>
-					<value level="37">35</value>
-					<value level="38">35</value>
-					<value level="39">35</value>
-					<value level="40">35</value>
-					<value level="41">35</value>
-					<value level="42">35</value>
-					<value level="43">35</value>
-					<value level="44">35</value>
-					<value level="45">35</value>
-					<value level="46">35</value>
-					<value level="47">35</value>
-					<value level="48">35</value>
-					<value level="49">35</value>
-					<value level="50">35</value>
-					<value level="51">35</value>
-					<value level="52">35</value>
-					<value level="53">35</value>
-					<value level="54">35</value>
-					<value level="55">35</value>
-					<value level="56">35</value>
-					<value level="57">35</value>
-					<value level="58">35</value>
-					<value level="59">35</value>
-					<value level="60">35</value>
-					<value level="61">35</value>
-					<value level="62">35</value>
-					<value level="63">35</value>
-					<value level="64">35</value>
-					<value level="65">35</value>
-					<value level="66">35</value>
+					<value fromLevel="1" toLevel="15">15</value>
+					<value fromLevel="16" toLevel="36">25</value>
+					<value fromLevel="37" toLevel="66">35</value>
 				</amount>
 				<mode>PER</mode>
 				<armorType>
 					<item>HEAVY</item>
 				</armorType>
 			</effect>
+			<effect name="TriggerSkillByDamage">
+				<attackerType>Creature</attackerType>
+				<chance>60</chance>
+				<targetType>SELF</targetType>
+				<minDamage>100</minDamage>
+				<skillId>53007</skillId> <!-- Power Stance -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>4</skillLevelScaleTo>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="233" toLevel="61" name="Light Armor Mastery">
@@ -2038,7 +1847,6 @@
 			<value level="61">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -2111,62 +1919,9 @@
 			</effect>
 			<effect name="PhysicalEvasion">
 				<amount>
-					<value level="1">7</value>
-					<value level="2">7</value>
-					<value level="3">7</value>
-					<value level="4">7</value>
-					<value level="5">7</value>
-					<value level="6">7</value>
-					<value level="7">7</value>
-					<value level="8">7</value>
-					<value level="9">7</value>
-					<value level="10">7</value>
-					<value level="11">9</value>
-					<value level="12">9</value>
-					<value level="13">9</value>
-					<value level="14">9</value>
-					<value level="15">9</value>
-					<value level="16">9</value>
-					<value level="17">9</value>
-					<value level="18">9</value>
-					<value level="19">9</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">9</value>
-					<value level="27">9</value>
-					<value level="28">9</value>
-					<value level="29">9</value>
-					<value level="30">9</value>
-					<value level="31">9</value>
-					<value level="32">9</value>
-					<value level="33">9</value>
-					<value level="34">9</value>
-					<value level="35">9</value>
-					<value level="36">9</value>
-					<value level="37">9</value>
-					<value level="38">9</value>
-					<value level="39">9</value>
-					<value level="40">9</value>
-					<value level="41">9</value>
-					<value level="42">9</value>
-					<value level="43">9</value>
-					<value level="44">9</value>
-					<value level="45">9</value>
-					<value level="46">9</value>
-					<value level="47">9</value>
-					<value level="48">12</value>
-					<value level="49">12</value>
-					<value level="50">12</value>
-					<value level="51">12</value>
-					<value level="52">12</value>
-					<value level="53">12</value>
-					<value level="54">12</value>
-					<value level="55">12</value>
-					<value level="56">12</value>
+					<value fromLevel="1" toLevel="10">7</value>
+					<value fromLevel="11" toLevel="47">9</value>
+					<value fromLevel="48" toLevel="56">12</value>
 					<value level="57">13</value>
 					<value level="58">13</value>
 					<value level="59">14</value>
@@ -2180,67 +1935,9 @@
 			</effect>
 			<effect name="DefenceCriticalRate">
 				<amount>
-					<value level="1">-15</value>
-					<value level="2">-15</value>
-					<value level="3">-15</value>
-					<value level="4">-15</value>
-					<value level="5">-15</value>
-					<value level="6">-15</value>
-					<value level="7">-15</value>
-					<value level="8">-15</value>
-					<value level="9">-15</value>
-					<value level="10">-15</value>
-					<value level="11">-25</value>
-					<value level="12">-25</value>
-					<value level="13">-25</value>
-					<value level="14">-25</value>
-					<value level="15">-25</value>
-					<value level="16">-25</value>
-					<value level="17">-25</value>
-					<value level="18">-25</value>
-					<value level="19">-25</value>
-					<value level="20">-25</value>
-					<value level="21">-25</value>
-					<value level="22">-25</value>
-					<value level="23">-25</value>
-					<value level="24">-25</value>
-					<value level="25">-25</value>
-					<value level="26">-25</value>
-					<value level="27">-25</value>
-					<value level="28">-25</value>
-					<value level="29">-25</value>
-					<value level="30">-25</value>
-					<value level="31">-25</value>
-					<value level="32">-35</value>
-					<value level="33">-35</value>
-					<value level="34">-35</value>
-					<value level="35">-35</value>
-					<value level="36">-35</value>
-					<value level="37">-35</value>
-					<value level="38">-35</value>
-					<value level="39">-35</value>
-					<value level="40">-35</value>
-					<value level="41">-35</value>
-					<value level="42">-35</value>
-					<value level="43">-35</value>
-					<value level="44">-35</value>
-					<value level="45">-35</value>
-					<value level="46">-35</value>
-					<value level="47">-35</value>
-					<value level="48">-35</value>
-					<value level="49">-35</value>
-					<value level="50">-35</value>
-					<value level="51">-35</value>
-					<value level="52">-35</value>
-					<value level="53">-35</value>
-					<value level="54">-35</value>
-					<value level="55">-35</value>
-					<value level="56">-35</value>
-					<value level="57">-35</value>
-					<value level="58">-35</value>
-					<value level="59">-35</value>
-					<value level="60">-35</value>
-					<value level="61">-35</value>
+					<value fromLevel="1" toLevel="10">-15</value>
+					<value fromLevel="11" toLevel="31">-25</value>
+					<value fromLevel="32" toLevel="61">-35</value>
 				</amount>
 				<mode>PER</mode>
 				<armorType>
@@ -2249,7 +1946,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="234" toLevel="59" name="Robe Mastery">
+	<skill id="234" toLevel="55" name="Robe Mastery">
 		<!-- When using robes P. Def. +$s1 Max HP +$s2 -->
 		<icon>icon.skill0234</icon>
 		<operateType>P</operateType>
@@ -2310,7 +2007,6 @@
 			<value level="54">89</value>
 			<value level="55">90</value>
 		</magicLevel>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -2501,7 +2197,6 @@
 			<value level="55">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -2629,7 +2324,6 @@
 			<value level="55">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -2702,7 +2396,13 @@
 				</armorType>
 			</effect>
 			<effect name="MagicalAttackSpeed">
-				<amount>91</amount>
+				<amount>
+					<value fromLevel="1" toLevel="51">91</value>
+					<value level="52">92</value>
+					<value level="53">93</value>
+					<value level="54">94</value>
+					<value level="55">95</value>
+				</amount>
 				<mode>PER</mode>
 				<armorType>
 					<item>LIGHT</item>
@@ -2743,7 +2443,6 @@
 			<value level="10">99</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 	</skill>
 	<skill id="244" toLevel="3" name="Armor Mastery">
 		<!-- P. Def. +$s1. -->
@@ -2754,7 +2453,6 @@
 			<value level="3">14</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -2770,7 +2468,8 @@
 		<!-- Attack enemies at the front with $s1 power. -->
 		<icon>icon.skill0245</icon>
 		<affectLimit>5-12</affectLimit>
-		<affectRange>80</affectRange>
+		<effectRange>400</effectRange>
+		<affectRange>400</affectRange>
 		<castRange>40</castRange>
 		<coolTime>500</coolTime>
 		<effectPoint>
@@ -2834,6 +2533,8 @@
 		<targetType>ENEMY</targetType>
 		<affectScope>FAN</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
+		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -2860,7 +2561,6 @@
 					<value level="14">367</value>
 					<value level="15">391</value>
 				</power>
-				<overHit>true</overHit>
 			</effect>
 		</effects>
 	</skill>
@@ -2897,7 +2597,7 @@
 		<magicLevel>30</magicLevel>
 		<mpInitialConsume>30</mpInitialConsume>
 		<operateType>A1</operateType>
-		<reuseDelay>1800000</reuseDelay>
+		<reuseDelay>900000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>4</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -2917,12 +2617,11 @@
 			<value level="1">20</value>
 			<value level="2">40</value>
 			<value level="3">52</value>
-			<value level="4">61</value>
-			<value level="5">76</value>
+			<value level="4">60</value>
+			<value level="5">70</value>
 			<value level="6">85</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 	</skill>
 	<skill id="249" toLevel="56" name="Weapon Mastery">
 		<!-- P. Atk. +$s1 M. Atk. +$s2 When using a bow or a spear, Casting Spd. -30% -->
@@ -2986,7 +2685,6 @@
 			<value level="56">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -3182,11 +2880,20 @@
 			<value level="56">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="MpVampiricAttack" fromLevel="43" toLevel="56"> <!-- This is the retail chance and amount. -->
-				<amount>10</amount>
-				<chance>100</chance>
+			<effect name="MpVampiricAttack">
+				<amount>
+					<value fromLevel="1" toLevel="42">0</value>
+					<value fromLevel="43" toLevel="45">1</value>
+					<value fromLevel="46" toLevel="48">2</value>
+					<value fromLevel="49" toLevel="50">3</value>
+					<value fromLevel="51" toLevel="52">4</value>
+					<value level="53">5</value>
+					<value level="54">6</value>
+					<value level="55">8</value>
+					<value level="56">10</value>
+				</amount>
+				<chance>10</chance>
 			</effect>
 			<effect name="PAtk">
 				<amount>
@@ -3293,20 +3000,20 @@
 					<value level="40">510</value>
 					<value level="41">520</value>
 					<value level="42">530</value>
-					<value level="43">550</value>
-					<value level="44">570</value>
-					<value level="45">580</value>
-					<value level="46">600</value>
-					<value level="47">610</value>
-					<value level="48">620</value>
-					<value level="49">630</value>
-					<value level="50">640</value>
-					<value level="51">650</value>
-					<value level="52">660</value>
-					<value level="53">670</value>
-					<value level="54">680</value>
-					<value level="55">690</value>
-					<value level="56">700</value>
+					<value level="43">600</value>
+					<value level="44">620</value>
+					<value level="45">630</value>
+					<value level="46">650</value>
+					<value level="47">660</value>
+					<value level="48">670</value>
+					<value level="49">680</value>
+					<value level="50">690</value>
+					<value level="51">700</value>
+					<value level="52">710</value>
+					<value level="53">720</value>
+					<value level="54">730</value>
+					<value level="55">740</value>
+					<value level="56">750</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -3385,7 +3092,6 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -3472,8 +3178,8 @@
 			<value level="10">30</value>
 			<value level="11">33</value>
 			<value level="12">35</value>
-			<value level="13">38</value>
-			<value level="14">39</value>
+			<value level="13">40</value>
+			<value level="14">40</value>
 			<value level="15">40</value>
 			<value level="16">42</value>
 			<value level="17">43</value>
@@ -3521,7 +3227,6 @@
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -3683,7 +3388,6 @@
 			<value level="57">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -3751,7 +3455,13 @@
 				</armorType>
 			</effect>
 			<effect name="MagicalAttackSpeed">
-				<amount>71</amount>
+				<amount>
+					<value fromLevel="1" toLevel="53">71</value>
+					<value level="54">72</value>
+					<value level="55">73</value>
+					<value level="56">74</value>
+					<value level="57">75</value>
+				</amount>
 				<mode>PER</mode>
 				<armorType>
 					<item>HEAVY</item>
@@ -3769,6 +3479,7 @@
 	<skill id="254" toLevel="17" name="Spoil">
 		<!-- Imbues a monster with magic that renders it susceptible to the Sweeper skill. -->
 		<icon>icon.skill0254</icon>
+		<isMagic>0</isMagic>
 		<castRange>40</castRange>
 		<effectPoint>
 			<value level="1">-70</value>
@@ -3861,7 +3572,6 @@
 			<value level="15">30</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -3887,27 +3597,13 @@
 					<value level="7">20</value>
 					<value level="8">23</value>
 					<value level="9">27</value>
-					<value level="10">30</value>
-					<value level="11">30</value>
-					<value level="12">30</value>
-					<value level="13">30</value>
-					<value level="14">30</value>
-					<value level="15">30</value>
+					<value fromLevel="10" toLevel="15">30</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalSkillPower">
 				<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 fromLevel="1" toLevel="10">0</value>
 					<value level="11">1</value>
 					<value level="12">2</value>
 					<value level="13">3</value>
@@ -3926,8 +3622,6 @@
 			<value level="2">40</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>NONE</targetType>
 		<effects>
 			<effect name="Accuracy">
 				<amount>
@@ -4005,12 +3699,11 @@
 			<value level="54">85</value>
 			<value level="55">86</value>
 			<value level="56">87</value>
-			<value level="57">8</value>
+			<value level="57">88</value>
 			<value level="58">89</value>
 			<value level="59">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -4135,7 +3828,6 @@
 			<value level="47">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -4272,7 +3964,6 @@
 			<value level="47">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -4403,7 +4094,11 @@
 				</armorType>
 			</effect>
 			<effect name="CriticalRate">
-				<amount>30</amount>
+				<amount>
+					<value fromLevel="1" toLevel="18">10</value>
+					<value fromLevel="19" toLevel="33">20</value>
+					<value fromLevel="34" toLevel="47">30</value>
+				</amount>
 				<mode>DIFF</mode>
 				<armorType>
 					<item>HEAVY</item>
@@ -4465,6 +4160,8 @@
 			<value level="45">-440</value>
 		</effectPoint>
 		<effectRange>400</effectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<magicLevel>
 			<value level="1">40</value>
 			<value level="2">40</value>
@@ -4625,7 +4322,6 @@
 					<value level="45">3479</value>
 				</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
-				<overHit>true</overHit>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>45484</skillId> <!-- Power Break -->
@@ -4682,6 +4378,8 @@
 	<skill id="261" toLevel="40" name="Triple Sonic Slash">
 		<!-- Attacks the enemy with $s1 power. Increases power upon consuming Momentum. Ignores $s2 of the target's defense. Critical. -->
 		<icon>icon.skill0261</icon>
+		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<castRange>40</castRange>
 		<coolTime>500</coolTime>
 		<effectPoint>
@@ -4828,6 +4526,8 @@
 		<effects>
 			<effect name="EnergyAttack">
 				<chargeConsume>3</chargeConsume>
+				<pDefMod>0.90</pDefMod>
+				<criticalChance>15</criticalChance>
 				<power>
 					<value level="1">1481</value>
 					<value level="2">1644</value>
@@ -5230,6 +4930,8 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -5297,20 +4999,19 @@
 					<value level="54">7338</value>
 					<value level="55">7438</value>
 				</power>
-				<chanceBoost>300</chanceBoost>
-				<overHit>true</overHit>
+				<chanceBoost>200</chanceBoost>
+				<criticalChance>
+					<value fromLevel="1" toLevel="30">5</value>
+					<value fromLevel="31" toLevel="55">10</value>
+				</criticalChance>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="264" toLevel="2" name="Elven Magic Resistance">
+	<skill id="264" toLevel="1" name="Elven Magic Resistance">
 		<!-- M. Damage Resistance $s1 -->
 		<icon>icon.skill0264</icon>
-		<magicLevel>
-			<value level="1">55</value>
-			<value level="2">95</value>
-		</magicLevel>
+		<magicLevel>55</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="ResistDDMagic">
 				<amount>10</amount>
@@ -5321,12 +5022,8 @@
 	<skill id="265" toLevel="1" name="Elven Melody">
 		<!-- Received Healing $s1 -->
 		<icon>icon.skill0265</icon>
-		<magicLevel>
-			<value level="1">52</value>
-			<value level="2">95</value>
-		</magicLevel>
+		<magicLevel>52</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="HealEffect">
 				<amount>50</amount>
@@ -5334,36 +5031,24 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="266" toLevel="2" name="Song of Water">
+	<skill id="266" toLevel="1" name="Song of Water">
 		<!-- Elven water-praising song. Reflects $s1 of the Received P. Skill Damage. -->
 		<icon>icon.skill0266</icon>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
+		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SONG_OF_WATER</abnormalType>
-		<affectRange>1000</affectRange>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">62</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>62</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="ReflectSkill">
-				<amount>
-					<value level="1">30</value>
-					<value level="2">30</value>
-				</amount>
+				<amount>30</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -5402,14 +5087,9 @@
 		<affectObject>FRIEND</affectObject>
 		<itemConsumeCount>
 			<value level="1">0</value>
-			<value level="2">30</value>
+			<value level="2">10</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<conditions>
-			<condition name="OpNotAffectedBySkill">
-				<skillId>45405</skillId>
-			</condition>
-		</conditions>
 		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>45405</skillId> 
@@ -5436,15 +5116,11 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="268" toLevel="2" name="Elven Guard's Protection">
+	<skill id="268" toLevel="1" name="Elven Guard's Protection">
 		<!-- Shield Defense Rate $s1 Debuff Resistance $s2 Anomaly Resistance $s2 -->
 		<icon>icon.skill0268</icon>
-		<magicLevel>
-			<value level="1">44</value>
-			<value level="2">95</value>
-		</magicLevel>
+		<magicLevel>44</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="ShieldDefenceRate">
 				<amount>50</amount>
@@ -5459,15 +5135,11 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="269" toLevel="2" name="Elven Life Boost">
+	<skill id="269" toLevel="1" name="Elven Life Boost">
 		<!-- Max HP $s1 HP Recovery Rate $s2 -->
 		<icon>icon.skill0269</icon>
-		<magicLevel>
-			<value level="1">48</value>
-			<value level="2">95</value>
-		</magicLevel>
+		<magicLevel>48</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MaxHp">
 				<amount>1000</amount>
@@ -5479,44 +5151,34 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="270" toLevel="2" name="Song of Vengeance">
+	<skill id="270" toLevel="1" name="Song of Vengeance">
 		<!-- Elven avengers' song. Reflects $s1 of the received damage. -->
 		<icon>icon.skill0270</icon>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>SONG_OF_INVOCATION</abnormalType>
-		<affectRange>1000</affectRange>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>SONG_OF_VENGEANCE</abnormalType>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">42</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>42</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="ReflectMagic">
-				<amount>20</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="ReflectSkill">
-				<amount>20</amount>
-				<mode>DIFF</mode>
+			<effect name="DamageShield">
+				<amount>10</amount>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="271" toLevel="2" name="Dance of Fire">
 		<!-- Dark Elven fire-praising dance. P. Critical Damage $s1 -->
-		<icon>icon.skill0271</icon>
+		<icon>
+			<value level="1">icon.skill0271</value>
+			<value level="2">icon.dance_of_fire_02</value>
+		</icon>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
@@ -5545,14 +5207,9 @@
 		<affectObject>FRIEND</affectObject>
 		<itemConsumeCount>
 			<value level="1">0</value>
-			<value level="2">30</value>
+			<value level="2">10</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<conditions>
-			<condition name="OpNotAffectedBySkill">
-				<skillId>45407</skillId>
-			</condition>
-		</conditions>
 		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>45407</skillId> 
@@ -5584,7 +5241,6 @@
 		<icon>icon.skill0272</icon>
 		<magicLevel>48</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MaxHp">
 				<amount>500</amount>
@@ -5596,30 +5252,24 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="273" toLevel="2" name="Dark Elven Damage Decrease">
+	<skill id="273" toLevel="1" name="Dark Elven Damage Decrease">
 		<!-- Received damage from monsters $s1 -->
 		<icon>icon.skill0273</icon>
-		<magicLevel>48</magicLevel>
+		<magicLevel>52</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
-			<effect name="PveMagicalSkillDefenceBonus">
+			<effect name="DamageByAttack">
 				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvePhysicalAttackDefenceBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PvePhysicalSkillDefenceBonus">
-				<amount>10</amount>
-				<mode>PER</mode>
+				<type>ENEMY_ALL</type>
 			</effect>
 		</effects>
 	</skill>
 	<skill id="274" toLevel="2" name="Dance of Warrior">
 		<!-- Dark Elven battle dance. P. Atk. $s1 -->
-		<icon>icon.skill0274</icon>
+		<icon>
+			<value level="1">icon.skill0274</value>
+			<value level="2">icon.dance_of_warrior_02</value>
+		</icon>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
@@ -5648,14 +5298,9 @@
 		<affectObject>FRIEND</affectObject>
 		<itemConsumeCount>
 			<value level="1">0</value>
-			<value level="2">30</value>
+			<value level="2">10</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<conditions>
-			<condition name="OpNotAffectedBySkill">
-				<skillId>45406</skillId>
-			</condition>
-		</conditions>
 		<selfEffects>
 			<effect name="CallSkill">
 				<skillId>45406</skillId> 
@@ -5682,33 +5327,22 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="275" toLevel="2" name="Dance of the Mystic">
+	<skill id="275" toLevel="1" name="Dance of the Mystic">
 		<!-- Dark Elven arcane-praising dance. A $s1 chance to reflect M. skills. -->
 		<icon>icon.skill0275</icon>
-		<abnormalLevel>
-			<value level="1">1</value>
-			<value level="2">2</value>
-		</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>DANCE_OF_FURY</abnormalType>
-		<affectRange>1000</affectRange>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>DANCE_OF_MYSTIC</abnormalType>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
-		<magicLevel>
-			<value level="1">62</value>
-			<value level="2">95</value>
-		</magicLevel>
-		<mpConsume>
-			<value level="1">50</value>
-			<value level="2">50</value>
-		</mpConsume>
+		<magicLevel>74</magicLevel>
+		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="ReflectMagic">
 				<chance>20</chance>
@@ -5721,7 +5355,6 @@
 		<icon>icon.skill0276</icon>
 		<magicLevel>55</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="ResistDDMagic">
 				<amount>10</amount>
@@ -5733,21 +5366,18 @@
 		<!-- Dark Elven protective dance. Skill Evasion $s1 -->
 		<icon>icon.skill0277</icon>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>300</abnormalTime>
-		<abnormalType>DANCE_OF_LIGHT</abnormalType>
-		<affectRange>1000</affectRange>
-		<attributeType>HOLY</attributeType>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>DANCE_OF_PROTECTION</abnormalType>
 		<hitTime>2500</hitTime>
 		<isMagic>3</isMagic> <!-- Dance Skill -->
 		<magicLevel>42</magicLevel>
 		<mpConsume>50</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>3000</reuseDelay>
+		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="SkillEvasion">
 				<amount>30</amount>
@@ -5849,6 +5479,7 @@
 		<!-- <Paralyzing Skill> A powerful lightning strike. Attacks the target with $s1 power. Paralyzes for $s2 Critical. -->
 		<icon>icon.skill0279</icon>
 		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<castRange>400</castRange>
 		<coolTime>500</coolTime>
 		<effectPoint>
@@ -5864,7 +5495,6 @@
 		</effectPoint>
 		<effectRange>900</effectRange>
 		<hitTime>1500</hitTime>
-		<isMagic>0</isMagic>
 		<magicLevel>
 			<value level="1">58</value>
 			<value level="2">62</value>
@@ -5906,8 +5536,7 @@
 					<value level="8">5776</value>
 					<value level="9">6007</value>
 				</power>
-				<criticalChance>15</criticalChance>
-				<overHit>true</overHit>
+				<criticalChance>5</criticalChance>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>45480</skillId> <!-- Lightning Strike -->
@@ -5928,6 +5557,8 @@
 	<skill id="280" toLevel="55" name="Burning Fist">
 		<!-- A powerful strike of the flaming fist. Attacks the target with $s1 power. Ignores Shield Defense. Ignores $s2 of the target's defense. Critical. -->
 		<icon>icon.skill0280</icon>
+		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<castRange>40</castRange>
 		<effectPoint>
 			<value level="1">-200</value>
@@ -6180,7 +5811,6 @@
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<pDefMod>0.95</pDefMod>
 				<criticalChance>15</criticalChance>
-				<overHit>true</overHit>
 			</effect>
 		</effects>
 	</skill>
@@ -6188,6 +5818,7 @@
 		<!-- <Shock skill> Attacks the enemy with a powerful blow. Power $s1. Stuns for $s2 Ignores Shield Defense. -->
 		<icon>icon.skill0281</icon>
 		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<castRange>40</castRange>
 		<coolTime>500</coolTime>
 		<effectPoint>
@@ -6238,7 +5869,7 @@
 			<value level="45">-440</value>
 		</effectPoint>
 		<effectRange>400</effectRange>
-		<hitTime>1409</hitTime>
+		<hitTime>1360</hitTime>
 		<magicLevel>
 			<value level="1">40</value>
 			<value level="2">40</value>
@@ -6396,7 +6027,6 @@
 					<value level="45">3479</value>
 				</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
-				<overHit>true</overHit>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>45485</skillId> <!-- Iron Fist -->
@@ -6460,14 +6090,17 @@
 			<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>
+		<itemConsumeCount>
+			<value level="1">5</value>
+			<value level="2">10</value>
+		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<magicLevel>
 			<value level="1">40</value>
-			<value level="2">80</value>
+			<value level="2">76</value>
 		</magicLevel>
 		<mpConsume>
 			<value level="1">80</value>
@@ -6479,15 +6112,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<conditions>
-			<condition name="OpCheckSkillList">
-				<skillIds>
-					<item>109</item> <!-- Ogre Spirit Totem -->
-					<item>298</item> <!-- Rabbit Spirit Totem -->
-				</skillIds>
-				<affectType>CASTER</affectType>
-			</condition>
-		</conditions>
+        <conditions>
+            <condition name="OpNotAffectedBySkill">
+                <skillId>109</skillId> <!-- Ogre Spirit Totem -->
+            </condition>
+            <condition name="OpNotAffectedBySkill">
+                <skillId>298</skillId> <!-- Rabbit Spirit Totem -->
+            </condition>
+        </conditions>
 		<effects>
 			<effect name="PhysicalSkillPower">
 				<amount>
@@ -6496,11 +6128,19 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="TriggerSkill" fromLevel="2" toLevel="2">
-				<castSkillId>282</castSkillId>
+			<effect name="PhysicalAttackWeaponBonus">
+				<weaponType>
+					<item>DUALFIST</item>
+				</weaponType>
+				<amount>
+					<value level="1">0</value>
+					<value level="2">3</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CallSkill" fromLevel="2" toLevel="2">
 				<skillId>45420</skillId> <!-- Puma Nature -->
 				<skillLevel>1</skillLevel>
-				<chance>100</chance>
 			</effect>
 		</effects>
 	</skill>
@@ -6550,6 +6190,7 @@
 			<value level="10">32</value>
 			<value level="11">33</value>
 		</mpInitialConsume>
+		<reuseDelay>5000</reuseDelay>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
@@ -6578,6 +6219,8 @@
 	<skill id="284" toLevel="60" name="Hurricane Assault">
 		<!-- Attacks the enemy with $s1 power. Increases power upon consuming Momentum. Ignores Shield Defense. Critical. -->
 		<icon>icon.skill0284</icon>
+		<basicProperty>PHYSICAL</basicProperty>
+		<isMagic>0</isMagic>
 		<castRange>40</castRange>
 		<coolTime>500</coolTime>
 		<effectPoint>
@@ -6848,7 +6491,6 @@
 				</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<criticalChance>15</criticalChance>
-				<overHit>true</overHit>
 			</effect>
 		</effects>
 	</skill>
@@ -6894,7 +6536,6 @@
 			<value level="36">85</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MaxMp">
 				<amount>
@@ -7286,15 +6927,23 @@
 	<skill id="286" toLevel="11" name="Provoke">
 		<!-- Attracts nearby enemies to the character and decreases their Resistance to swords/ blunt weapon/ spears. The effect lasts for $s1 Resistance to swords/ blunt weapon/ spears $s2 -->
 		<icon>icon.skill0286</icon>
-		<abnormalLevel>1</abnormalLevel>
+		<abnormalLevel>
+			<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>
+			<value level="6">6</value>
+			<value level="7">7</value>
+			<value level="8">8</value>
+			<value level="9">9</value>
+			<value level="10">10</value>
+			<value level="11">11</value>
+		</abnormalLevel>
 		<abnormalTime>20</abnormalTime>
-		<abnormalType>REAL_TARGET</abnormalType>
-		<affectLimit>1-20</affectLimit>
-		<affectRange>
-			<value level="1">500</value>
-			<value level="2">700</value>
-			<value fromLevel="3" toLevel="11">900</value>
-		</affectRange>
+		<abnormalType>PROVOKE</abnormalType>
+		<affectLimit>9-10</affectLimit>
+		<affectRange>1000</affectRange>
 		<effectPoint>
 			<value level="1">-436</value>
 			<value level="2">-436</value>
@@ -7425,33 +7074,29 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DefenceTrait">
-				<SHOCK>
-					<value level="1">40</value>
-					<value level="2">60</value>
-					<value level="3">80</value>
-				</SHOCK>
-				<SLEEP>
-					<value level="1">40</value>
-					<value level="2">60</value>
-					<value level="3">80</value>
-				</SLEEP>
-				<HOLD>
-					<value level="1">40</value>
-					<value level="2">60</value>
-					<value level="3">80</value>
-				</HOLD>
 				<PARALYZE>
 					<value level="1">40</value>
 					<value level="2">60</value>
 					<value level="3">80</value>
 				</PARALYZE>
+				<HOLD>
+					<value level="1">40</value>
+					<value level="2">60</value>
+					<value level="3">80</value>
+				</HOLD>
+				<SLEEP>
+					<value level="1">40</value>
+					<value level="2">60</value>
+					<value level="3">80</value>
+				</SLEEP>
+				<SHOCK>
+					<value level="1">40</value>
+					<value level="2">60</value>
+					<value level="3">80</value>
+				</SHOCK>
 			</effect>
 			<effect name="ResistDispelByCategory">
-				<amount>
-					<value level="1">-40</value>
-					<value level="2">-60</value>
-					<value level="3">-80</value>
-				</amount>
+				<amount>-40</amount>
 				<slot>BUFF</slot>
 			</effect>
 		</effects>
@@ -7467,7 +7112,6 @@
 			<value level="5">80</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -7514,9 +7158,10 @@
 			<value level="16">-84</value>
 			<value level="17">-86</value>
 		</effectPoint>
-		<effectRange>1100</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>3000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<basicProperty>MAGIC</basicProperty>
 		<magicLevel>
 			<value level="1">40</value>
 			<value level="2">43</value>
@@ -7537,15 +7182,15 @@
 			<value level="17">78</value>
 		</magicLevel>
 		<mpConsume>
-			<value level="1">49</value>
-			<value level="2">49</value>
-			<value level="3">54</value>
-			<value level="4">58</value>
-			<value level="5">62</value>
-			<value level="6">65</value>
-			<value level="7">69</value>
-			<value level="8">73</value>
-			<value level="9">75</value>
+			<value level="1">37</value>
+			<value level="2">39</value>
+			<value level="3">43</value>
+			<value level="4">46</value>
+			<value level="5">49</value>
+			<value level="6">52</value>
+			<value level="7">55</value>
+			<value level="8">58</value>
+			<value level="9">60</value>
 			<value level="10">78</value>
 			<value level="11">80</value>
 			<value level="12">83</value>
@@ -7628,7 +7273,6 @@
 			<value level="18">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -7654,6 +7298,10 @@
 				<mode>DIFF</mode>
 				<hpPercent>60</hpPercent>
 			</effect>
+			<effect name="TriggerSkillByHpPercent" >
+				<skillId>45101</skillId>
+				<percentTo>60</percentTo>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="291" toLevel="26" name="Final Fortress">
@@ -7688,7 +7336,6 @@
 			<value level="26">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -7722,6 +7369,15 @@
 				<mode>DIFF</mode>
 				<hpPercent>60</hpPercent>
 			</effect>
+			<effect name="TriggerSkillByDamage">
+				<attackerType>Creature</attackerType>
+				<chance>40</chance>
+				<targetType>SELF</targetType>
+				<minDamage>50</minDamage>
+				<skillId>53011</skillId> <!-- Knight's Fortress -->
+				<skillLevel>1</skillLevel>
+				<skillLevelScaleTo>2</skillLevelScaleTo>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="292" toLevel="1" name="Bison Spirit Totem">
@@ -7763,13 +7419,6 @@
 				<mode>DIFF</mode>
 				<hpPercent>100</hpPercent>
 			</effect>
-			<effect name="Accuracy">
-				<amount>6</amount>
-				<mode>DIFF</mode>
-				<weaponType>
-					<item>DUALFIST</item>
-				</weaponType>
-			</effect>
 			<effect name="PAtk">
 				<amount>20</amount>
 				<mode>PER</mode>
@@ -7852,7 +7501,6 @@
 			<value level="34">90</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="TwoHandedSwordBonus">
 				<pAtkAmount>
@@ -7892,7 +7540,11 @@
 					<value level="34">200</value>
 				</pAtkAmount>
 				<pAtkMode>DIFF</pAtkMode>
-				<accuracyAmount>3</accuracyAmount>
+				<accuracyAmount>
+					<value fromLevel="1" toLevel="29">3</value>
+					<value fromLevel="30" toLevel="32">4</value>
+					<value fromLevel="33" toLevel="34">5</value>
+				</accuracyAmount>
 				<accuracyMode>DIFF</accuracyMode>
 			</effect>
 			<effect name="TwoHandedBluntBonus">
@@ -7941,9 +7593,8 @@
 	<skill id="294" toLevel="1" name="Shadow Sense">
 		<!-- Dark Elves see and fight in the dark perfectly. P. Accuracy +3 -->
 		<icon>icon.skill0294</icon>
-		<magicLevel>15</magicLevel>
+		<magicLevel>1</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="NightStatModify">
 				<stat>ACCURACY_COMBAT</stat>
@@ -7956,7 +7607,6 @@
 		<icon>icon.skill0295</icon>
 		<magicLevel>1</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="AreaDamage">
 				<amount>-40</amount>
@@ -7970,10 +7620,6 @@
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="NightStatModify">
-				<stat>ACCURACY_COMBAT</stat>
-				<amount>3</amount>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="296" toLevel="1" name="Chameleon Rest">
@@ -7983,7 +7629,6 @@
 		<magicLevel>46</magicLevel>
 		<mpConsume>9</mpConsume>
 		<operateType>T</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>NONE</targetType>
 		<effects>
 			<effect name="ChameleonRest">
@@ -8001,7 +7646,6 @@
 			<value level="3">82</value>
 		</magicLevel>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalAttackSpeed">
 				<amount>
@@ -8026,10 +7670,13 @@
 			<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>
+		<itemConsumeCount>
+			<value level="1">5</value>
+			<value level="2">10</value>
+		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<magicLevel>
 			<value level="1">60</value>
@@ -8045,15 +7692,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<conditions>
-			<condition name="OpCheckSkillList">
-				<skillIds>
-					<item>109</item> <!-- Ogre Spirit Totem -->
-					<item>282</item> <!-- Puma Spirit Totem -->
-				</skillIds>
-				<affectType>CASTER</affectType>
-			</condition>
-		</conditions>
+        <conditions>
+            <condition name="OpNotAffectedBySkill">
+                <skillId>109</skillId> <!-- Ogre Spirit Totem -->
+            </condition>
+            <condition name="OpNotAffectedBySkill">
+                <skillId>282</skillId> <!-- Puma Spirit Totem -->
+            </condition>
+        </conditions>
 		<effects>
 			<effect name="PhysicalAttackSpeed">
 				<amount>
@@ -8069,11 +7715,17 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="TriggerSkill" fromLevel="2" toLevel="2">
-				<castSkillId>298</castSkillId>
+			<effect name="Reuse">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">5</value>
+				</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="CallSkill" fromLevel="2" toLevel="2">
 				<skillId>45421</skillId> <!-- Rabbit Nature -->
 				<skillLevel>1</skillLevel>
-				<chance>100</chance>
 			</effect>
 		</effects>
 	</skill>