From 62d08f068685c344f002d7c4e479b21ecd2caeb1 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 7 Apr 2019 02:37:47 +0000
Subject: [PATCH] Proper servitor id and skill updates. Contributed by
 Liamxroy.

---
 .../dist/game/data/stats/npcs/15200-15299.xml | 1028 ++++++++++++-----
 .../game/data/stats/skills/01100-01199.xml    |    4 +-
 .../game/data/stats/skills/01300-01399.xml    |    4 +-
 .../game/data/stats/skills/11200-11299.xml    |    4 +-
 .../game/data/stats/skills/11300-11399.xml    |  187 ++-
 .../game/data/stats/skills/19400-19499.xml    |    4 +-
 6 files changed, 885 insertions(+), 346 deletions(-)

diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/15200-15299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/15200-15299.xml
index 28c412888f..fe83e0e505 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/15200-15299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/15200-15299.xml
@@ -355,738 +355,1178 @@
 			<height normal="88.8" />
 		</collision>
 	</npc>
-	<npc id="15212" level="85" type="Npc" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15212" level="106" type="Servitor" name="Cursed Man">
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="80" />
-				<run ground="160" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="20" />
-			<height normal="42" />
-		</collision>
-	</npc>
-	<npc id="15213" level="85" type="Npc" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
-			<speed>
-				<walk ground="80" />
-				<run ground="160" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="20" />
-			<height normal="42" />
-		</collision>
-	</npc>
-	<npc id="15214" level="85" type="Npc" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="283" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="1701.482926400498" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
-			<radius normal="11" />
-			<height normal="25" />
+			<radius normal="11" grown="13" />
+			<height normal="25" grown="31" />
 		</collision>
 	</npc>
-	<npc id="15215" level="85" type="Npc" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15213" level="107" type="Servitor" name="Cursed Man">
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="283" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3068.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
-			<radius normal="11" />
-			<height normal="25" />
+			<radius normal="11" grown="13" />
+			<height normal="25" grown="31" />
 		</collision>
 	</npc>
-	<npc id="15216" level="85" type="Npc" name="Discarded Wizard's Soul">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15214" level="106" type="Servitor" name="Reanimated Man">
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="283" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2068.313927855784" magical="1701.482926400498" />
+			<speed>
+				<walk ground="60" />
+				<run ground="140" />
+			</speed>
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+		</skillList>
+		<shots soul="1" spirit="1" />
+		<collision>
+			<radius normal="11" grown="13" />
+			<height normal="25" grown="31" />
+		</collision>
+	</npc>
+	<npc id="15215" level="107" type="Servitor" name="Reanimated Man">
+		<race>HUMAN</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="283" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
+			<speed>
+				<walk ground="60" />
+				<run ground="140" />
+			</speed>
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+		</skillList>
+		<shots soul="1" spirit="1" />
+		<collision>
+			<radius normal="11" grown="13" />
+			<height normal="25" grown="31" />
+		</collision>
+	</npc>
+	<npc id="15216" level="106" type="Servitor" name="Discarded Wizard's Soul">
+		<parameters>
+			<skill name="Skill01_ID" id="19406" level="4" /> <!-- Curse from Deadland -->
+		</parameters>
+		<race>HUMAN</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="29167.0" hpRegen="7.5" mp="2713.0" mpRegen="2.7" />
+			<attack physical="2569.8309" magical="1408.9098" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2425.6881" magical="2497.7594" />
+			<attribute>
+				<defence fire="100" water="100" wind="100" earth="100" holy="100" dark="100" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="45" />
 				<run ground="140" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status undying="false" />
+		<skillList>
+			<skill id="4121" level="7" /> <!-- Summoned Monster Magic Protection -->
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5038" level="15" /> <!-- Summon PVP Penalty -->
+			<skill id="19406" level="4" /> <!-- Curse from Deadland -->
+		</skillList>
+		<exCrtEffect>false</exCrtEffect>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="22.4" />
 			<height normal="30.6" />
 		</collision>
 	</npc>
-	<npc id="15217" level="85" type="Npc" name="Discarded Wizard's Soul">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15217" level="107" type="Servitor" name="Discarded Wizard's Soul">
+		<parameters>
+			<skill name="Skill01_ID" id="19406" level="4" /> <!-- Curse from Deadland -->
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="29167.0" hpRegen="7.5" mp="2713.0" mpRegen="2.7" />
+			<attack physical="3069.8309" magical="1908.9098" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2925.6881" magical="2997.7594" />
+			<attribute>
+				<defence fire="100" water="100" wind="100" earth="100" holy="100" dark="100" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="45" />
 				<run ground="140" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status undying="false" />
+		<skillList>
+			<skill id="4121" level="7" /> <!-- Summoned Monster Magic Protection -->
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5038" level="15" /> <!-- Summon PVP Penalty -->
+			<skill id="19406" level="4" /> <!-- Curse from Deadland -->
+		</skillList>
+		<exCrtEffect>false</exCrtEffect>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="22.4" />
 			<height normal="30.6" />
 		</collision>
 	</npc>
-	<npc id="15218" level="85" type="Npc" name="Death Gate">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15218" level="106" type="EffectPoint" name="Death Gate">
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="28876" hpRegen="9" mp="7065" mpRegen="6.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="9556.33993728534" magical="2872.56705531453" critical="12" attackSpeed="378" range="40" type="FIST" distance="80" width="120" random="10" accuracy="5" />
+			<defence physical="1944" magical="1353" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" hasSummoner="true" undying="false" />
+		<skillList>
+			<skill id="4121" level="9" /> <!-- Summoned Monster Magic Protection -->
+			<skill id="4416" level="23" /> <!-- Mercenaries -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11289" level="3" /> <!-- Gate Root -->
+			<skill id="11291" level="3" /> <!-- Gate Vortex -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="57" />
 			<height normal="67.5" />
 		</collision>
 	</npc>
-	<npc id="15219" level="85" type="Npc" name="Death Gate">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15219" level="107" type="EffectPoint" name="Death Gate">
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="28876" hpRegen="9" mp="7065" mpRegen="6.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="10056.33993728534" magical="3372.56705531453" critical="12" attackSpeed="378" range="40" type="FIST" distance="80" width="120" random="10" accuracy="5" />
+			<defence physical="2444" magical="1853" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" hasSummoner="true" undying="false" />
+		<skillList>
+			<skill id="4121" level="9" /> <!-- Summoned Monster Magic Protection -->
+			<skill id="4416" level="23" /> <!-- Mercenaries -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11289" level="3" /> <!-- Gate Root -->
+			<skill id="11291" level="3" /> <!-- Gate Vortex -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="57" />
 			<height normal="67.5" />
 		</collision>
 	</npc>
-	<npc id="15220" level="85" type="Npc" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15220" level="106" type="Servitor" name="Commando Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11375" level="4" />
+			<skill name="Skill02_ID" id="11376" level="4" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2068.313927855784" magical="1701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
-	<npc id="15221" level="85" type="Npc" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15221" level="107" type="Servitor" name="Commando Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11375" level="5" />
+			<skill name="Skill02_ID" id="11376" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
-	<npc id="15222" level="85" type="Npc" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15222" level="108" type="Servitor" name="Commando Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11375" level="5" />
+			<skill name="Skill02_ID" id="11376" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6585.335632324219" magical="3598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3068.313927855784" magical="2701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
-	<npc id="15223" level="85" type="Npc" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15223" level="109" type="Servitor" name="Commando Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11375" level="6" />
+			<skill name="Skill02_ID" id="11376" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="7085.335632324219" magical="4098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3568.313927855784" magical="3201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
-	<npc id="15224" level="85" type="Npc" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15224" level="110" type="Servitor" name="Commando Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11375" level="6" />
+			<skill name="Skill02_ID" id="11376" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="7585.335632324219" magical="4598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="4068.313927855784" magical="3701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
-	<npc id="15225" level="85" type="Npc" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15225" level="106" type="Servitor" name="Witch Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11377" level="4" />
+			<skill name="Skill02_ID" id="11378" level="4" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2068.313927855784" magical="1701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
-	<npc id="15226" level="85" type="Npc" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15226" level="107" type="Servitor" name="Witch Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11377" level="5" />
+			<skill name="Skill02_ID" id="11378" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
-	<npc id="15227" level="85" type="Npc" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15227" level="108" type="Servitor" name="Witch Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11377" level="5" />
+			<skill name="Skill02_ID" id="11378" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="6585.335632324219" magical="3598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3068.313927855784" magical="2701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
-	<npc id="15228" level="85" type="Npc" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15228" level="109" type="Servitor" name="Witch Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11377" level="6" />
+			<skill name="Skill02_ID" id="11378" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="7085.335632324219" magical="4098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3568.313927855784" magical="3201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
-	<npc id="15229" level="85" type="Npc" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15229" level="110" type="Servitor" name="Witch Cat">
+		<parameters>
+			<skill name="Skill01_ID" id="11377" level="6" />
+			<skill name="Skill02_ID" id="11378" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="7585.335632324219" magical="4598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="4068.313927855784" magical="3701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
-	<npc id="15230" level="85" type="Npc" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15230" level="106" type="Servitor" name="Unicorn Lancer">
+		<parameters>
+			<skill name="Skill01_ID" id="11379" level="4" />
+			<skill name="Skill02_ID" id="11380" level="4" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2068.313927855784" magical="1701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15231" level="85" type="Npc" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15231" level="107" type="Servitor" name="Unicorn Lancer">
+		<parameters>
+			<skill name="Skill01_ID" id="11379" level="4" />
+			<skill name="Skill02_ID" id="11380" level="4" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15232" level="85" type="Npc" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15232" level="108" type="Servitor" name="Unicorn Lancer">
+		<parameters>
+			<skill name="Skill01_ID" id="11379" level="5" />
+			<skill name="Skill02_ID" id="11380" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6585.335632324219" magical="3598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3068.313927855784" magical="2701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15233" level="85" type="Npc" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15233" level="109" type="Servitor" name="Unicorn Lancer">
+		<parameters>
+			<skill name="Skill01_ID" id="11379" level="6" />
+			<skill name="Skill02_ID" id="11380" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="7085.335632324219" magical="4098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3568.313927855784" magical="3201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15234" level="85" type="Npc" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15234" level="110" type="Servitor" name="Unicorn Lancer">
+		<parameters>
+			<skill name="Skill01_ID" id="11379" level="6" />
+			<skill name="Skill02_ID" id="11380" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="7585.335632324219" magical="4598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="4068.313927855784" magical="3701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15235" level="85" type="Npc" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15235" level="106" type="Servitor" name="Unicorn Cherub">
+		<parameters>
+			<skill name="Skill01_ID" id="11381" level="4" />
+			<skill name="Skill02_ID" id="11382" level="4" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37015" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2068.313927855784" magical="1701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15236" level="85" type="Npc" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15236" level="107" type="Servitor" name="Unicorn Cherub">
+		<parameters>
+			<skill name="Skill01_ID" id="11381" level="5" />
+			<skill name="Skill02_ID" id="11382" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37015" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15237" level="85" type="Npc" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15237" level="108" type="Servitor" name="Unicorn Cherub">
+		<parameters>
+			<skill name="Skill01_ID" id="11381" level="5" />
+			<skill name="Skill02_ID" id="11382" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37015" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15238" level="85" type="Npc" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15238" level="109" type="Servitor" name="Unicorn Cherub">
+		<parameters>
+			<skill name="Skill01_ID" id="11381" level="6" />
+			<skill name="Skill02_ID" id="11382" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37015" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="6585.335632324219" magical="3598.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3068.313927855784" magical="2701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15239" level="85" type="Npc" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15239" level="110" type="Servitor" name="Unicorn Cherub">
+		<parameters>
+			<skill name="Skill01_ID" id="11381" level="6" />
+			<skill name="Skill02_ID" id="11382" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37015" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="7085.335632324219" magical="4098.106405639648" critical="4" attackSpeed="283" range="40" distance="80" width="120" />
+			<defence physical="3568.313927855784" magical="3201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15240" level="85" type="Npc" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15240" level="106" type="Servitor" name="Soul Specter">
+		<parameters>
+			<skill name="Skill01_ID" id="11383" level="4" />
+			<skill name="Skill02_ID" id="11384" level="4" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="2068.313927855784" magical="1701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15241" level="85" type="Npc" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15241" level="107" type="Servitor" name="Soul Specter">
+		<parameters>
+			<skill name="Skill01_ID" id="11383" level="5" />
+			<skill name="Skill02_ID" id="11384" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15242" level="85" type="Npc" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15242" level="108" type="Servitor" name="Soul Specter">
+		<parameters>
+			<skill name="Skill01_ID" id="11383" level="5" />
+			<skill name="Skill02_ID" id="11384" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="6585.335632324219" magical="3598.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="3068.313927855784" magical="2701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15243" level="85" type="Npc" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15243" level="109" type="Servitor" name="Soul Specter">
+		<parameters>
+			<skill name="Skill01_ID" id="11383" level="6" />
+			<skill name="Skill02_ID" id="11384" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="7085.335632324219" magical="4098.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="3568.313927855784" magical="3201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15244" level="85" type="Npc" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15244" level="110" type="Servitor" name="Soul Specter">
+		<parameters>
+			<skill name="Skill01_ID" id="11383" level="6" />
+			<skill name="Skill02_ID" id="11384" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="7585.335632324219" magical="4598.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="4068.313927855784" magical="3701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15245" level="85" type="Npc" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15245" level="106" type="Servitor" name="Banshee Queen">
+		<parameters>
+			<skill name="Skill01_ID" id="11385" level="4" />
+			<skill name="Skill02_ID" id="11386" level="4" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37016" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5585.335632324219" magical="2598.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="2068.313927855784" magical="1701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="15246" level="85" type="Npc" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15246" level="107" type="Servitor" name="Banshee Queen">
+		<parameters>
+			<skill name="Skill01_ID" id="11385" level="5" />
+			<skill name="Skill02_ID" id="11386" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37016" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="6085.335632324219" magical="3098.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="2568.313927855784" magical="2201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="15247" level="85" type="Npc" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15247" level="108" type="Servitor" name="Banshee Queen">
+		<parameters>
+			<skill name="Skill01_ID" id="11385" level="5" />
+			<skill name="Skill02_ID" id="11386" level="5" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37016" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="6585.335632324219" magical="3598.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="3068.313927855784" magical="2701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="15248" level="85" type="Npc" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15248" level="109" type="Servitor" name="Banshee Queen">
+		<parameters>
+			<skill name="Skill01_ID" id="11385" level="6" />
+			<skill name="Skill02_ID" id="11386" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37016" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="7085.335632324219" magical="4098.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="3568.313927855784" magical="3201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="15249" level="85" type="Npc" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="15249" level="110" type="Servitor" name="Banshee Queen">
+		<parameters>
+			<skill name="Skill01_ID" id="11385" level="6" />
+			<skill name="Skill02_ID" id="11386" level="6" />
+		</parameters>
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="37016" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="7585.335632324219" magical="4598.106405639648" critical="4" attackSpeed="343" range="40" distance="80" width="120" />
+			<defence physical="4068.313927855784" magical="3701.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
+		<skillList>
+			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
+			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
+		</skillList>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01100-01199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01100-01199.xml
index f0cf164b7d..4139fa7659 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01100-01199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01100-01199.xml
@@ -1448,8 +1448,8 @@
 					<value level="14">15197</value>
 					<value level="15">15198</value>
 					<value level="16">15199</value>
-					<value level="17">15200</value>
-					<value level="18">15201</value>
+					<value level="17">15214</value>
+					<value level="18">15215</value>
 				</npcId>
 				<lifeTime>3600</lifeTime>
 				<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01300-01399.xml
index 7a4093f060..a5c9ea0228 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01300-01399.xml
@@ -1554,8 +1554,8 @@
 					<value level="14">15194</value>
 					<value level="15">15195</value>
 					<value level="16">15196</value>
-					<value level="17">15197</value>
-					<value level="18">15198</value>
+					<value level="17">15212</value>
+					<value level="18">15213</value>
 				</npcId>
 				<lifeTime>3600</lifeTime>
 				<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml
index 0c123eb347..26513b1ea8 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml
@@ -1410,8 +1410,8 @@
 					<value level="2">15200</value>
 					<value level="3">15201</value>
 					<value level="4">15202</value>
-					<value level="5">15203</value>
-					<value level="6">15204</value>
+					<value level="5">15218</value>
+					<value level="6">15219</value>
 				</npcId>
 				<npcCount>1</npcCount>
 				<despawnDelay>30000</despawnDelay>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11300-11399.xml
index c015fecff6..400b39d8af 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11300-11399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11300-11399.xml
@@ -3023,11 +3023,11 @@
 					<value level="4">15158</value>
 					<value level="5">15159</value>
 					<value level="6">15160</value>
-					<value level="7">15161</value>
-					<value level="8">15162</value>
-					<value level="9">15163</value>
-					<value level="10">15164</value>
-					<value level="11">15165</value>
+					<value level="7">15220</value>
+					<value level="8">15221</value>
+					<value level="9">15222</value>
+					<value level="10">15223</value>
+					<value level="11">15224</value>
 				</npcId>
 				<summonPoints>2</summonPoints>
 				<lifeTime>-1</lifeTime>
@@ -3084,11 +3084,11 @@
 					<value level="4">15164</value>
 					<value level="5">15165</value>
 					<value level="6">15166</value>
-					<value level="7">15167</value>
-					<value level="8">15168</value>
-					<value level="9">15169</value>
-					<value level="10">15170</value>
-					<value level="11">15171</value>
+					<value level="7">15225</value>
+					<value level="8">15226</value>
+					<value level="9">15227</value>
+					<value level="10">15228</value>
+					<value level="11">15229</value>
 				</npcId>
 				<summonPoints>2</summonPoints>
 				<lifeTime>-1</lifeTime>
@@ -3145,11 +3145,11 @@
 					<value level="4">15170</value>
 					<value level="5">15171</value>
 					<value level="6">15172</value>
-					<value level="7">15173</value>
-					<value level="8">15174</value>
-					<value level="9">15175</value>
-					<value level="10">15176</value>
-					<value level="11">15177</value>
+					<value level="7">15230</value>
+					<value level="8">15231</value>
+					<value level="9">15232</value>
+					<value level="10">15233</value>
+					<value level="11">15234</value>
 				</npcId>
 				<summonPoints>2</summonPoints>
 				<lifeTime>-1</lifeTime>
@@ -3206,11 +3206,11 @@
 					<value level="4">15176</value>
 					<value level="5">15177</value>
 					<value level="6">15178</value>
-					<value level="7">15179</value>
-					<value level="8">15180</value>
-					<value level="9">15181</value>
-					<value level="10">15182</value>
-					<value level="11">15183</value>
+					<value level="7">15235</value>
+					<value level="8">15236</value>
+					<value level="9">15237</value>
+					<value level="10">15238</value>
+					<value level="11">15239</value>
 				</npcId>
 				<summonPoints>2</summonPoints>
 				<lifeTime>-1</lifeTime>
@@ -3267,11 +3267,11 @@
 					<value level="4">15182</value>
 					<value level="5">15183</value>
 					<value level="6">15184</value>
-					<value level="7">15185</value>
-					<value level="8">15186</value>
-					<value level="9">15187</value>
-					<value level="10">15188</value>
-					<value level="11">15189</value>
+					<value level="7">15240</value>
+					<value level="8">15241</value>
+					<value level="9">15242</value>
+					<value level="10">15243</value>
+					<value level="11">15244</value>
 				</npcId>
 				<summonPoints>2</summonPoints>
 				<lifeTime>-1</lifeTime>
@@ -3328,24 +3328,27 @@
 					<value level="4">15188</value>
 					<value level="5">15189</value>
 					<value level="6">15190</value>
-					<value level="7">15191</value>
-					<value level="8">15192</value>
-					<value level="9">15193</value>
-					<value level="10">15194</value>
-					<value level="11">15195</value>
+					<value level="7">15245</value>
+					<value level="8">15246</value>
+					<value level="9">15247</value>
+					<value level="10">15248</value>
+					<value level="11">15249</value>
 				</npcId>
 				<summonPoints>2</summonPoints>
 				<lifeTime>-1</lifeTime>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11375" toLevel="3" name="Commando Jumping Attack">
+	<skill id="11375" toLevel="6" name="Commando Jumping Attack">
 		<!-- Jumps and hulrs attack to target and nearby enemies with $s1 Power added to P. Atk., and decreases Speed by $s3 for $s2. -->
 		<icon>icon.skill0121</icon>
 		<abnormalLvl>
 			<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>
 		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
@@ -3359,6 +3362,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">87</value> <!-- Guessed -->
+			<value level="5">88</value> <!-- Guessed -->
+			<value level="6">88</value> <!-- Guessed -->
 		</mpConsume>
 		<nextAction>ATTACK</nextAction>
 		<castRange>600</castRange>
@@ -3380,6 +3386,9 @@
 					<value level="1">18224</value>
 					<value level="2">19158</value>
 					<value level="3">20092</value>
+					<value level="4">21026</value> <!-- Guessed -->
+					<value level="5">21960</value> <!-- Guessed -->
+					<value level="6">22903</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="Speed">
@@ -3388,7 +3397,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11376" toLevel="3" name="Commando Double Smash">
+	<skill id="11376" toLevel="6" name="Commando Double Smash">
 		<!-- Inflicts damage with $s1 Power added to P. Atk. and knocks down for $s2 -->
 		<icon>icon.skill10546</icon>
 		<abnormalLvl>1</abnormalLvl>
@@ -3404,6 +3413,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">88</value> <!-- Guessed -->
+			<value level="5">89</value> <!-- Guessed -->
+			<value level="6">90</value> <!-- Guessed -->
 		</mpConsume>
 		<castRange>40</castRange>
 		<hitTime>1500</hitTime>
@@ -3417,6 +3429,9 @@
 					<value level="1">32410</value>
 					<value level="2">34072</value>
 					<value level="3">35734</value>
+					<value level="4">37396</value> <!-- Guessed -->
+					<value level="5">39058</value> <!-- Guessed -->
+					<value level="6">40720</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="KnockBack">
@@ -3427,7 +3442,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11377" toLevel="3" name="Witch Cat Power">
+	<skill id="11377" toLevel="6" name="Witch Cat Power">
 		<!-- Inflicts damage to nearby enemies with $s1 Power added to P. Atk. -->
 		<icon>icon.skill1171</icon>
 		<affectRange>150</affectRange> <!-- Guessed -->
@@ -3439,6 +3454,9 @@
 			<value level="1">172</value>
 			<value level="2">173</value>
 			<value level="3">174</value>
+			<value level="4">175</value> <!-- Guessed -->
+			<value level="5">176</value> <!-- Guessed -->
+			<value level="6">177</value> <!-- Guessed -->
 		</mpConsume>
 		<castRange>1100</castRange>
 		<hitTime>2000</hitTime>
@@ -3447,6 +3465,9 @@
 			<value level="1">-3541</value>
 			<value level="2">-3561</value>
 			<value level="3">-3561</value>
+			<value level="4">-3561</value> <!-- Guessed -->
+			<value level="5">-3561</value> <!-- Guessed -->
+			<value level="6">-3561</value> <!-- Guessed -->
 		</effectPoint>
 		<reuseDelay>5000</reuseDelay>
 		<effects>
@@ -3455,11 +3476,14 @@
 					<value level="1">31903</value>
 					<value level="2">33539</value>
 					<value level="3">35175</value>
+					<value level="4">36811</value> <!-- Guessed -->
+					<value level="5">38447</value> <!-- Guessed -->
+					<value level="6">40083</value> <!-- Guessed -->
 				</power>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11378" toLevel="3" name="Elemental Slam">
+	<skill id="11378" toLevel="6" name="Elemental Slam">
 		<!-- Inflicts damage to nearby enemies with $s1 Power added to P. Atk. and pushes them back. -->
 		<icon>icon.skill1171</icon>
 		<abnormalLvl>1</abnormalLvl>
@@ -3478,6 +3502,9 @@
 			<value level="1">172</value>
 			<value level="2">173</value>
 			<value level="3">174</value>
+			<value level="4">175</value> <!-- Guessed -->
+			<value level="5">176</value> <!-- Guessed -->
+			<value level="6">177</value> <!-- Guessed -->
 		</mpConsume>
 		<castRange>1100</castRange>
 		<hitTime>2500</hitTime>
@@ -3487,6 +3514,9 @@
 			<value level="1">-3541</value>
 			<value level="2">-3561</value>
 			<value level="3">-3561</value>
+			<value level="4">-3561</value> <!-- Guessed -->
+			<value level="5">-3561</value> <!-- Guessed -->
+			<value level="6">-3561</value> <!-- Guessed -->
 		</effectPoint>
 		<isDebuff>true</isDebuff>
 		<effects>
@@ -3495,6 +3525,9 @@
 					<value level="1">30623</value>
 					<value level="2">32193</value>
 					<value level="3">33763</value>
+					<value level="4">35333</value> <!-- Guessed -->
+					<value level="5">36903</value> <!-- Guessed -->
+					<value level="6">38473</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="KnockBack">
@@ -3504,13 +3537,16 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11379" toLevel="3" name="Lancer Rush">
+	<skill id="11379" toLevel="6" name="Lancer Rush">
 		<!-- Charges forward to inflict damage on the target with $s1 power added to P. Attack and inflicts Stun for $s2. -->
 		<icon>icon.skill0121</icon>
 		<abnormalLvl>
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">3</value>
+			<value level="5">3</value>
+			<value level="6">3</value>
 		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>STUN</abnormalType>
@@ -3529,6 +3565,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">87</value> <!-- Guessed -->
+			<value level="5">88</value> <!-- Guessed -->
+			<value level="6">88</value> <!-- Guessed -->
 		</mpConsume>
 		<nextAction>ATTACK</nextAction>
 		<castRange>600</castRange>
@@ -3539,6 +3578,9 @@
 			<value level="1">-3541</value>
 			<value level="2">-3561</value>
 			<value level="3">-3561</value>
+			<value level="3">-3561</value> <!-- Guessed -->
+			<value level="3">-3561</value> <!-- Guessed -->
+			<value level="3">-3561</value> <!-- Guessed -->
 		</effectPoint>
 		<isDebuff>true</isDebuff>
 		<conditions>
@@ -3552,12 +3594,15 @@
 					<value level="1">16198</value>
 					<value level="2">17028</value>
 					<value level="3">17858</value>
+					<value level="4">18688</value> <!-- Guessed -->
+					<value level="5">19518</value> <!-- Guessed -->
+					<value level="6">20348</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
 	</skill>
-	<skill id="11380" toLevel="3" name="Power Stump">
+	<skill id="11380" toLevel="6" name="Power Stump">
 		<!-- Inflicts damage to nearby enemies with $s1 Power added to P. Atk. and blows them away. -->
 		<icon>icon.skill30006</icon>
 		<abnormalLvl>1</abnormalLvl>
@@ -3576,6 +3621,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">87</value> <!-- Guessed -->
+			<value level="5">88</value> <!-- Guessed -->
+			<value level="6">88</value> <!-- Guessed -->
 		</mpConsume>
 		<hitTime>1500</hitTime>
 		<coolTime>500</coolTime>
@@ -3583,6 +3631,9 @@
 			<value level="1">-3541</value>
 			<value level="2">-3561</value>
 			<value level="3">-3561</value>
+			<value level="3">-3561</value> <!-- Guessed -->
+			<value level="3">-3561</value> <!-- Guessed -->
+			<value level="3">-3561</value> <!-- Guessed -->
 		</effectPoint>
 		<reuseDelay>7000</reuseDelay>
 		<isDebuff>true</isDebuff>
@@ -3592,6 +3643,9 @@
 					<value level="1">22677</value>
 					<value level="2">23839</value>
 					<value level="3">25001</value>
+					<value level="4">26163</value> <!-- Guessed -->
+					<value level="5">27325</value> <!-- Guessed -->
+					<value level="6">28487</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="KnockBack">
@@ -3601,7 +3655,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11381" toLevel="3" name="Cherub Power">
+	<skill id="11381" toLevel="6" name="Cherub Power">
 		<!-- Inflicts damage to nearby enemies with $s1 Power added to P. Atk. -->
 		<icon>icon.skill1171</icon>
 		<affectRange>150</affectRange> <!-- Guessed -->
@@ -3613,6 +3667,9 @@
 			<value level="1">172</value>
 			<value level="2">173</value>
 			<value level="3">174</value>
+			<value level="4">174</value> <!-- Guessed -->
+			<value level="5">175</value> <!-- Guessed -->
+			<value level="6">175</value> <!-- Guessed -->
 		</mpConsume>
 		<castRange>1100</castRange>
 		<hitTime>2000</hitTime>
@@ -3621,6 +3678,9 @@
 			<value level="1">-3541</value>
 			<value level="2">-3561</value>
 			<value level="3">-3561</value>
+			<value level="4">-3561</value> <!-- Guessed -->
+			<value level="5">-3561</value> <!-- Guessed -->
+			<value level="6">-3561</value> <!-- Guessed -->
 		</effectPoint>
 		<reuseDelay>5000</reuseDelay>
 		<effects>
@@ -3629,17 +3689,23 @@
 					<value level="1">31903</value>
 					<value level="2">33539</value>
 					<value level="3">35175</value>
+					<value level="4">36811</value> <!-- Guessed -->
+					<value level="5">38447</value> <!-- Guessed -->
+					<value level="6">40083</value> <!-- Guessed -->
 				</power>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11382" toLevel="3" name="Multiple Icicles">
+	<skill id="11382" toLevel="6" name="Multiple Icicles">
 		<!-- Inflicts damage to target and nearby enemies with $s1 Power added to P. Atk., and decreases Speed by $s3 for $s2. -->
 		<icon>icon.skill10103</icon>
 		<abnormalLvl>
 			<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>
 		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
@@ -3654,6 +3720,9 @@
 			<value level="1">172</value>
 			<value level="2">173</value>
 			<value level="3">174</value>
+			<value level="4">174</value> <!-- Guessed -->
+			<value level="5">175</value> <!-- Guessed -->
+			<value level="6">175</value> <!-- Guessed -->
 		</mpConsume>
 		<castRange>400</castRange>
 		<hitTime>2500</hitTime>
@@ -3663,6 +3732,9 @@
 			<value level="1">-3541</value>
 			<value level="2">-3561</value>
 			<value level="3">-3561</value>
+			<value level="5">-3561</value> <!-- Guessed -->
+			<value level="5">-3561</value> <!-- Guessed -->
+			<value level="6">-3561</value> <!-- Guessed -->
 		</effectPoint>
 		<isDebuff>true</isDebuff>
 		<effects>
@@ -3671,6 +3743,9 @@
 					<value level="1">34449</value>
 					<value level="2">36215</value>
 					<value level="3">37981</value>
+					<value level="4">39747</value> <!-- Guessed -->
+					<value level="5">41513</value> <!-- Guessed -->
+					<value level="6">43279</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="Speed">
@@ -3679,7 +3754,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11383" toLevel="3" name="Phantom Sword Attack">
+	<skill id="11383" toLevel="6" name="Phantom Sword Attack">
 		<!-- Inflicts damage with $s1 Power added to P. Atk. -->
 		<icon>icon.skill0121</icon>
 		<operateType>A1</operateType>
@@ -3689,6 +3764,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">87</value>
+			<value level="5">88</value>
+			<value level="6">88</value>
 		</mpConsume>
 		<nextAction>ATTACK</nextAction>
 		<castRange>50</castRange>
@@ -3702,11 +3780,14 @@
 					<value level="1">40502</value>
 					<value level="2">42578</value>
 					<value level="3">44654</value>
+					<value level="4">46730</value> <!-- Guessed -->
+					<value level="5">48806</value> <!-- Guessed -->
+					<value level="6">50882</value> <!-- Guessed -->
 				</power>
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11384" toLevel="3" name="Phantom Blow">
+	<skill id="11384" toLevel="6" name="Phantom Blow">
 		<!-- Attacks the target's vital points with $s1 Power added to P. Atk. -->
 		<icon>icon.skill10511</icon>
 		<operateType>A1</operateType>
@@ -3717,6 +3798,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">87</value>
+			<value level="5">88</value>
+			<value level="6">88</value>
 		</mpConsume>
 		<nextAction>ATTACK</nextAction>
 		<castRange>50</castRange>
@@ -3732,6 +3816,9 @@
 					<value level="1">45696</value>
 					<value level="2">47772</value>
 					<value level="3">49848</value>
+					<value level="4">51924</value> <!-- Guessed -->
+					<value level="5">54000</value> <!-- Guessed -->
+					<value level="6">56076</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="Lethal">
@@ -3740,7 +3827,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11385" toLevel="3" name="Phantom Spike">
+	<skill id="11385" toLevel="6" name="Phantom Spike">
 		<!-- Attacks the target's vital points with $s1 Power added to P. Atk. -->
 		<icon>icon.skill1171</icon>
 		<operateType>A1</operateType>
@@ -3751,6 +3838,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">87</value>
+			<value level="5">88</value>
+			<value level="6">88</value>
 		</mpConsume>
 		<castRange>1100</castRange>
 		<hitTime>2000</hitTime>
@@ -3765,6 +3855,9 @@
 					<value level="1">51411</value>
 					<value level="2">53747</value>
 					<value level="3">56083</value>
+					<value level="4">58419</value> <!-- Guessed -->
+					<value level="5">60755</value> <!-- Guessed -->
+					<value level="6">63091</value> <!-- Guessed -->
 				</power>
 			</effect>
 			<effect name="Lethal">
@@ -3773,7 +3866,7 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="11386" toLevel="3" name="Phantom Crash">
+	<skill id="11386" toLevel="6" name="Phantom Crash">
 		<!-- Inflicts damage with $s1 Power added to P. Atk. -->
 		<icon>icon.skill1171</icon>
 		<operateType>A1</operateType>
@@ -3783,6 +3876,9 @@
 			<value level="1">86</value>
 			<value level="2">86</value>
 			<value level="3">87</value>
+			<value level="4">87</value>
+			<value level="5">88</value>
+			<value level="6">88</value>
 		</mpConsume>
 		<castRange>1100</castRange>
 		<hitTime>2000</hitTime>
@@ -3795,6 +3891,9 @@
 					<value level="1">45568</value>
 					<value level="2">47904</value>
 					<value level="3">50240</value>
+					<value level="4">52576</value> <!-- Guessed -->
+					<value level="5">54912</value> <!-- Guessed -->
+					<value level="6">57248</value> <!-- Guessed -->
 				</power>
 			</effect>
 		</effects>
@@ -3842,7 +3941,7 @@
 			</effect>
 		</selfEffects>
 	</skill>
-	<skill id="11388" toLevel="1" name="Lord of Arcana">
+	<skill id="11388" toLevel="2" name="Lord of Arcana">
 		<!-- For $s1, P. Atk./ P. Def./ M. Atk./ M. Def. +$s2. -->
 		<icon>icon.skill11387</icon>
 		<abnormalLvl>1</abnormalLvl>
@@ -3927,7 +4026,7 @@
 			</effect>
 		</selfEffects>
 	</skill>
-	<skill id="11390" toLevel="1" name="Lord of Elemental">
+	<skill id="11390" toLevel="2" name="Lord of Elemental">
 		<!-- For $s1, P. Atk./ P. Def./ M. Atk./ M. Def. +$s2. -->
 		<icon>icon.skill11388</icon>
 		<abnormalLvl>1</abnormalLvl>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
index dc0aa80aec..efa46d87bb 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19400-19499.xml
@@ -155,8 +155,8 @@
 					<value level="2">15208</value>
 					<value level="3">15209</value>
 					<value level="4">15210</value>
-					<value level="5">15211</value>
-					<value level="6">15212</value>
+					<value level="5">15216</value>
+					<value level="6">15217</value>
 				</npcId>
 				<lifeTime>3600</lifeTime>
 			</effect>