From 7142d7df7b221e83c57417f4381dd723f359a7a3 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 21 Jan 2020 00:35:15 +0000
Subject: [PATCH] Implemented Soul Breaker and Soul Hound class skills.
 Contributed by Iris.

---
 .../game/data/stats/skills/00400-00499.xml    | 165 +++-------------
 .../game/data/stats/skills/00700-00799.xml    |  75 ++------
 .../game/data/stats/skills/01300-01399.xml    |  24 +++
 .../game/data/stats/skills/01400-01499.xml    | 111 +++++------
 .../game/data/stats/skills/01500-01599.xml    |  51 ++---
 .../game/data/stats/skills/45100-45199.xml    | 177 ++++++++++++++++--
 .../game/data/stats/skills/60000-60099.xml    |   6 +-
 7 files changed, 295 insertions(+), 314 deletions(-)

diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml
index 4213c87244..ddf58655ef 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml
@@ -3601,165 +3601,42 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="474" toLevel="45" name="Rapier Mastery">
-		<!-- P. Atk. +$s1 when using a short sword. -->
+	<skill id="474" toLevel="10" name="Rapier Mastery">
+		<!-- P. Atk. +$s1 when using a Rapier. -->
 		<icon>icon.skill0474</icon>
 		<magicLvl>
 			<value level="1">20</value>
-			<value level="2">24</value>
-			<value level="3">26</value>
-			<value level="4">28</value>
-			<value level="5">30</value>
-			<value level="6">32</value>
-			<value level="7">34</value>
-			<value level="8">36</value>
-			<value level="9">38</value>
-			<value level="10">39</value>
-			<value level="11">40</value>
-			<value level="12">41</value>
-			<value level="13">42</value>
-			<value level="14">43</value>
-			<value level="15">44</value>
-			<value level="16">45</value>
-			<value level="17">46</value>
-			<value level="18">47</value>
-			<value level="19">48</value>
-			<value level="20">49</value>
-			<value level="21">50</value>
-			<value level="22">51</value>
-			<value level="23">52</value>
-			<value level="24">53</value>
-			<value level="25">54</value>
-			<value level="26">55</value>
-			<value level="27">56</value>
-			<value level="28">57</value>
-			<value level="29">58</value>
-			<value level="30">59</value>
-			<value level="31">60</value>
-			<value level="32">61</value>
-			<value level="33">62</value>
-			<value level="34">63</value>
-			<value level="35">64</value>
-			<value level="36">65</value>
-			<value level="37">66</value>
-			<value level="38">67</value>
-			<value level="39">68</value>
-			<value level="40">69</value>
-			<value level="41">70</value>
-			<value level="42">71</value>
-			<value level="43">72</value>
-			<value level="44">73</value>
-			<value level="45">74</value>
+			<value level="2">30</value>
+			<value level="3">40</value>
+			<value level="4">50</value>
+			<value level="5">60</value>
+			<value level="6">70</value>
+			<value level="7">75</value>
+			<value level="8">80</value>
+			<value level="9">85</value>
+			<value level="10">90</value>
 		</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PAtk">
 				<amount>
-					<value level="1">3.2</value>
-					<value level="2">5.28</value>
-					<value level="3">6.48</value>
-					<value level="4">7.84</value>
-					<value level="5">9.36</value>
-					<value level="6">11.12</value>
-					<value level="7">13.04</value>
-					<value level="8">15.2</value>
-					<value level="9">17.52</value>
-					<value level="10">18.8</value>
-					<value level="11">20.08</value>
-					<value level="12">21.44</value>
-					<value level="13">22.88</value>
-					<value level="14">24.4</value>
-					<value level="15">25.92</value>
-					<value level="16">27.6</value>
-					<value level="17">29.28</value>
-					<value level="18">30.96</value>
-					<value level="19">32.8</value>
-					<value level="20">34.64</value>
-					<value level="21">36.56</value>
-					<value level="22">38.56</value>
-					<value level="23">40.64</value>
-					<value level="24">42.72</value>
-					<value level="25">44.88</value>
-					<value level="26">47.12</value>
-					<value level="27">49.44</value>
-					<value level="28">51.76</value>
-					<value level="29">54.16</value>
-					<value level="30">56.56</value>
-					<value level="31">59.04</value>
-					<value level="32">61.52</value>
-					<value level="33">64.08</value>
-					<value level="34">66.72</value>
-					<value level="35">69.36</value>
-					<value level="36">72</value>
-					<value level="37">74.64</value>
-					<value level="38">77.36</value>
-					<value level="39">80.08</value>
-					<value level="40">82.8</value>
-					<value level="41">85.52</value>
-					<value level="42">88.24</value>
-					<value level="43">90.96</value>
-					<value level="44">93.68</value>
-					<value level="45">96.4</value>
+					<value level="1">15</value>
+					<value level="2">30</value>
+					<value level="3">50</value>
+					<value level="4">70</value>
+					<value level="5">90</value>
+					<value level="6">110</value>
+					<value level="7">130</value>
+					<value level="8">160</value>
+					<value level="9">190</value>
+					<value level="10">220</value>
 				</amount>
 				<mode>DIFF</mode>
 				<weaponType>
 					<item>RAPIER</item>
 				</weaponType>
 			</effect>
-			<effect name="MagicalAttackSpeed">
-				<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">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">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">15</value>
-					<value level="23">15</value>
-					<value level="24">15</value>
-					<value level="25">15</value>
-					<value level="26">15</value>
-					<value level="27">15</value>
-					<value level="28">15</value>
-					<value level="29">15</value>
-					<value level="30">15</value>
-					<value level="31">15</value>
-					<value level="32">15</value>
-					<value level="33">15</value>
-					<value level="34">15</value>
-					<value level="35">15</value>
-					<value level="36">15</value>
-					<value level="37">15</value>
-					<value level="38">15</value>
-					<value level="39">15</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>
-				</amount>
-				<mode>PER</mode>
-				<weaponType>
-					<item>RAPIER</item>
-				</weaponType>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="475" toLevel="1" name="Strike Back">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00700-00799.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00700-00799.xml
index 4457aeda13..6907a8af33 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00700-00799.xml
@@ -3436,29 +3436,31 @@
 		<abnormalType>PARALYZE</abnormalType>
 		<abnormalVisualEffect>PARALYZE</abnormalVisualEffect>
 		<activateRate>50</activateRate>
-		<activateRate>
-			<value fromLevel="1" toLevel="5">50</value>
-			<value fromLevel="5" toLevel="5" fromSubLevel="2001" toSubLevel="2030">{base + base / 100 * subIndex}</value>
-		</activateRate>
 		<affectLimit>6-12</affectLimit>
 		<affectRange>150</affectRange>
 		<basicProperty>MAGIC</basicProperty>
 		<coolTime>720</coolTime>
 		<effectPoint>-1</effectPoint>
-		<hitTime>1080</hitTime>
+		<hitTime>1800</hitTime>
 		<isDebuff>true</isDebuff>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<lvlBonusRate>20</lvlBonusRate>
 		<magicLvl>
-			<value level="1">81</value>
-			<value level="2">85</value>
-			<value level="3">90</value>
-			<value level="4">95</value>
-			<value level="5">99</value>
+			<value level="1">76</value>
+			<value level="2">78</value>
+			<value level="3">80</value>
+			<value level="4">82</value>
+			<value level="5">84</value>
 		</magicLvl>
-		<mpConsume>52</mpConsume>
+		<mpConsume>
+			<value level="1">30</value>
+			<value level="2">35</value>
+			<value level="3">40</value>
+			<value level="4">45</value>
+			<value level="5">50</value>
+		</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>5000</reuseDelay>
+		<reuseDelay>20000</reuseDelay>
 		<soulMaxConsumeCount>5</soulMaxConsumeCount>
 		<magicCriticalRate>5</magicCriticalRate>
 		<trait>PARALYZE</trait>
@@ -3466,57 +3468,8 @@
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
-			<effect name="MagicalAttack">
-				<power>
-					<value level="1">149</value>
-					<value level="2">158</value>
-					<value level="3">169</value>
-					<value level="4">179</value>
-					<value level="5">188</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1001" toSubLevel="1005">{base + base / 100 * (1 + 0.4 * (subIndex - 1))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1006" toSubLevel="1006">{base + base / 100 * (2 + 0.8 * (subIndex - 5))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1007" toSubLevel="1007">{base + base / 100 * (3 + 0.3 * (subIndex - 6))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1008" toSubLevel="1008">{base + base / 100 * (3 + 0.3 * (subIndex - 7))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1009" toSubLevel="1011">{base + base / 100 * (4 + 0.4 * (subIndex - 8))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1012" toSubLevel="1012">{base + base / 100 * (5 + 0.1 * (subIndex - 11))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1013" toSubLevel="1013">{base + base / 100 * (5 + 0.5 * (subIndex - 12))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1014" toSubLevel="1014">{base + base / 100 * (5 + 0.9 * (subIndex - 13))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1015" toSubLevel="1015">{base + base / 100 * (6 + 0.2 * (subIndex - 14))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1016" toSubLevel="1016">{base + base / 100 * (6 + 0.6 * (subIndex - 15))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1017" toSubLevel="1017">{base + base / 100 * (7 + 0.2 * (subIndex - 16))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1018" toSubLevel="1018">{base + base / 100 * (7 + 0.4 * (subIndex - 17))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1019" toSubLevel="1019">{base + base / 100 * (7 + 0.7 * (subIndex - 18))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1020" toSubLevel="1020">{base + base / 100 * (8 + 0.1 * (subIndex - 19))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1021" toSubLevel="1021">{base + base / 100 * (8 + 0.5 * (subIndex - 20))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1022" toSubLevel="1022">{base + base / 100 * (8 + 0.8 * (subIndex - 21))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1023" toSubLevel="1023">{base + base / 100 * (9 + 0.2 * (subIndex - 22))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1024" toSubLevel="1024">{base + base / 100 * (9 + 0.6 * (subIndex - 23))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1025" toSubLevel="1025">{base + base / 100 * (10 * (subIndex - 24))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1026" toSubLevel="1026">{base + base / 100 * (10 + 0.3 * (subIndex - 25))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1027" toSubLevel="1027">{base + base / 100 * (10 + 0.7 * (subIndex - 26))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1028" toSubLevel="1028">{base + base / 100 * (11 + 0.1 * (subIndex - 27))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1029" toSubLevel="1029">{base + base / 100 * (11 + 0.4 * (subIndex - 28))}</value>
-					<value fromLevel="5" toLevel="5" fromSubLevel="1030" toSubLevel="1030">{base + base / 100 * (11 + 0.8 * (subIndex - 29))}</value>
-				</power>
-			</effect>
 			<effect name="BlockActions" />
-			<effect name="HealEffect">
-				<amount>
-					<value level="1">-10</value>
-					<value level="2">-20</value>
-					<value level="3">-30</value>
-					<value level="4">-40</value>
-					<value level="5">-50</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
-		<endEffects>
-			<effect name="CallSkill">
-				<skillId>6092</skillId> <!-- Lightning Shock -->
-				<skillLevel>1</skillLevel>
-			</effect>
-		</endEffects>
 	</skill>
 	<skill id="792" toLevel="5" name="Soul Stigma">
 		<!-- Carves a burning mark on the enemy for $s1 and reduces P. Critical Damage and M. Critical Damage by $s2 -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
index 252b75668e..1b9feb6fae 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
@@ -3551,6 +3551,18 @@
 		<magicLvl>1</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MAtkByPAtk">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">60</value>
+					<value level="5">80</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="1379" toLevel="5" name="Soul Sense">
 		<!-- M. Critical Rate increases by $s1 P. Critical Rate.
@@ -3563,6 +3575,18 @@
 		<magicLvl>1</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MagicCriticalRateByCriticalRate">
+				<amount>
+					<value level="1">20</value>
+					<value level="2">30</value>
+					<value level="3">40</value>
+					<value level="4">50</value>
+					<value level="5">70</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="1380" toLevel="10" name="Betray">
 		<!-- Cause's enemy servitor to attack its master. Consumes $s1 Spirit Ore. -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml
index ca1db26049..d844d42ad9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml
@@ -2197,7 +2197,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="1440" toLevel="5" name="Steal Divinity">
+	<skill id="1440" toLevel="3" name="Steal Divinity">
 		<!-- Steals up to $s1 of the enemy's abnormal statuses. Cannot steal buffs from monsters. -->
 		<icon>icon.skill1440</icon>
 		<castRange>600</castRange>
@@ -2206,33 +2206,21 @@
 			<value level="1">-541</value>
 			<value level="2">-566</value>
 			<value level="3">-597</value>
-			<value level="4">-624</value>
-			<value level="5">-646</value>
 		</effectPoint>
 		<effectRange>1100</effectRange>
 		<hitTime>1200</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<magicLvl>
 			<value level="1">55</value>
-			<value level="2">60</value>
-			<value level="3">64</value>
-			<value level="4">68</value>
-			<value level="5">72</value>
+			<value level="2">70</value>
+			<value level="3">80</value>
 		</magicLvl>
 		<mpConsume>
 			<value level="1">40</value>
-			<value level="2">44</value>
-			<value level="3">48</value>
-			<value level="4">51</value>
-			<value level="5">53</value>
+			<value level="2">50</value>
+			<value level="3">60</value>
 		</mpConsume>
-		<mpInitialConsume>
-			<value level="1">10</value>
-			<value level="2">11</value>
-			<value level="3">12</value>
-			<value level="4">13</value>
-			<value level="5">14</value>
-		</mpInitialConsume>
+		<mpInitialConsume>10</mpInitialConsume>
 		<nextAction>ATTACK</nextAction>
 		<operateType>A1</operateType>
 		<reuseDelay>15000</reuseDelay>
@@ -2243,13 +2231,7 @@
 			<effect name="StealAbnormal">
 				<slot>BUFF</slot>
 				<rate>25</rate>
-				<max>
-					<value level="1">3</value>
-					<value level="2">4</value>
-					<value level="3">5</value>
-					<value level="4">6</value>
-					<value level="5">7</value>
-				</max>
+				<max>3</max>
 			</effect>
 		</effects>
 	</skill>
@@ -2391,6 +2373,7 @@
 		<!-- Atk. Spd. +$s1 when equipping a Rapier -->
 		<icon>icon.skill1444</icon>
 		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="PhysicalAttackSpeed">
 				<amount>
@@ -2614,51 +2597,44 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="1446" toLevel="11" name="Shadow Bind">
+	<skill id="1446" toLevel="5" name="Shadow Bind">
 		<!-- Catches the enemy's shadow and inflicts hold for $s1. -->
 		<icon>icon.skill1446</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>15</abnormalTime>
+		<abnormalTime>5</abnormalTime>
 		<abnormalType>ROOT_MAGICALLY</abnormalType>
 		<abnormalVisualEffect>ROOT</abnormalVisualEffect>
 		<activateRate>80</activateRate>
 		<basicProperty>MAGIC</basicProperty>
-		<castRange>400</castRange>
+		<castRange>600</castRange>
 		<effectPoint>
 			<value level="1">-495</value>
 			<value level="2">-523</value>
 			<value level="3">-549</value>
 			<value level="4">-566</value>
 			<value level="5">-582</value>
-			<value level="6">-597</value>
-			<value level="7">-611</value>
-			<value level="8">-624</value>
-			<value level="9">-635</value>
-			<value level="10">-646</value>
-			<value level="11">-655</value>
 		</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1500</hitTime>
 		<isDebuff>true</isDebuff>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<lvlBonusRate>30</lvlBonusRate>
 		<magicLvl>
-			<value level="1">52</value>
-			<value level="2">55</value>
-			<value level="3">58</value>
-			<value level="4">60</value>
-			<value level="5">62</value>
-			<value level="6">64</value>
-			<value level="7">66</value>
-			<value level="8">68</value>
-			<value level="9">70</value>
-			<value level="10">72</value>
-			<value level="11">74</value>
+			<value level="1">76</value>
+			<value level="2">78</value>
+			<value level="3">80</value>
+			<value level="4">82</value>
+			<value level="5">84</value>
 		</magicLvl>
-		<mpConsume>20</mpConsume>
-		<mpInitialConsume>10</mpInitialConsume>
+		<mpConsume>
+			<value level="1">30</value>
+			<value level="2">35</value>
+			<value level="3">40</value>
+			<value level="4">45</value>
+			<value level="5">50</value>
+		</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>8000</reuseDelay>
+		<reuseDelay>10000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<trait>HOLD</trait>
 		<targetType>ENEMY_ONLY</targetType>
@@ -2670,47 +2646,44 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="1447" toLevel="9" name="Voice Bind">
+	<skill id="1447" toLevel="5" name="Voice Bind">
 		<!-- Seals the enemy's voice, blocking their ability to cast magic for $s1. -->
 		<icon>icon.skill1447</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>20</abnormalTime>
+		<abnormalTime>3</abnormalTime>
 		<abnormalType>SILENCE</abnormalType>
 		<abnormalVisualEffect>SILENCE</abnormalVisualEffect>
 		<activateRate>80</activateRate>
 		<basicProperty>MAGIC</basicProperty>
-		<castRange>400</castRange>
+		<castRange>600</castRange>
 		<effectPoint>
 			<value level="1">-549</value>
 			<value level="2">-566</value>
 			<value level="3">-582</value>
 			<value level="4">-597</value>
 			<value level="5">-611</value>
-			<value level="6">-624</value>
-			<value level="7">-635</value>
-			<value level="8">-646</value>
-			<value level="9">-650</value>
 		</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1500</hitTime>
 		<isDebuff>true</isDebuff>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<lvlBonusRate>30</lvlBonusRate>
 		<magicLvl>
-			<value level="1">58</value>
-			<value level="2">60</value>
-			<value level="3">62</value>
-			<value level="4">64</value>
-			<value level="5">66</value>
-			<value level="6">68</value>
-			<value level="7">70</value>
-			<value level="8">72</value>
-			<value level="9">74</value>
+			<value level="1">76</value>
+			<value level="2">78</value>
+			<value level="3">80</value>
+			<value level="4">82</value>
+			<value level="5">84</value>
 		</magicLvl>
-		<mpConsume>25</mpConsume>
-		<mpInitialConsume>15</mpInitialConsume>
+		<mpConsume>
+			<value level="1">30</value>
+			<value level="2">35</value>
+			<value level="3">40</value>
+			<value level="4">45</value>
+			<value level="5">50</value>
+		</mpConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>8000</reuseDelay>
+		<reuseDelay>20000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<trait>DERANGEMENT</trait>
 		<targetType>ENEMY_ONLY</targetType>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01500-01599.xml
index b8f34fad39..102fd36482 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01500-01599.xml
@@ -649,16 +649,22 @@
 		<!-- Spreads lightning's defensive barrier for 30 seconds. Has a chance to Paralyze the target that attacked you for 3 seconds.\n\n<Auto Use Skill> -->
 		<icon>icon.skill1515</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>1200</abnormalTime>
+		<abnormalTime>30</abnormalTime>
 		<abnormalType>ELEMENTAL_ARMOR</abnormalType>
 		<effectPoint>138</effectPoint>
 		<hitTime>1500</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
-		<magicLvl>80</magicLvl>
+		<magicLvl>
+			<value level="1">76</value>
+			<value level="2">78</value>
+			<value level="3">80</value>
+			<value level="4">82</value>
+			<value level="5">84</value>
+		</magicLvl>
 		<mpConsume>29</mpConsume>
 		<mpInitialConsume>8</mpInitialConsume>
 		<operateType>A2</operateType>
-		<reuseDelay>2000</reuseDelay>
+		<reuseDelay>300000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
@@ -671,7 +677,7 @@
 				<maxAttackerLevel>99</maxAttackerLevel>
 				<chance>20</chance>
 				<targetType>TARGET</targetType>
-				<minDamage>100</minDamage>
+				<minDamage>1</minDamage>
 				<skillId>5592</skillId> <!-- Lightning Barrier -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1631,22 +1637,23 @@
 		</effects>
 	</skill>
 	<skill id="1527" toLevel="3" name="Expert Casting">
-		<!-- Casting Cooldown -$s1, and Casting Spd. +$s2 when equipped with light armor. -->
+		<!-- Casting Cooldown -$s1, and Casting Spd. +$s2. -->
 		<icon>icon.skill1527</icon>
 		<magicLvl>
-			<value level="1">40</value>
-			<value level="2">49</value>
-			<value level="3">55</value>
+			<value level="1">58</value>
+			<value level="2">70</value>
+			<value level="3">82</value>
 		</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<effects>
 			<effect name="MagicalAttackSpeed">
-				<amount>10</amount>
-				<mode>PER</mode>
-				<armorType>
-					<item>LIGHT</item>
-				</armorType>
+				<amount>
+					<value level="1">100</value>
+					<value level="2">150</value>
+					<value level="3">220</value>
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="Reuse">
 				<amount>
@@ -3892,16 +3899,15 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="1565" toLevel="6" name="Mana Pump">
+	<skill id="1565" toLevel="5" name="Mana Pump">
 		<!-- Max MP +$s1 -->
 		<icon>icon.skill0213</icon>
 		<magicLvl>
 			<value level="1">40</value>
-			<value level="2">49</value>
-			<value level="3">58</value>
-			<value level="4">64</value>
-			<value level="5">68</value>
-			<value level="6">72</value>
+			<value level="2">50</value>
+			<value level="3">60</value>
+			<value level="4">70</value>
+			<value level="5">75</value>
 		</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -3910,10 +3916,9 @@
 				<amount>
 					<value level="1">70</value>
 					<value level="2">100</value>
-					<value level="3">140</value>
-					<value level="4">150</value>
-					<value level="5">180</value>
-					<value level="6">200</value>
+					<value level="3">130</value>
+					<value level="4">160</value>
+					<value level="5">200</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/45100-45199.xml
index 94b4ba7357..95cb17bae1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/45100-45199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/45100-45199.xml
@@ -383,6 +383,23 @@
 		<hitTime>1000</hitTime>
 		<reuseDelay>900000</reuseDelay>
 		<mpConsume>50</mpConsume>
+		<itemConsumeCount>30</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<staticReuse>true</staticReuse>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpSoulMax" />
+		</conditions>
+		<effects>
+			<effect name="FocusSouls">
+				<charge>
+					<value level="1">70</value>
+					<value level="2">100</value>
+				</charge>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45152" toLevel="2" name="Collect Shadow Souls">
 		<!-- Collects $s1 Shadow Souls. Consumes $s2 Spirit Ores. -->
@@ -720,6 +737,7 @@
 		<icon>icon.skill0505</icon>
 		<operateType>A1</operateType>
 		<castRange>120</castRange>
+		<effectRange>400</effectRange>
 		<hitTime>1800</hitTime>
 		<reuseDelay>2000</reuseDelay>
 		<effectPoint>
@@ -734,6 +752,18 @@
 			<value level="9">-445</value>
 			<value level="10">-470</value>
 		</effectPoint>
+		<magicLvl>
+			<value level="1">20</value>
+			<value level="2">30</value>
+			<value level="3">40</value>
+			<value level="4">50</value>
+			<value level="5">60</value>
+			<value level="6">70</value>
+			<value level="7">75</value>
+			<value level="8">80</value>
+			<value level="9">85</value>
+			<value level="10">90</value>
+		</magicLvl>
 		<mpConsume>
 			<value level="1">18</value>
 			<value level="2">25</value>
@@ -746,14 +776,57 @@
 			<value level="9">66</value>
 			<value level="10">70</value>
 		</mpConsume>
+		<nextAction>ATTACK</nextAction>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>RAPIER</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="FatalBlow">
+				<power>
+					<value level="1">125</value>
+					<value level="2">237</value>
+					<value level="3">427</value>
+					<value level="4">726</value>
+					<value level="5">1162</value>
+					<value level="6">1744</value>
+					<value level="7">2441</value>
+					<value level="8">3174</value>
+					<value level="9">3809</value>
+					<value level="10">4190</value>
+				</power>
+				<overHit>true</overHit>
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<chanceBoost>300</chanceBoost>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45161" toLevel="8" name="Soul Thrust">
-		<!-- Attacks 2 opponents with $s1 power added to P. Atk. Deals additional magic damage. M. Def. -10%. In PvE knocks the opponents back. Requires a rapier. Ignores Shield Defense. Critical, over-hit. -->
+		<!-- Attacks the opponents twice with $s1 power added to P. Atk. Deals additional magic damage. M. Def. -10%. In PvE knocks the opponents back. Requires a rapier. Ignores Shield Defense. Critical, over-hit. -->
 		<icon>icon.skill0478</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>KNOCKDOWN</abnormalType>
 		<castRange>120</castRange>
+		<effectRange>400</effectRange>
 		<hitTime>2000</hitTime>
 		<reuseDelay>3000</reuseDelay>
+		<magicLvl>
+			<value level="1">40</value>
+			<value level="2">50</value>
+			<value level="3">60</value>
+			<value level="4">70</value>
+			<value level="5">75</value>
+			<value level="6">80</value>
+			<value level="7">85</value>
+			<value level="8">90</value>
+		</magicLvl>
 		<effectPoint>
 			<value level="1">-220</value>
 			<value level="2">-270</value>
@@ -774,6 +847,47 @@
 			<value level="7">66</value>
 			<value level="8">70</value>
 		</mpConsume>
+		<lvlBonusRate>20</lvlBonusRate>
+		<activateRate>100</activateRate>
+		<trait>KNOCKDOWN</trait>
+		<isDebuff>true</isDebuff>
+		<nextAction>ATTACK</nextAction>
+		<operateType>A2</operateType>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>RAPIER</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">259</value>
+					<value level="2">440</value>
+					<value level="3">704</value>
+					<value level="4">1056</value>
+					<value level="5">1478</value>
+					<value level="6">1921</value>
+					<value level="7">2305</value>
+					<value level="8">2536</value>
+				</power>
+				<ignoreShieldDefence>true</ignoreShieldDefence>
+				<criticalChance>15</criticalChance>
+				<overHit>true</overHit>
+			</effect>
+			<effect name="KnockBack">
+				<distance>50</distance>
+				<speed>400</speed>
+				<knockDown>false</knockDown>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>-10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45162" toLevel="8" name="Ultimate Soul Thrust">
 		<!-- <Ultimate skill>\n\nAttacks 3 opponents with $s1 power added to P. Atk. Deals additional magic damage. M. Def. -10%. In PvE knocks the opponents back. Requires a rapier. Ignores Shield Defense. Critical, over-hit. -->
@@ -809,8 +923,19 @@
 		<operateType>A1</operateType>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<castRange>600</castRange>
+		<effectRange>1200</effectRange>
 		<hitTime>1500</hitTime>
 		<reuseDelay>2000</reuseDelay>
+		<magicLvl>
+			<value level="1">40</value>
+			<value level="2">50</value>
+			<value level="3">60</value>
+			<value level="4">70</value>
+			<value level="5">75</value>
+			<value level="6">80</value>
+			<value level="7">85</value>
+			<value level="8">90</value>
+		</magicLvl>
 		<effectPoint>
 			<value level="1">-500</value>
 			<value level="2">-600</value>
@@ -831,6 +956,30 @@
 			<value level="7">48</value>
 			<value level="8">52</value>
 		</mpConsume>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>RAPIER</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">80</value>
+					<value level="2">90</value>
+					<value level="3">105</value>
+					<value level="4">120</value>
+					<value level="5">130</value>
+					<value level="6">140</value>
+					<value level="7">150</value>
+					<value level="8">165</value>
+				</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45164" toLevel="8" name="Ultimate Soul Spark">
 		<!-- <Ultimate skill>\n\nDeals 2 magic strikes to the target with $s1 power. Requires a rapier. -->
@@ -1391,13 +1540,24 @@
 	<skill id="45183" toLevel="1" name="Soul Chase">
 		<!-- Charges to the target, if the distance between the target and the character is more than 100. -->
 		<icon>icon.skill0479</icon>
-		<operateType>A1</operateType>
 		<castRange>300</castRange>
+		<effectRange>600</effectRange>
+		<magicLvl>40</magicLvl>
 		<hitTime>800</hitTime>
 		<coolTime>200</coolTime>
 		<reuseDelay>3000</reuseDelay>
 		<effectPoint>-300</effectPoint>
 		<mpConsume>35</mpConsume>
+		<nextAction>ATTACK</nextAction>
+		<operateType>DA1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpCheckCastRange">
+				<distance>100</distance>
+			</condition>
+		</conditions>
 	</skill>
 	<skill id="45184" toLevel="3" name="Potion Mastery">
 		<!-- HP Recovery Potions' Effect +$s1. -->
@@ -1409,16 +1569,7 @@
 		</magicLvl>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
-		<effects>
-			<effect name="AdditionalPotionHp">
-				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
-					<value level="3">30</value>
-				</amount>
-				<mode>PER</mode>
-			</effect>
-		</effects>
+		<!-- Effects are hardcoded. Leave as is. -->
 	</skill>
 	<skill id="45185" toLevel="1" name="Fatal Slasher">
 		<!-- When attacking, has a chance to deal an additional blow to the target. -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/60000-60099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/60000-60099.xml
index 4e51533ecd..f68e424098 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/60000-60099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/60000-60099.xml
@@ -52,7 +52,6 @@
 			</effect>
 			<effect name="AdditionalPotionHp">
 				<amount>50</amount>
-				<mode>DIFF</mode>
 			</effect>
 			<effect name="StatUp">
 				<amount>1</amount>
@@ -220,7 +219,7 @@
 				<amount>5</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="Evasion">
+			<effect name="PhysicalEvasion">
 				<amount>5</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -284,7 +283,6 @@
 			</effect>
 			<effect name="AdditionalPotionHp">
 				<amount>50</amount>
-				<mode>DIFF</mode>
 			</effect>
 			<effect name="StatUp">
 				<amount>1</amount>
@@ -294,7 +292,7 @@
 				<amount>1</amount>
 				<stat>INT</stat>
 			</effect>
-			<effect name="Evasion">
+			<effect name="PhysicalEvasion">
 				<amount>20</amount>
 				<mode>DIFF</mode>
 			</effect>