From 9988d9fa86ed4f3caff3c250fc0a1c2471601530 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 20 Jun 2022 14:32:19 +0000
Subject: [PATCH] Addition of missing monster templates.

---
 .../dist/game/data/stats/npcs/08600-08699.xml |   90 +-
 .../dist/game/data/stats/npcs/08700-08799.xml |   45 +-
 .../dist/game/data/stats/npcs/25900-25999.xml |   38 +-
 .../dist/game/data/stats/npcs/26100-26199.xml |  180 +--
 .../dist/game/data/stats/npcs/26200-26299.xml |   99 +-
 .../dist/game/data/stats/npcs/26300-26399.xml |  388 ++----
 .../dist/game/data/stats/npcs/26400-26499.xml |  111 +-
 .../dist/game/data/stats/npcs/29200-29299.xml |   29 +-
 .../dist/game/data/stats/npcs/29300-29399.xml |  190 +--
 .../dist/game/data/stats/npcs/08600-08699.xml |   90 +-
 .../dist/game/data/stats/npcs/08700-08799.xml |   45 +-
 .../dist/game/data/stats/npcs/13600-13699.xml |   45 +-
 .../dist/game/data/stats/npcs/19700-19799.xml |  105 +-
 .../dist/game/data/stats/npcs/19800-19899.xml |  159 +--
 .../dist/game/data/stats/npcs/24600-24699.xml |  122 +-
 .../dist/game/data/stats/npcs/24800-24899.xml |  392 ++++--
 .../dist/game/data/stats/npcs/25900-25999.xml |   38 +-
 .../dist/game/data/stats/npcs/26100-26199.xml |  180 +--
 .../dist/game/data/stats/npcs/26200-26299.xml |   99 +-
 .../dist/game/data/stats/npcs/26300-26399.xml |  388 ++----
 .../dist/game/data/stats/npcs/26400-26499.xml |  111 +-
 .../dist/game/data/stats/npcs/29200-29299.xml |   29 +-
 .../dist/game/data/stats/npcs/29300-29399.xml |  218 +---
 .../game/data/stats/skills/33000-33099.xml    |    2 +-
 .../game/data/stats/skills/33100-33199.xml    |    2 +-
 .../dist/game/data/stats/npcs/08600-08699.xml |   90 +-
 .../dist/game/data/stats/npcs/08700-08799.xml |   45 +-
 .../dist/game/data/stats/npcs/13600-13699.xml |   45 +-
 .../dist/game/data/stats/npcs/19700-19799.xml |  105 +-
 .../dist/game/data/stats/npcs/19800-19899.xml |  159 +--
 .../dist/game/data/stats/npcs/24600-24699.xml |  122 +-
 .../dist/game/data/stats/npcs/24800-24899.xml |  809 +++++++++---
 .../dist/game/data/stats/npcs/25900-25999.xml |   38 +-
 .../dist/game/data/stats/npcs/26100-26199.xml |  180 +--
 .../dist/game/data/stats/npcs/26200-26299.xml |   99 +-
 .../dist/game/data/stats/npcs/26300-26399.xml |  388 ++----
 .../dist/game/data/stats/npcs/26400-26499.xml |  196 ++-
 .../dist/game/data/stats/npcs/29200-29299.xml |   29 +-
 .../dist/game/data/stats/npcs/29300-29399.xml |  301 ++---
 .../game/data/stats/skills/33000-33099.xml    |    2 +-
 .../game/data/stats/skills/33100-33199.xml    |    2 +-
 .../dist/game/data/stats/npcs/08600-08699.xml |   90 +-
 .../dist/game/data/stats/npcs/08700-08799.xml |   45 +-
 .../dist/game/data/stats/npcs/13600-13699.xml |   45 +-
 .../dist/game/data/stats/npcs/19700-19799.xml |  105 +-
 .../dist/game/data/stats/npcs/19800-19899.xml |  159 +--
 .../dist/game/data/stats/npcs/24800-24899.xml | 1088 ++++++++++++-----
 .../dist/game/data/stats/npcs/25900-25999.xml |   38 +-
 .../dist/game/data/stats/npcs/26100-26199.xml |  180 +--
 .../dist/game/data/stats/npcs/26200-26299.xml |   99 +-
 .../dist/game/data/stats/npcs/26300-26399.xml |  388 ++----
 .../dist/game/data/stats/npcs/26400-26499.xml |  196 ++-
 .../dist/game/data/stats/npcs/29200-29299.xml |   29 +-
 .../dist/game/data/stats/npcs/29300-29399.xml |  365 +++---
 .../game/data/stats/skills/33000-33099.xml    |    2 +-
 .../game/data/stats/skills/34000-34099.xml    |    2 +-
 56 files changed, 4015 insertions(+), 4621 deletions(-)

diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08600-08699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08600-08699.xml
index 4ba9a98abe..d6bca7bf5f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08600-08699.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08600-08699.xml
@@ -1910,20 +1910,21 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="8678" level="85" type="Folk" name="Bonfire" title="Made with matchsticks">
+	<npc id="8678" level="1" type="Monster" name="Bonfire" title="Made with matchsticks">
 		<!-- 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="4039" hpRegen="10.5" mp="1812" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="4039.11672" hpRegen="2" mp="1812" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="29" />
 			<height normal="30.5" />
@@ -2233,96 +2234,101 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="8695" level="85" type="Folk" name="Little Pumpkin">
+	<npc id="8695" level="1" type="Monster" name="Little Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="8696" level="85" type="Folk" name="Big Pumpkin">
+	<npc id="8696" level="1" type="Monster" name="Ripe Squash">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8697" level="85" type="Folk" name="Defective Pumpkin">
+	<npc id="8697" level="1" type="Monster" name="Defective Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="8698" level="85" type="Folk" name="Little Honey Pumpkin">
+	<npc id="8698" level="1" type="Monster" name="Little Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="23" />
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="8699" level="85" type="Folk" name="Big Honey Pumpkin">
+	<npc id="8699" level="1" type="Monster" name="Big Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="38.5" />
 			<height normal="33.4" />
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08700-08799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08700-08799.xml
index acb1861bc6..3eaf1e1460 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08700-08799.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/08700-08799.xml
@@ -1,57 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="8700" level="85" type="Folk" name="Defective Honey Pumpkin">
+	<npc id="8700" level="1" type="Monster" name="Defective Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="8701" level="85" type="Folk" name="Super Big Pumpkin">
+	<npc id="8701" level="1" type="Monster" name="Super Big Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8702" level="85" type="Folk" name="Super Big Honey Pumpkin">
+	<npc id="8702" level="1" type="Monster" name="Super Big Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.2" />
 			<height normal="40.68" />
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/25900-25999.xml
index 903d57cc3a..2a2b7d8201 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/25900-25999.xml
@@ -1,44 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="25900" level="104" type="Folk" name="Skill Lind">
+	<npc id="25900" level="104" type="Monster" name="Skill Lind">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>DRAGON</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446.44475689713" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="1949.95411856464" magical="1331.56588332443" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+			<vitals hp="8446.24277" hpRegen="11.4" mp="2355" mpRegen="30" />
+			<attack physical="222054" magical="20716" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="9474" magical="3836" />
 			<speed>
 				<walk ground="100" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="450" holy="500" dark="500" />
-				<attack type="WIND" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" noSleepMode="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5464" level="1" /> <!-- Wind Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="400" />
 			<height normal="210" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Misc. -->
+			<skill id="5464" level="1" /> <!-- Wind Attack -->
+		</skillList>
 	</npc>
 	<npc id="25901" level="96" type="RaidBoss" name="Spicula Zero" title="Raid Boss">
 		<race>HUMANOID</race>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26100-26199.xml
index 6280211e69..1bb045d269 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26100-26199.xml
@@ -3736,84 +3736,54 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26153" level="96" type="Folk" name="Enhance Death Knight">
+	<npc id="26153" level="96" type="Monster" name="Enhance Death Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="75" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="75" /> <!-- Caliburs -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
 			</speed>
-			<hitTime>710</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="12.0" grown="14.5" />
-			<height normal="31.0" grown="36" />
+			<radius normal="12" grown="14.5" />
+			<height normal="31" grown="36" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26154" level="96" type="Folk" name="Enhance Doom Wraith">
+	<npc id="26154" level="96" type="Monster" name="Enhance Doom Wraith">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="1472" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="1472" /> <!-- Dreadbane -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="100" />
 				<run ground="230" />
 			</speed>
-			<hitTime>450</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="15.0" grown="25" />
-			<height normal="45.0" grown="52" />
+			<radius normal="15" grown="25" />
+			<height normal="45" grown="52" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26155" level="96" type="Monster" name="Enhanced Validus">
@@ -4025,157 +3995,101 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26158" level="91" type="Folk" name="Enhanced Demonic Bathus">
+	<npc id="26158" level="91" type="Monster" name="Enhanced Demonic Bathus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26159" level="91" type="Folk" name="Enhanced Demonic Carcass">
+	<npc id="26159" level="91" type="Monster" name="Enhanced Demonic Carcass">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="15304" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="31302.9915094253" magical="8891.76157255424" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="271.97" magical="154.62" />
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="25.0" grown="32" />
-			<height normal="36.0" grown="55" />
+			<radius normal="25" grown="32" />
+			<height normal="36" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26160" level="91" type="Folk" name="Enhanced Demonic Lotus">
+	<npc id="26160" level="91" type="Monster" name="Enhanced Demonic Lotus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26161" level="91" type="Folk" name="Enhanced Demonic Rakzan">
+	<npc id="26161" level="91" type="Monster" name="Enhanced Demonic Rakzan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="42.0" grown="48" />
-			<height normal="79.0" grown="93" />
+			<radius normal="42" grown="48" />
+			<height normal="79" grown="93" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26194" level="101" type="RaidBoss" name="Dimensional Makkum">
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26200-26299.xml
index 44b2680615..8ceec8d4e7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26200-26299.xml
@@ -5452,24 +5452,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26281" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Soldier Recruit" title="Raid Fighter">
+	<npc id="26281" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Soldier Recruit" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5478,37 +5473,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26282" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Scout" title="Raid Fighter">
+	<npc id="26282" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Scout" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="559001" magical="340486" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="220" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5517,37 +5497,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26283" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Wizard" title="Raid Fighter">
+	<npc id="26283" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Wizard" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5556,37 +5521,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26284" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Healer" title="Raid Fighter">
+	<npc id="26284" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Healer" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5595,19 +5545,10 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-			<skill id="5598" level="12" /> <!-- Petrifaction Attack Resistance -->
+			<skill id="5598" level="1" /> <!-- Petrifaction Attack Resistance -->
 			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
 		</skillList>
 	</npc>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26300-26399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26300-26399.xml
index c2f88efe6a..8f79a4af9b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26300-26399.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26300-26399.xml
@@ -408,48 +408,25 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26313" level="106" type="Folk" name="Lithra Bud" title="Raid Fighter">
+	<npc id="26313" level="106" type="Monster" name="Lithra Bud" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>PLANT</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3831006" hpRegen="11.4" mp="26228" mpRegen="30" />
-			<attack physical="914348" magical="103326" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="8532" magical="6418" />
+			<vitals hp="3831009.82659" hpRegen="11.4" mp="26228" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" canMove="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="60" />
 			<height normal="123" />
 		</collision>
-		<skillList>
-			<skill id="4416" level="5" /> <!-- Plants -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-		</skillList>
 	</npc>
 	<npc id="26314" level="106" type="Monster" name="Lithra Aprias" title="Raid Fighter">
 		<race>PLANT</race>
@@ -689,24 +666,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26318" level="106" type="Folk" name="Spezion's Despair" title="Raid Fighter">
+	<npc id="26318" level="106" type="Monster" name="Spezion's Despair" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -715,38 +687,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26319" level="106" type="Folk" name="Spezion's Lunacy" title="Raid Fighter">
+	<npc id="26319" level="106" type="Monster" name="Spezion's Lunacy" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -755,38 +711,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26320" level="106" type="Folk" name="Spezion's Rage" title="Raid Fighter">
+	<npc id="26320" level="106" type="Monster" name="Spezion's Rage" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -795,18 +735,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="26321" level="108" type="RaidBoss" name="Etis van Etina" title="Overlord">
@@ -2484,64 +2413,45 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26353" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26353" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="23" />
-			<height normal="40" />
+			<radius normal="23" grown="32" />
+			<height normal="40" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26354" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26354" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2550,16 +2460,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -3026,24 +2927,20 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26363" level="108" type="Folk" name="Curain" title="Screaming Ghost">
+	<npc id="26363" level="108" type="Monster" name="Curain" title="Screaming Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1562147" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="1562150.28902" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3052,41 +2949,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26364" level="108" type="Folk" name="Flan" title="Suffering Ghost">
+	<npc id="26364" level="108" type="Monster" name="Flan" title="Suffering Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3095,41 +2978,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26365" level="108" type="Folk" name="Aschedor" title="Howling Ghost">
+	<npc id="26365" level="108" type="Monster" name="Aschedor" title="Howling Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3138,41 +3007,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26366" level="108" type="Folk" name="Panahon" title="Wailing Ghost">
+	<npc id="26366" level="108" type="Monster" name="Panahon" title="Wailing Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="4573664352" sp="4105728" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="6248590" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="6248590.17341" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3181,42 +3036,28 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26367" level="108" type="Folk" name="Yehan Klodekus' Ghost">
+	<npc id="26367" level="108" type="Monster" name="Yehan Klodekus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3225,38 +3066,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26368" level="108" type="Folk" name="Yehan Klanikus' Ghost">
+	<npc id="26368" level="108" type="Monster" name="Yehan Klanikus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3265,38 +3092,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26369" level="108" type="Folk" name="Yehan Klodekus">
+	<npc id="26369" level="108" type="Monster" name="Yehan Klodekus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3305,38 +3118,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26370" level="108" type="Folk" name="Yehan Klanikus">
+	<npc id="26370" level="108" type="Monster" name="Yehan Klanikus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3345,56 +3144,31 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26371" level="108" type="Folk" name="Zahak" title="Tauti Underling">
+	<npc id="26371" level="108" type="Monster" name="Zahak" title="Tauti Underling">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="30" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26388" level="107" type="RaidBoss" name="Death Reaper" title="Raid Soul Reaver">
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26400-26499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26400-26499.xml
index 422751c8ab..0e8b2f71b2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26400-26499.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/26400-26499.xml
@@ -2071,24 +2071,19 @@
 			<height normal="87" />
 		</collision>
 	</npc>
-	<npc id="26447" level="115" type="Folk" name="Handy Cannon Gunner">
+	<npc id="26447" level="116" type="Monster" name="Handy Cannon Gunner">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="191358" magical="9966" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="600" distance="10" width="0" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25848" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="80" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2099,36 +2094,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26448" level="115" type="Folk" name="Anchor Warrior">
+	<npc id="26448" level="116" type="Monster" name="Anchor Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2139,36 +2121,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26449" level="115" type="Folk" name="Operator">
+	<npc id="26449" level="116" type="Monster" name="Operator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="150" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2179,36 +2148,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26450" level="115" type="Folk" name="Axe Warrior">
+	<npc id="26450" level="116" type="Monster" name="Axe Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2219,14 +2175,6 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -2353,42 +2301,29 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="26454" level="125" type="Folk" name="Zahak">
+	<npc id="26454" level="125" type="Monster" name="Zahak">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="48424000" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="109348" magical="1457528" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="80806" magical="39846" />
+			<vitals hp="48424" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2350" holy="2300" dark="2350" />
-				<attack type="DARK" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29200-29299.xml
index ff5f5530c4..3eb9fbee15 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29200-29299.xml
@@ -1977,36 +1977,21 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29232" level="99" type="Folk" name="Reward" title="Earth Wyrm">
+	<npc id="29232" level="99" type="Monster" name="Reward" title="Earth Wyrm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>CONSTRUCT</race>
+		<race>ETC</race>
 		<sex>MALE</sex>
-		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="13007.8303806237" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="3899.90823712927" magical="1917.45487198718" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="14197.47634" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="13491.48739" magical="2372.82433" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1051.40069" magical="609.53854" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
 			<hitTime>600</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="2" /> <!-- Magical Creatures -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="0.1" />
 			<height normal="0.1" />
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29300-29399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29300-29399.xml
index 0e7acae3be..23fdaadc89 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29300-29399.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/29300-29399.xml
@@ -1798,26 +1798,21 @@
 			<height normal="101" />
 		</collision>
 	</npc>
-	<npc id="29328" level="125" type="Folk" name="Torfedo">
+	<npc id="29328" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="13996" magical="10526" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1826,40 +1821,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29329" level="125" type="Folk" name="Harane">
+	<npc id="29329" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="19994" magical="8096" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1868,40 +1850,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29330" level="125" type="Folk" name="Escrito" title="Fragment of the Sea of Spores">
+	<npc id="29330" level="125" type="Monster" name="Escrito" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1910,41 +1879,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29331" level="125" type="Folk" name="Aranea" title="Fragment of the Sea of Spores">
+	<npc id="29331" level="125" type="Monster" name="Aranea" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1953,41 +1908,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29332" level="125" type="Folk" name="Torfedo">
+	<npc id="29332" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -1996,41 +1937,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29333" level="125" type="Folk" name="Harane">
+	<npc id="29333" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2039,41 +1966,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29334" level="125" type="Folk" name="Escrito">
+	<npc id="29334" level="125" type="Monster" name="Escrito">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -2082,41 +1995,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapons -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29335" level="125" type="Folk" name="Aranea">
+	<npc id="29335" level="125" type="Monster" name="Aranea">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2125,19 +2024,10 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="29336" level="125" type="GrandBoss" name="Lilith" title="Apostle">
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08600-08699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08600-08699.xml
index 4ba9a98abe..3f739e525b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08600-08699.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08600-08699.xml
@@ -1910,20 +1910,21 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="8678" level="85" type="Folk" name="Bonfire" title="Made with matchsticks">
+	<npc id="8678" level="1" type="Monster" name="Bonfire" title="Made with Matchsticks">
 		<!-- 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="4039" hpRegen="10.5" mp="1812" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="4039.11672" hpRegen="2" mp="1812" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="29" />
 			<height normal="30.5" />
@@ -2233,96 +2234,101 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="8695" level="85" type="Folk" name="Little Pumpkin">
+	<npc id="8695" level="1" type="Monster" name="Little Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="8696" level="85" type="Folk" name="Big Pumpkin">
+	<npc id="8696" level="1" type="Monster" name="Ripe Squash">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8697" level="85" type="Folk" name="Defective Pumpkin">
+	<npc id="8697" level="1" type="Monster" name="Defective Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="8698" level="85" type="Folk" name="Little Honey Pumpkin">
+	<npc id="8698" level="1" type="Monster" name="Little Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="23" />
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="8699" level="85" type="Folk" name="Big Honey Pumpkin">
+	<npc id="8699" level="1" type="Monster" name="Big Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="38.5" />
 			<height normal="33.4" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08700-08799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08700-08799.xml
index c44d48c88a..47ff12b435 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08700-08799.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/08700-08799.xml
@@ -1,57 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="8700" level="85" type="Folk" name="Defective Honey Pumpkin">
+	<npc id="8700" level="1" type="Monster" name="Defective Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="8701" level="85" type="Folk" name="Super Big Pumpkin">
+	<npc id="8701" level="1" type="Monster" name="Super Big Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8702" level="85" type="Folk" name="Super Big Honey Pumpkin">
+	<npc id="8702" level="1" type="Monster" name="Super Big Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.2" />
 			<height normal="40.68" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/13600-13699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/13600-13699.xml
index 92c9288f2c..4d740de58f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/13600-13699.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/13600-13699.xml
@@ -284,58 +284,61 @@
 			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
 		</skillList>
 	</npc>
-	<npc id="13608" level="85" type="Folk" name="Sweet Watermelon">
+	<npc id="13608" level="11" type="Monster" name="Sweet Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="13609" level="85" type="Folk" name="Prime Watermelon">
+	<npc id="13609" level="11" type="Monster" name="Prime Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="17" />
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="13610" level="85" type="Folk" name="Large Prime Watermelon">
+	<npc id="13610" level="11" type="Monster" name="Large Prime Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="60" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19700-19799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19700-19799.xml
index d6f227b502..e1457e8161 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19700-19799.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19700-19799.xml
@@ -2691,134 +2691,141 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="19793" level="85" type="Folk" name="Milk Cow">
+	<npc id="19793" level="99" type="Monster" name="Milk Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19794" level="85" type="Folk" name="Earth Cow">
+	<npc id="19794" level="99" type="Monster" name="Earth Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19795" level="85" type="Folk" name="Luminous Cow">
+	<npc id="19795" level="99" type="Monster" name="Luminous Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19796" level="85" type="Folk" name="Chorong">
+	<npc id="19796" level="99" type="Monster" name="Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19797" level="85" type="Folk" name="Earth Chorong">
+	<npc id="19797" level="99" type="Monster" name="Earth Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19798" level="85" type="Folk" name="Luminous Chorong">
+	<npc id="19798" level="99" type="Monster" name="Luminous Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19799" level="85" type="Folk" name="Nymph">
+	<npc id="19799" level="99" type="Monster" name="Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19800-19899.xml
index 7236866f8e..e9512a750e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/19800-19899.xml
@@ -1,152 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="19800" level="85" type="Folk" name="Earth Nymph">
+	<npc id="19800" level="99" type="Monster" name="Earth Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="19801" level="85" type="Folk" name="Luminous Nymph">
+	<npc id="19801" level="99" type="Monster" name="Luminous Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="19802" level="85" type="Folk" name="Oculus">
+	<npc id="19802" level="99" type="Monster" name="Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19803" level="85" type="Folk" name="Earth Oculus">
+	<npc id="19803" level="99" type="Monster" name="Earth Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19804" level="85" type="Folk" name="Luminous Oculus">
+	<npc id="19804" level="99" type="Monster" name="Luminous Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19805" level="85" type="Folk" name="Fofo">
+	<npc id="19805" level="99" type="Monster" name="Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
 		</collision>
 	</npc>
-	<npc id="19806" level="85" type="Folk" name="Earth Fofo">
+	<npc id="19806" level="99" type="Monster" name="Earth Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
 		</collision>
 	</npc>
-	<npc id="19807" level="85" type="Folk" name="Luminous Fofo">
+	<npc id="19807" level="99" type="Monster" name="Luminous Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
@@ -171,58 +179,61 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="19809" level="85" type="Folk" name="Blue Snowman" title="Penny Pitcher">
+	<npc id="19809" level="105" type="Monster" name="Blue Snowman" title="Penny Pitcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="10" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="5.78035" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19810" level="85" type="Folk" name="Red Snowman" title="Cheapskate">
+	<npc id="19810" level="105" type="Monster" name="Red Snowman" title="Cheapskate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="1.15607" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="20" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="42" />
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19811" level="85" type="Folk" name="Blue Snowman" title="Penny Pitcher">
+	<npc id="19811" level="105" type="Monster" name="Blue Snowman" title="Penny Pitcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="2.31214" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="46.5" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24600-24699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24600-24699.xml
index cdb44b7a28..f9eab79f7a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24600-24699.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24600-24699.xml
@@ -630,62 +630,142 @@
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="24618" level="85" type="Folk" name="Dragon Officer">
+	<npc id="24618" level="124" type="Monster" name="Dragon Officer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="10778329984" sp="9700411" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2177179.76879" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="92" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="53" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="2" /> <!-- Party Small Bonus -->
+			<skill id="33123" level="1" /> <!-- Very Dark Night -->
+			<skill id="33086" level="1" /> <!-- Antharas' Claw -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="31494" max="73657" chance="70" /> <!-- Adena -->
+				<item id="81216" min="2" max="6" chance="1.053" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="3" chance="1.683" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="3" chance="1.683" /> <!-- Dragon Scales -->
+				<item id="81219" min="2" max="6" chance="1.683" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.85" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.3" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="6.665" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24619" level="85" type="Folk" name="Behemoth Dragon" title="Daymare">
+	<npc id="24619" level="124" type="Monster" name="Behemoth Dragon" title="Daymare">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="107783376720" sp="97005031" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="4354360.11561" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="75.6" />
 			<height normal="65.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="2" /> <!-- Party Small Bonus -->
+			<skill id="33123" level="1" /> <!-- Very Dark Night -->
+			<skill id="33086" level="3" /> <!-- Antharas' Sharp Claw -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="32064" max="75026" chance="70" /> <!-- Adena -->
+				<item id="81216" min="2" max="6" chance="1.072" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="3" chance="1.714" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="3" chance="1.714" /> <!-- Dragon Scales -->
+				<item id="81219" min="2" max="6" chance="1.714" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.85" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.3" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="6.665" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24620" level="85" type="Folk" name="Soul Hunter" title="Night Lord">
+	<npc id="24620" level="124" type="Monster" name="Soul Hunter" title="Night Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="107783376720" sp="97005031" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="4354360.11561" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="35" />
 			<height normal="74" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="2" /> <!-- Party Small Bonus -->
+			<skill id="33123" level="1" /> <!-- Very Dark Night -->
+			<skill id="33086" level="3" /> <!-- Antharas' Sharp Claw -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="32064" max="75026" chance="70" /> <!-- Adena -->
+				<item id="81216" min="2" max="6" chance="1.072" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="3" chance="1.714" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="3" chance="1.714" /> <!-- Dragon Scales -->
+				<item id="81219" min="2" max="6" chance="1.714" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.85" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.3" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="6.665" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="24621" level="116" type="Monster" name="Laikel">
 		<race>BUG</race>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24800-24899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24800-24899.xml
index b436cbe73b..4395f2da44 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24800-24899.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24800-24899.xml
@@ -1501,238 +1501,448 @@
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24837" level="85" type="Folk" name="Nerba Orc Mercenary">
+	<npc id="24837" level="116" type="Monster" name="Nerba Orc Mercenary">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15304" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14.4" />
 			<height normal="30.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24838" level="85" type="Folk" name="Tel Mahum Raider">
+	<npc id="24838" level="116" type="Monster" name="Tel Mahum Raider">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38430" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38430" /> <!-- Monster Only: Tiger Bow -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="75" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="26.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24839" level="85" type="Folk" name="Wild Monkey">
+	<npc id="24839" level="116" type="Monster" name="Wild Monkey">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38559" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38559" /> <!-- Monster Only: Mahum Throwing Blade -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="31" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="19.5" />
 			<height normal="39.9" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24840" level="85" type="Folk" name="Dwarf Archaeologist">
+	<npc id="24840" level="116" type="Monster" name="Dwarf Archaeologist">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="30" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11.7" />
 			<height normal="25.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="18" /> <!-- Dwarves -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24841" level="85" type="Folk" name="Nerba Orc Shaman">
+	<npc id="24841" level="116" type="Monster" name="Nerba Orc Shaman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="8688" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="8688" /> <!-- Daimon Crystal -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14.4" />
 			<height normal="33.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24842" level="85" type="Folk" name="Tel Mahum Astrologer">
+	<npc id="24842" level="116" type="Monster" name="Tel Mahum Astrologer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38564" lhand="38432" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38564" lhand="38432" /> <!-- Monster Weapon: Invisible Dagger / Monster Only: Tiger Jewel -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.2" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24843" level="85" type="Folk" name="Royal Guard">
+	<npc id="24843" level="118" type="Monster" name="Royal Guard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="65" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="11" />
-			<height normal="39" />
+			<radius normal="11" grown="13.2" />
+			<height normal="39" grown="46.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attacks -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scales -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24844" level="85" type="Folk" name="Royal Guard Captain">
+	<npc id="24844" level="118" type="Monster" name="Royal Guard Captain">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="65" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="32.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attacks -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scales -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24845" level="85" type="Folk" name="Royal Field Officer">
+	<npc id="24845" level="118" type="Monster" name="Royal Field Officer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="33" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attacks -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scales -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24846" level="85" type="Folk" name="Commander of Operations">
+	<npc id="24846" level="118" type="Monster" name="Commander of Operations">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="33" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attacks -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scales -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24847" level="85" type="Folk" name="Elite Wizard">
+	<npc id="24847" level="118" type="Monster" name="Elite Wizard ">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="73" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="19" />
 			<height normal="44" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5466" level="1" /> <!-- Holy Attacks -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scales -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24848" level="85" type="Folk" name="Chief Magician">
+	<npc id="24848" level="118" type="Monster" name="Chief Magician ">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5466" level="1" /> <!-- Holy Attacks -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scales -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel’s Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Bloody Soul Orb -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="24849" level="112" type="Monster" name="Resurrected Pondus" title="Atelia Protector">
 		<race>DEMONIC</race>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/25900-25999.xml
index d8366aba9b..f9c607cc19 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/25900-25999.xml
@@ -1,44 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="25900" level="104" type="Folk" name="Skill Lind">
+	<npc id="25900" level="104" type="Monster" name="Skill Lind">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>DRAGON</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446.44475689713" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="1949.95411856464" magical="1331.56588332443" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+			<vitals hp="8446.24277" hpRegen="11.4" mp="2355" mpRegen="30" />
+			<attack physical="222054" magical="20716" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="9474" magical="3836" />
 			<speed>
 				<walk ground="100" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="450" holy="500" dark="500" />
-				<attack type="WIND" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" noSleepMode="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5464" level="1" /> <!-- Wind Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="400" />
 			<height normal="210" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Misc. -->
+			<skill id="5464" level="1" /> <!-- Wind Attack -->
+		</skillList>
 	</npc>
 	<npc id="25901" level="96" type="RaidBoss" name="Spicula Zero" title="Raid Boss">
 		<race>HUMANOID</race>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26100-26199.xml
index 65e90324aa..9739fdd34d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26100-26199.xml
@@ -3736,84 +3736,54 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26153" level="96" type="Folk" name="Enhance Death Knight">
+	<npc id="26153" level="96" type="Monster" name="Enhance Death Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="75" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="75" /> <!-- Caliburs -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
 			</speed>
-			<hitTime>710</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="12.0" grown="14.5" />
-			<height normal="31.0" grown="36" />
+			<radius normal="12" grown="14.5" />
+			<height normal="31" grown="36" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26154" level="96" type="Folk" name="Enhance Doom Wraith">
+	<npc id="26154" level="96" type="Monster" name="Enhance Doom Wraith">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="1472" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="1472" /> <!-- Dreadbane -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="100" />
 				<run ground="230" />
 			</speed>
-			<hitTime>450</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="15.0" grown="25" />
-			<height normal="45.0" grown="52" />
+			<radius normal="15" grown="25" />
+			<height normal="45" grown="52" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26155" level="96" type="Monster" name="Enhanced Validus">
@@ -4025,157 +3995,101 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26158" level="91" type="Folk" name="Enhanced Demonic Bathus">
+	<npc id="26158" level="91" type="Monster" name="Enhanced Demonic Bathus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26159" level="91" type="Folk" name="Enhanced Demonic Carcass">
+	<npc id="26159" level="91" type="Monster" name="Enhanced Demonic Krakos">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="15304" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="31302.9915094253" magical="8891.76157255424" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="271.97" magical="154.62" />
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="25.0" grown="32" />
-			<height normal="36.0" grown="55" />
+			<radius normal="25" grown="32" />
+			<height normal="36" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26160" level="91" type="Folk" name="Enhanced Demonic Lotus">
+	<npc id="26160" level="91" type="Monster" name="Enhanced Demonic Lotus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26161" level="91" type="Folk" name="Enhanced Demonic Rakzan">
+	<npc id="26161" level="91" type="Monster" name="Enhanced Demonic Rakzan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="42.0" grown="48" />
-			<height normal="79.0" grown="93" />
+			<radius normal="42" grown="48" />
+			<height normal="79" grown="93" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26194" level="101" type="RaidBoss" name="Dimensional Makkum">
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26200-26299.xml
index 9f7cbb0c4a..92da669d03 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26200-26299.xml
@@ -5452,24 +5452,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26281" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Soldier Recruit" title="Raid Fighter">
+	<npc id="26281" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Soldier Recruit" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5478,37 +5473,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26282" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Scout" title="Raid Fighter">
+	<npc id="26282" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Scout" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="559001" magical="340486" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="220" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5517,37 +5497,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26283" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Wizard" title="Raid Fighter">
+	<npc id="26283" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Wizard" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5556,37 +5521,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26284" level="101" type="Folk" name="Ashen Shadow Expeditionary Force Healer" title="Raid Fighter">
+	<npc id="26284" level="101" type="Monster" name="Ashen Shadow Expeditionary Force Healer" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5595,19 +5545,10 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-			<skill id="5598" level="12" /> <!-- Petrifaction Attack Resistance -->
+			<skill id="5598" level="1" /> <!-- Petrifaction Attack Resistance -->
 			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
 		</skillList>
 	</npc>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26300-26399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26300-26399.xml
index 87585a879d..6a20984c6b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26300-26399.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26300-26399.xml
@@ -408,48 +408,25 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26313" level="106" type="Folk" name="Lithra Bud" title="Raid Fighter">
+	<npc id="26313" level="106" type="Monster" name="Lithra Bud" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>PLANT</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3831006" hpRegen="11.4" mp="26228" mpRegen="30" />
-			<attack physical="914348" magical="103326" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="8532" magical="6418" />
+			<vitals hp="3831009.82659" hpRegen="11.4" mp="26228" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" canMove="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="60" />
 			<height normal="123" />
 		</collision>
-		<skillList>
-			<skill id="4416" level="5" /> <!-- Plants -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-		</skillList>
 	</npc>
 	<npc id="26314" level="106" type="Monster" name="Lithra Aprias" title="Raid Fighter">
 		<race>PLANT</race>
@@ -689,24 +666,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26318" level="106" type="Folk" name="Spezion's Despair" title="Raid Fighter">
+	<npc id="26318" level="106" type="Monster" name="Spezion's Despair" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -715,38 +687,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26319" level="106" type="Folk" name="Spezion's Lunacy" title="Raid Fighter">
+	<npc id="26319" level="106" type="Monster" name="Spezion's Lunacy" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -755,38 +711,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26320" level="106" type="Folk" name="Spezion's Rage" title="Raid Fighter">
+	<npc id="26320" level="106" type="Monster" name="Spezion's Rage" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -795,18 +735,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="26321" level="108" type="RaidBoss" name="Etis van Etina" title="Overlord">
@@ -2484,64 +2413,45 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26353" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26353" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="23" />
-			<height normal="40" />
+			<radius normal="23" grown="32" />
+			<height normal="40" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26354" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26354" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2550,16 +2460,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -3026,24 +2927,20 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26363" level="108" type="Folk" name="Curain" title="Screaming Ghost">
+	<npc id="26363" level="108" type="Monster" name="Curain" title="Screaming Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1562147" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="1562150.28902" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3052,41 +2949,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26364" level="108" type="Folk" name="Flan" title="Suffering Ghost">
+	<npc id="26364" level="108" type="Monster" name="Flan" title="Suffering Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3095,41 +2978,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26365" level="108" type="Folk" name="Aschedor" title="Howling Ghost">
+	<npc id="26365" level="108" type="Monster" name="Aschedor" title="Howling Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3138,41 +3007,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26366" level="108" type="Folk" name="Panahon" title="Wailing Ghost">
+	<npc id="26366" level="108" type="Monster" name="Panahon" title="Wailing Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="4573664352" sp="4105728" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="6248590" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="6248590.17341" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3181,42 +3036,28 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26367" level="108" type="Folk" name="Yehan Klodekus' Ghost">
+	<npc id="26367" level="108" type="Monster" name="Yehan Klodekus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3225,38 +3066,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26368" level="108" type="Folk" name="Yehan Klanikus' Ghost">
+	<npc id="26368" level="108" type="Monster" name="Yehan Klanikus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3265,38 +3092,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26369" level="108" type="Folk" name="Yehan Klodekus">
+	<npc id="26369" level="108" type="Monster" name="Yehan Klodekus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3305,38 +3118,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26370" level="108" type="Folk" name="Yehan Klanikus">
+	<npc id="26370" level="108" type="Monster" name="Yehan Klanikus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3345,56 +3144,31 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26371" level="108" type="Folk" name="Zahak" title="Tauti Underling">
+	<npc id="26371" level="108" type="Monster" name="Zahak" title="Tauti Underling">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="30" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26388" level="107" type="RaidBoss" name="Death Reaper" title="Raid Soul Reaver">
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26400-26499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26400-26499.xml
index 0e0943cf7f..101f84fd22 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26400-26499.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/26400-26499.xml
@@ -2071,24 +2071,19 @@
 			<height normal="87" />
 		</collision>
 	</npc>
-	<npc id="26447" level="115" type="Folk" name="Handy Cannon Gunner">
+	<npc id="26447" level="116" type="Monster" name="Handy Cannon Gunner">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="191358" magical="9966" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="600" distance="10" width="0" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25848" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="80" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2099,36 +2094,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26448" level="115" type="Folk" name="Anchor Warrior">
+	<npc id="26448" level="116" type="Monster" name="Anchor Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2139,36 +2121,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26449" level="115" type="Folk" name="Operator">
+	<npc id="26449" level="116" type="Monster" name="Operator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="150" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2179,36 +2148,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26450" level="115" type="Folk" name="Axe Warrior">
+	<npc id="26450" level="116" type="Monster" name="Axe Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2219,14 +2175,6 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -2353,42 +2301,29 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="26454" level="125" type="Folk" name="Zahak">
+	<npc id="26454" level="125" type="Monster" name="Zahak">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="48424000" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="109348" magical="1457528" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="80806" magical="39846" />
+			<vitals hp="48424" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2350" holy="2300" dark="2350" />
-				<attack type="DARK" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29200-29299.xml
index 9529c24414..1ec45a0927 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29200-29299.xml
@@ -1977,36 +1977,21 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29232" level="99" type="Folk" name="Reward" title="Earth Wyrm">
+	<npc id="29232" level="99" type="Monster" name="Reward" title="Earth Wyrm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>CONSTRUCT</race>
+		<race>ETC</race>
 		<sex>MALE</sex>
-		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="13007.8303806237" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="3899.90823712927" magical="1917.45487198718" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="14197.47634" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="13491.48739" magical="2372.82433" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1051.40069" magical="609.53854" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
 			<hitTime>600</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="2" /> <!-- Magical Creatures -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="0.1" />
 			<height normal="0.1" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29300-29399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29300-29399.xml
index 4b7627383b..a0c1a1bad1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29300-29399.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/29300-29399.xml
@@ -1798,26 +1798,21 @@
 			<height normal="101" />
 		</collision>
 	</npc>
-	<npc id="29328" level="125" type="Folk" name="Torfedo">
+	<npc id="29328" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="13996" magical="10526" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1826,40 +1821,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29329" level="125" type="Folk" name="Harane">
+	<npc id="29329" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="19994" magical="8096" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1868,40 +1850,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29330" level="125" type="Folk" name="Escrito" title="Fragment of the Sea of Spores">
+	<npc id="29330" level="125" type="Monster" name="Escrito" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1910,41 +1879,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29331" level="125" type="Folk" name="Aranea" title="Fragment of the Sea of Spores">
+	<npc id="29331" level="125" type="Monster" name="Aranea" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1953,41 +1908,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29332" level="125" type="Folk" name="Torfedo">
+	<npc id="29332" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -1996,41 +1937,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29333" level="125" type="Folk" name="Harane">
+	<npc id="29333" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2039,41 +1966,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29334" level="125" type="Folk" name="Escrito">
+	<npc id="29334" level="125" type="Monster" name="Escrito">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -2082,41 +1995,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29335" level="125" type="Folk" name="Aranea">
+	<npc id="29335" level="125" type="Monster" name="Aranea">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2125,19 +2024,10 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="29336" level="125" type="GrandBoss" name="Lilith" title="Apostle">
@@ -5942,24 +5832,36 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29380" level="85" type="Folk" name="Baylor" title="Warden">
+	<npc id="29380" level="116" type="RaidBoss" name="Baylor" title="Warden">
 		<!-- 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="15971366" hpRegen="10.5" mp="22800" mpRegen="3.6" />
+		<race>DEMONIC</race>
+		<sex>MALE</sex>
+		<acquire exp="3321740194048" sp="2989566078" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="15971399.832" hpRegen="12.9" mp="22800" mpRegen="30" />
+			<attack physical="492066" magical="448472" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="200864" magical="991184" />
 			<speed>
 				<walk ground="34" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="69.12" />
 			<height normal="93.48" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="33180" level="1" /> <!-- Party's Instance Zone Bonus -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
+		</skillList>
 	</npc>
 	<npc id="29381" level="125" type="GrandBoss" name="Queen Ant" title="Wasteland Mistress">
 		<race>BUG</race>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml
index 0346a3107b..7426574ee8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml
@@ -1922,7 +1922,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="33086" toLevel="2" name="Antharas' Claw">
+	<skill id="33086" toLevel="3" name="Antharas' Claw">
 		<!-- Antharas' power imbues his claws. P./ M. Atk. are increased. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33100-33199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33100-33199.xml
index 3fad407eda..5b5c5fb919 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33100-33199.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33100-33199.xml
@@ -20,7 +20,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="33104" toLevel="1" name="Party Bonus">
+	<skill id="33104" toLevel="2" name="Party Bonus">
 		<!-- Grants extra XP for party hunting. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08600-08699.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
index fad11ea1e1..bd8244c6ec 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
@@ -1910,20 +1910,21 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="8678" level="85" type="Folk" name="Campfire" title="Made with Matchsticks">
+	<npc id="8678" level="1" type="Monster" name="Campfire" title="Made with Matchsticks">
 		<!-- 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="4039" hpRegen="10.5" mp="1812" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="4039.11672" hpRegen="2" mp="1812" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="29" />
 			<height normal="30.5" />
@@ -2233,96 +2234,101 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="8695" level="85" type="Folk" name="Little Pumpkin">
+	<npc id="8695" level="1" type="Monster" name="Little Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="8696" level="85" type="Folk" name="Ripe Squash">
+	<npc id="8696" level="1" type="Monster" name="Ripe Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8697" level="85" type="Folk" name="Defective Pumpkin">
+	<npc id="8697" level="1" type="Monster" name="Withered Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="8698" level="85" type="Folk" name="Little Honey Pumpkin">
+	<npc id="8698" level="1" type="Monster" name="Little Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="23" />
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="8699" level="85" type="Folk" name="Big Honey Pumpkin">
+	<npc id="8699" level="1" type="Monster" name="Ripe Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="38.5" />
 			<height normal="33.4" />
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08700-08799.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
index 41d93c9e20..3352df322a 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
@@ -1,57 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="8700" level="85" type="Folk" name="Defective Honey Pumpkin">
+	<npc id="8700" level="1" type="Monster" name="Withered Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="8701" level="85" type="Folk" name="Super Big Pumpkin">
+	<npc id="8701" level="1" type="Monster" name="Royal Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8702" level="85" type="Folk" name="Super Big Honey Pumpkin">
+	<npc id="8702" level="1" type="Monster" name="Royal Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.2" />
 			<height normal="40.68" />
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/13600-13699.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
index ebad20eacf..8b75cecfa5 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
@@ -284,58 +284,61 @@
 			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
 		</skillList>
 	</npc>
-	<npc id="13608" level="85" type="Folk" name="Sweet Watermelon">
+	<npc id="13608" level="11" type="Monster" name="Sweet Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="13609" level="85" type="Folk" name="Prime Watermelon">
+	<npc id="13609" level="11" type="Monster" name="Prime Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="17" />
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="13610" level="85" type="Folk" name="Large Prime Watermelon">
+	<npc id="13610" level="11" type="Monster" name="Large Prime Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="60" />
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19700-19799.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
index e95ab755ff..1ec38f998a 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
@@ -2691,134 +2691,141 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="19793" level="85" type="Folk" name="Milk Cow">
+	<npc id="19793" level="99" type="Monster" name="Milk Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19794" level="85" type="Folk" name="Earth Cow">
+	<npc id="19794" level="99" type="Monster" name="Earth Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19795" level="85" type="Folk" name="Luminous Cow">
+	<npc id="19795" level="99" type="Monster" name="Luminous Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19796" level="85" type="Folk" name="Chorong">
+	<npc id="19796" level="99" type="Monster" name="Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19797" level="85" type="Folk" name="Earth Chorong">
+	<npc id="19797" level="99" type="Monster" name="Earth Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19798" level="85" type="Folk" name="Luminous Chorong">
+	<npc id="19798" level="99" type="Monster" name="Luminous Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19799" level="85" type="Folk" name="Nymph">
+	<npc id="19799" level="99" type="Monster" name="Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
index a92ade425f..4e5da01c42 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
@@ -1,152 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="19800" level="85" type="Folk" name="Earth Nymph">
+	<npc id="19800" level="99" type="Monster" name="Earth Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="19801" level="85" type="Folk" name="Luminous Nymph">
+	<npc id="19801" level="99" type="Monster" name="Luminous Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="19802" level="85" type="Folk" name="Oculus">
+	<npc id="19802" level="99" type="Monster" name="Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19803" level="85" type="Folk" name="Earth Oculus">
+	<npc id="19803" level="99" type="Monster" name="Earth Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19804" level="85" type="Folk" name="Luminous Oculus">
+	<npc id="19804" level="99" type="Monster" name="Luminous Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19805" level="85" type="Folk" name="Fofo">
+	<npc id="19805" level="99" type="Monster" name="Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
 		</collision>
 	</npc>
-	<npc id="19806" level="85" type="Folk" name="Earth Fofo">
+	<npc id="19806" level="99" type="Monster" name="Earth Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
 		</collision>
 	</npc>
-	<npc id="19807" level="85" type="Folk" name="Luminous Fofo">
+	<npc id="19807" level="99" type="Monster" name="Luminous Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
@@ -171,58 +179,61 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="19809" level="85" type="Folk" name="Blue Snowman" title="Penny Pitcher">
+	<npc id="19809" level="105" type="Monster" name="Blue Snowman" title="Penny Pitcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="10" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="5.78035" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19810" level="85" type="Folk" name="Red Snowman" title="Cheapskate">
+	<npc id="19810" level="105" type="Monster" name="Red Snowman" title="Cheapskate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="1.15607" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="20" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="42" />
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19811" level="85" type="Folk" name="Blue Snowman" title="Penny Pitcher">
+	<npc id="19811" level="105" type="Monster" name="Blue Snowman" title="Penny Pitcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="2.31214" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="46.5" />
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24600-24699.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24600-24699.xml
index edb06460c4..7c4ee06bca 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24600-24699.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24600-24699.xml
@@ -630,62 +630,142 @@
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="24618" level="85" type="Folk" name="Dragon Officer">
+	<npc id="24618" level="124" type="Monster" name="Dragon Officer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="10778329984" sp="9700411" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2177179.76879" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="92" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="53" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="2" /> <!-- Small Party Bonus -->
+			<skill id="33123" level="1" /> <!-- Very Dark Night -->
+			<skill id="33086" level="1" /> <!-- Antharas' Claw -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="31494" max="73657" chance="70" /> <!-- Adena -->
+				<item id="81216" min="2" max="6" chance="1.053" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="3" chance="1.683" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="3" chance="1.683" /> <!-- Dragon Scale -->
+				<item id="81219" min="2" max="6" chance="1.683" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.85" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.3" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="6.665" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24619" level="85" type="Folk" name="Behemoth Dragon" title="Daymare">
+	<npc id="24619" level="124" type="Monster" name="Behemoth Dragon" title="Daymare">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="107783376720" sp="97005031" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="4354360.11561" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="75.6" />
 			<height normal="65.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="2" /> <!-- Small Party Bonus -->
+			<skill id="33123" level="1" /> <!-- Very Dark Night -->
+			<skill id="33086" level="3" /> <!-- Antharas' Sharp Claw -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="32064" max="75026" chance="70" /> <!-- Adena -->
+				<item id="81216" min="2" max="6" chance="1.072" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="3" chance="1.714" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="3" chance="1.714" /> <!-- Dragon Scale -->
+				<item id="81219" min="2" max="6" chance="1.714" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.85" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.3" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="6.665" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24620" level="85" type="Folk" name="Soul Hunter" title="Night Lord">
+	<npc id="24620" level="124" type="Monster" name="Soul Hunter" title="Night Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="107783376720" sp="97005031" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="4354360.11561" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="35" />
 			<height normal="74" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="2" /> <!-- Small Party Bonus -->
+			<skill id="33123" level="1" /> <!-- Very Dark Night -->
+			<skill id="33086" level="3" /> <!-- Antharas' Sharp Claw -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="32064" max="75026" chance="70" /> <!-- Adena -->
+				<item id="81216" min="2" max="6" chance="1.072" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="3" chance="1.714" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="3" chance="1.714" /> <!-- Dragon Scale -->
+				<item id="81219" min="2" max="6" chance="1.714" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.85" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.3" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="6.665" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="24621" level="116" type="Monster" name="Laikel">
 		<race>BUG</race>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24800-24899.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
index 4b30bfd62a..b59223bd34 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
@@ -1501,238 +1501,448 @@
 			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24837" level="85" type="Folk" name="Nerba Orc Mercenary">
+	<npc id="24837" level="116" type="Monster" name="Nerba Orc Mercenary">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15304" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14.4" />
 			<height normal="30.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24838" level="85" type="Folk" name="Tel Mahum Raider">
+	<npc id="24838" level="116" type="Monster" name="Tel Mahum Raider">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38430" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38430" /> <!-- Monster Only: Tiger Bow -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="75" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="26.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24839" level="85" type="Folk" name="Wild Monkey">
+	<npc id="24839" level="116" type="Monster" name="Wild Monkey">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38559" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38559" /> <!-- Monster Only: Mahum Throwing Blade -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="31" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="19.5" />
 			<height normal="39.9" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24840" level="85" type="Folk" name="Dwarf Archaeologist">
+	<npc id="24840" level="116" type="Monster" name="Dwarf Archaeologist">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="30" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11.7" />
 			<height normal="25.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="18" /> <!-- Dwarves -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24841" level="85" type="Folk" name="Nerba Orc Shaman">
+	<npc id="24841" level="116" type="Monster" name="Nerba Orc Shaman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="8688" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="8688" /> <!-- Daimon Crystal -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14.4" />
 			<height normal="33.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24842" level="85" type="Folk" name="Tel Mahum Astrologer">
+	<npc id="24842" level="116" type="Monster" name="Tel Mahum Astrologer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38564" lhand="38432" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38564" lhand="38432" /> <!-- Monster Weapon: Invisible Dagger / Monster Only: Tiger Jewel -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.2" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24843" level="85" type="Folk" name="Royal Guard">
+	<npc id="24843" level="118" type="Monster" name="Royal Guard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="65" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="11" />
-			<height normal="39" />
+			<radius normal="11" grown="13.2" />
+			<height normal="39" grown="46.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24844" level="85" type="Folk" name="Royal Guard Captain">
+	<npc id="24844" level="118" type="Monster" name="Royal Guard Captain">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="65" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="32.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24845" level="85" type="Folk" name="Royal Field Officer">
+	<npc id="24845" level="118" type="Monster" name="Royal Field Officer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="33" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24846" level="85" type="Folk" name="Commander of Operations">
+	<npc id="24846" level="118" type="Monster" name="Commander of Operations">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="33" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24847" level="85" type="Folk" name="Elite Wizard">
+	<npc id="24847" level="118" type="Monster" name="Elite Wizard ">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="73" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="19" />
 			<height normal="44" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24848" level="85" type="Folk" name="Chief Magician">
+	<npc id="24848" level="118" type="Monster" name="Chief Magician ">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="24849" level="112" type="Monster" name="Resurrected Pondus" title="Atelia Protector">
 		<race>DEMONIC</race>
@@ -2950,234 +3160,483 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24876" level="85" type="Folk" name="Conquest Archer">
+	<npc id="24876" level="120" type="Monster" name="Conquest Archer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
 		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<acquire exp="5385168000" sp="4846608" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="40" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7252" max="16968" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.212" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.938" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.938" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.938" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.034" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24877" level="85" type="Folk" name="Conquest Knight">
+	<npc id="24877" level="120" type="Monster" name="Conquest Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="5385168000" sp="4846608" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="40" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7252" max="16968" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.212" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.938" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.938" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.938" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.034" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24878" level="85" type="Folk" name="Conquest Rogue">
+	<npc id="24878" level="120" type="Monster" name="Conquest Rogue">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="5385168000" sp="4846608" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="40" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7252" max="16968" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.212" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.938" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.938" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.938" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.034" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24879" level="85" type="Folk" name="Conquest Warrior">
+	<npc id="24879" level="120" type="Monster" name="Conquest Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="5385168000" sp="4846608" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="40" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7252" max="16968" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.212" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.938" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.938" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.938" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.034" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24880" level="85" type="Folk" name="Conquest Wizard">
+	<npc id="24880" level="120" type="Monster" name="Conquest Wizard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="5385168000" sp="4846608" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="40" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7252" max="16968" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.212" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.938" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.938" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.938" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.034" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24881" level="85" type="Folk" name="Atron of the Conquest">
+	<npc id="24881" level="120" type="Monster" name="Atron of the Conquest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ANIMAL</race>
+		<sex>MALE</sex>
+		<acquire exp="5923684800" sp="5331312" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="12" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="4" /> <!-- Animals -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7814" max="18283" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.306" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.088" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.088" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.088" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.425" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24882" level="85" type="Folk" name="Craigo of the Conquest">
+	<npc id="24882" level="120" type="Monster" name="Craigo of the Conquest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ANIMAL</race>
+		<sex>MALE</sex>
+		<acquire exp="5923684800" sp="5331312" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="18" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="4" /> <!-- Animals -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7814" max="18283" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.306" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.088" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.088" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.088" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.425" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24883" level="85" type="Folk" name="Daril of the Conquest">
+	<npc id="24883" level="120" type="Monster" name="Daril of the Conquest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ANIMAL</race>
+		<sex>MALE</sex>
+		<acquire exp="5923684800" sp="5331312" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="13" />
 				<run ground="140" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="10" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="4" /> <!-- Animals -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7814" max="18283" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.306" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.088" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.088" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.088" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.425" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24884" level="85" type="Folk" name="Seo of the Conquest">
+	<npc id="24884" level="120" type="Monster" name="Seo of the Conquest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ANIMAL</race>
+		<sex>MALE</sex>
+		<acquire exp="5923684800" sp="5331312" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="4" /> <!-- Animals -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7814" max="18283" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.306" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.088" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.088" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.088" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.425" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24885" level="85" type="Folk" name="Powerful Conquest Warrior">
+	<npc id="24885" level="120" type="Monster" name="Powerful Conquest Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ANIMAL</race>
+		<sex>MALE</sex>
+		<acquire exp="5923684800" sp="5331312" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="20" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="17" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="4" /> <!-- Animals -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7814" max="18283" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.306" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.088" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.088" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.088" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.425" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24886" level="85" type="Folk" name="Powerful Conquest Wizard">
+	<npc id="24886" level="120" type="Monster" name="Powerful Conquest Wizard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ANIMAL</race>
+		<sex>MALE</sex>
+		<acquire exp="5923684800" sp="5331312" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926.01156" hpRegen="13.4" mp="2862" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="19" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="13" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="4" /> <!-- Animals -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7814" max="18283" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="1.306" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.088" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.088" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.088" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="5.425" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24887" level="85" type="Folk" name="Powerful Conquest Archer">
+	<npc id="24887" level="112" type="Monster" name="Powerful Conquest Archer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ANIMAL</race>
+		<sex>MALE</sex>
 		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<acquire exp="51874959360" sp="46687388" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="447704.04624" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="1066143" magical="97169" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="334773" magical="165198" />
 			<speed>
 				<walk ground="35" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="16.75" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="4" /> <!-- Animals -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="2100000" max="3180000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.518" /> <!-- Spirit Ore -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0002" /> <!-- Enhanced Rune Stone -->
+				<item id="82012" min="1" max="1" chance="0.014" /> <!-- Orb of Anger - 1st floor -->
+			</drop>
+		</dropLists>
 	</npc>
 </list>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
index 939e24eac0..86aa5d3a86 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
@@ -1,44 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="25900" level="104" type="Folk" name="Skill Lind">
+	<npc id="25900" level="104" type="Monster" name="Skill Lind">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>DRAGON</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446.44475689713" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="1949.95411856464" magical="1331.56588332443" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+			<vitals hp="8446.24277" hpRegen="11.4" mp="2355" mpRegen="30" />
+			<attack physical="222054" magical="20716" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="9474" magical="3836" />
 			<speed>
 				<walk ground="100" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="450" holy="500" dark="500" />
-				<attack type="WIND" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" noSleepMode="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5464" level="1" /> <!-- Wind Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="400" />
 			<height normal="210" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Others -->
+			<skill id="5464" level="1" /> <!-- Wind Attribute -->
+		</skillList>
 	</npc>
 	<npc id="25901" level="96" type="RaidBoss" name="Spicula Zero" title="Raid Boss">
 		<race>HUMANOID</race>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
index 3d12963d88..2b5ff114f4 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
@@ -3736,84 +3736,54 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26153" level="96" type="Folk" name="Enhance Death Knight">
+	<npc id="26153" level="96" type="Monster" name="Enhance Death Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="75" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="75" /> <!-- Caliburs -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
 			</speed>
-			<hitTime>710</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="12.0" grown="14.5" />
-			<height normal="31.0" grown="36" />
+			<radius normal="12" grown="14.5" />
+			<height normal="31" grown="36" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26154" level="96" type="Folk" name="Enhance Doom Wraith">
+	<npc id="26154" level="96" type="Monster" name="Enhance Doom Wraith">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="1472" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="1472" /> <!-- Dreadbane -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="100" />
 				<run ground="230" />
 			</speed>
-			<hitTime>450</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="15.0" grown="25" />
-			<height normal="45.0" grown="52" />
+			<radius normal="15" grown="25" />
+			<height normal="45" grown="52" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26155" level="96" type="Monster" name="Enhanced Validus">
@@ -4025,157 +3995,101 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26158" level="91" type="Folk" name="Enhanced Demonic Bathus">
+	<npc id="26158" level="91" type="Monster" name="Enhanced Demonic Bathus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26159" level="91" type="Folk" name="Enhanced Demonic Krakos">
+	<npc id="26159" level="91" type="Monster" name="Enhanced Demonic Krakos">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="15304" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="31302.9915094253" magical="8891.76157255424" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="271.97" magical="154.62" />
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="25.0" grown="32" />
-			<height normal="36.0" grown="55" />
+			<radius normal="25" grown="32" />
+			<height normal="36" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26160" level="91" type="Folk" name="Enhanced Demonic Lotus">
+	<npc id="26160" level="91" type="Monster" name="Enhanced Demonic Lotus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26161" level="91" type="Folk" name="Enhanced Demonic Rakzan">
+	<npc id="26161" level="91" type="Monster" name="Enhanced Demonic Rakzan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="42.0" grown="48" />
-			<height normal="79.0" grown="93" />
+			<radius normal="42" grown="48" />
+			<height normal="79" grown="93" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26194" level="101" type="RaidBoss" name="Dimensional Makkum">
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
index 0af5bfe22a..a8bc3c846e 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
@@ -5452,24 +5452,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26281" level="101" type="Folk" name="Ashen Shadow Squad Fighter" title="Raid Fighter">
+	<npc id="26281" level="101" type="Monster" name="Ashen Shadow Squad Fighter" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5478,37 +5473,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26282" level="101" type="Folk" name="Ashen Shadow Squad Scout" title="Raid Fighter">
+	<npc id="26282" level="101" type="Monster" name="Ashen Shadow Squad Scout" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="559001" magical="340486" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="220" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5517,37 +5497,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26283" level="101" type="Folk" name="Ashen Shadow Squad Wizard" title="Raid Fighter">
+	<npc id="26283" level="101" type="Monster" name="Ashen Shadow Squad Wizard" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5556,37 +5521,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26284" level="101" type="Folk" name="Ashen Shadow Squad Healer" title="Raid Fighter">
+	<npc id="26284" level="101" type="Monster" name="Ashen Shadow Squad Healer" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5595,19 +5545,10 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-			<skill id="5598" level="12" /> <!-- Petrifaction Attack Resistance -->
+			<skill id="5598" level="1" /> <!-- Petrifaction Attack Resistance -->
 			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
 		</skillList>
 	</npc>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26300-26399.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
index 7a0e2fac62..8cc82fe5a5 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
@@ -408,48 +408,25 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26313" level="106" type="Folk" name="Lithra Bud" title="Raid Fighter">
+	<npc id="26313" level="106" type="Monster" name="Lithra Bud" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>PLANT</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3831006" hpRegen="11.4" mp="26228" mpRegen="30" />
-			<attack physical="914348" magical="103326" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="8532" magical="6418" />
+			<vitals hp="3831009.82659" hpRegen="11.4" mp="26228" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" canMove="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="60" />
 			<height normal="123" />
 		</collision>
-		<skillList>
-			<skill id="4416" level="5" /> <!-- Plants -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-		</skillList>
 	</npc>
 	<npc id="26314" level="106" type="Monster" name="Lithra Aprias" title="Raid Fighter">
 		<race>PLANT</race>
@@ -689,24 +666,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26318" level="106" type="Folk" name="Spezion's Despair" title="Raid Fighter">
+	<npc id="26318" level="106" type="Monster" name="Spezion's Despair" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -715,38 +687,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26319" level="106" type="Folk" name="Spezion's Lunacy" title="Raid Fighter">
+	<npc id="26319" level="106" type="Monster" name="Spezion's Lunacy" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -755,38 +711,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26320" level="106" type="Folk" name="Spezion's Rage" title="Raid Fighter">
+	<npc id="26320" level="106" type="Monster" name="Spezion's Rage" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -795,18 +735,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="26321" level="108" type="RaidBoss" name="Etis van Etina" title="Overlord">
@@ -2484,64 +2413,45 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26353" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26353" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="23" />
-			<height normal="40" />
+			<radius normal="23" grown="32" />
+			<height normal="40" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26354" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26354" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2550,16 +2460,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -3026,24 +2927,20 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26363" level="108" type="Folk" name="Curain" title="Screaming Ghost">
+	<npc id="26363" level="108" type="Monster" name="Curain" title="Screaming Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1562147" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="1562150.28902" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3052,41 +2949,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26364" level="108" type="Folk" name="Flan" title="Suffering Ghost">
+	<npc id="26364" level="108" type="Monster" name="Flan" title="Suffering Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3095,41 +2978,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26365" level="108" type="Folk" name="Aschedor" title="Howling Ghost">
+	<npc id="26365" level="108" type="Monster" name="Aschedor" title="Howling Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3138,41 +3007,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26366" level="108" type="Folk" name="Panahon" title="Wailing Ghost">
+	<npc id="26366" level="108" type="Monster" name="Panahon" title="Wailing Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="4573664352" sp="4105728" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="6248590" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="6248590.17341" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3181,42 +3036,28 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26367" level="108" type="Folk" name="Yehan Klodekus' Ghost">
+	<npc id="26367" level="108" type="Monster" name="Yehan Klodekus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3225,38 +3066,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26368" level="108" type="Folk" name="Yehan Klanikus' Ghost">
+	<npc id="26368" level="108" type="Monster" name="Yehan Klanikus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3265,38 +3092,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26369" level="108" type="Folk" name="Yehan Klodekus">
+	<npc id="26369" level="108" type="Monster" name="Yehan Klodekus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3305,38 +3118,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26370" level="108" type="Folk" name="Yehan Klanikus">
+	<npc id="26370" level="108" type="Monster" name="Yehan Klanikus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3345,56 +3144,31 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26371" level="108" type="Folk" name="Zahak" title="Tauti Underling">
+	<npc id="26371" level="108" type="Monster" name="Zahak" title="Tauti Underling">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="30" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26388" level="107" type="RaidBoss" name="Death Reaper" title="Raid Soul Reaver">
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26400-26499.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
index ae82126dd4..fa6cc8d3b9 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
@@ -2071,24 +2071,19 @@
 			<height normal="87" />
 		</collision>
 	</npc>
-	<npc id="26447" level="115" type="Folk" name="Handy Cannon Gunner">
+	<npc id="26447" level="116" type="Monster" name="Handy Cannon Gunner">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="191358" magical="9966" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="600" distance="10" width="0" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25848" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="80" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2099,36 +2094,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26448" level="115" type="Folk" name="Anchor Warrior">
+	<npc id="26448" level="116" type="Monster" name="Anchor Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2139,36 +2121,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26449" level="115" type="Folk" name="Operator">
+	<npc id="26449" level="116" type="Monster" name="Operator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="150" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2179,36 +2148,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26450" level="115" type="Folk" name="Axe Warrior">
+	<npc id="26450" level="116" type="Monster" name="Axe Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2219,14 +2175,6 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -2353,42 +2301,29 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="26454" level="125" type="Folk" name="Zahak">
+	<npc id="26454" level="125" type="Monster" name="Zahak">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="48424000" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="109348" magical="1457528" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="80806" magical="39846" />
+			<vitals hp="48424" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2350" holy="2300" dark="2350" />
-				<attack type="DARK" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -3364,42 +3299,97 @@
 			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26480" level="85" type="Folk" name="Slaughter Bathin" title="Raid Boss">
+	<npc id="26480" level="125" type="RaidBoss" name="Bathin" title="Raid Boss">
 		<!-- 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="141473764" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="141474" hpRegen="13.4" mp="66584" mpRegen="30" />
+			<attack physical="639686" magical="583012" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="301296" magical="1458092" />
 			<speed>
 				<walk ground="100" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="56" />
 			<height normal="125" />
 		</collision>
 	</npc>
-	<npc id="26481" level="85" type="Folk" name="Slaughter Bathin" title="Raid Boss">
+	<npc id="26481" level="125" type="RaidBoss" name="Bathin" title="Raid Boss">
 		<!-- 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="141473764" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="15087915390625" sp="13579123750" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="141474" hpRegen="13.4" mp="66584" mpRegen="30" />
+			<attack physical="639686" magical="583012" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="301296" magical="1458092" />
 			<speed>
 				<walk ground="100" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="56" />
 			<height normal="125" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32909" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="35566" min="1" max="1" chance="35" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="65" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="46447" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46448" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 5 -->
+				<item id="46449" min="1" max="1" chance="7.75" /> <!-- Kain's Soul Crystal Lv. 6 -->
+				<item id="46450" min="1" max="1" chance="4.65" /> <!-- Kain's Soul Crystal Lv. 7 -->
+				<item id="46462" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+				<item id="46463" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 5 -->
+				<item id="46464" min="1" max="1" chance="7.75" /> <!-- Mermoden's Soul Crystal Lv. 6 -->
+				<item id="46465" min="1" max="1" chance="4.65" /> <!-- Mermoden's Soul Crystal Lv. 7 -->
+				<item id="46477" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46478" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 5 -->
+				<item id="46479" min="1" max="1" chance="11.5" /> <!-- Leona's Soul Crystal Lv. 6 -->
+				<item id="46480" min="1" max="1" chance="6.9" /> <!-- Leona's Soul Crystal Lv. 7 -->
+				<item id="46492" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46493" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 5 -->
+				<item id="46494" min="1" max="1" chance="11.5" /> <!-- Pantheon's Soul Crystal Lv. 6 -->
+				<item id="46495" min="1" max="1" chance="6.9" /> <!-- Pantheon's Soul Crystal Lv. 7 -->
+				<item id="46507" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46508" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 5 -->
+				<item id="81153" min="1" max="1" chance="35" /> <!-- Navari's Mask -->
+				<item id="80090" min="1" max="1" chance="7.15" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="7.15" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="7.15" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="7.15" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="7.15" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="7.15" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="7.15" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="7.15" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="7.15" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="7.15" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="7.15" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="7.15" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="7.1" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="7.1" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="20" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="20" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="20" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="20" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="20" /> <!-- Leviathan Boots - Heavy armor -->
+			</drop>
+		</dropLists>
 	</npc>
 </list>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
index 8644fa5e84..c8db21ac66 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
@@ -1977,36 +1977,21 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29232" level="99" type="Folk" name="Reward" title="Earth Wyrm">
+	<npc id="29232" level="99" type="Monster" name="Reward" title="Earth Wyrm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>CONSTRUCT</race>
+		<race>ETC</race>
 		<sex>MALE</sex>
-		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="13007.8303806237" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="3899.90823712927" magical="1917.45487198718" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="14197.47634" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="13491.48739" magical="2372.82433" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1051.40069" magical="609.53854" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
 			<hitTime>600</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="2" /> <!-- Magical Creatures -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="0.1" />
 			<height normal="0.1" />
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29300-29399.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
index e08d1c8e74..d9db774a54 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
@@ -1798,26 +1798,21 @@
 			<height normal="101" />
 		</collision>
 	</npc>
-	<npc id="29328" level="125" type="Folk" name="Torfedo">
+	<npc id="29328" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="13996" magical="10526" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1826,40 +1821,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29329" level="125" type="Folk" name="Harane">
+	<npc id="29329" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="19994" magical="8096" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1868,40 +1850,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29330" level="125" type="Folk" name="Escrito" title="Fragment of the Sea of Spores">
+	<npc id="29330" level="125" type="Monster" name="Escrito" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1910,41 +1879,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29331" level="125" type="Folk" name="Aranea" title="Fragment of the Sea of Spores">
+	<npc id="29331" level="125" type="Monster" name="Aranea" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1953,41 +1908,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29332" level="125" type="Folk" name="Torfedo">
+	<npc id="29332" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -1996,41 +1937,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29333" level="125" type="Folk" name="Harane">
+	<npc id="29333" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2039,41 +1966,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29334" level="125" type="Folk" name="Escrito">
+	<npc id="29334" level="125" type="Monster" name="Escrito">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -2082,41 +1995,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29335" level="125" type="Folk" name="Aranea">
+	<npc id="29335" level="125" type="Monster" name="Aranea">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2125,19 +2024,10 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="29336" level="125" type="GrandBoss" name="Lilith" title="Apostle">
@@ -5942,24 +5832,36 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29380" level="85" type="Folk" name="Baylor" title="Warden">
+	<npc id="29380" level="116" type="RaidBoss" name="Baylor" title="Warden">
 		<!-- 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="15971366" hpRegen="10.5" mp="22800" mpRegen="3.6" />
+		<race>DEMONIC</race>
+		<sex>MALE</sex>
+		<acquire exp="3321740194048" sp="2989566078" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="15971399.832" hpRegen="12.9" mp="22800" mpRegen="30" />
+			<attack physical="492066" magical="448472" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="200864" magical="991184" />
 			<speed>
 				<walk ground="34" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="69.12" />
 			<height normal="93.48" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="33180" level="1" /> <!-- Party's Instance Zone Bonus -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
+		</skillList>
 	</npc>
 	<npc id="29381" level="125" type="GrandBoss" name="Queen Ant" title="Wasteland Mistress">
 		<race>BUG</race>
@@ -6061,39 +5963,94 @@
 			<height normal="109" />
 		</collision>
 	</npc>
-	<npc id="29385" level="85" type="Folk" name="Eigis" title="Lady of Despair">
+	<npc id="29385" level="127" type="RaidBoss" name="Eigis" title="Lady of Despair">
 		<!-- 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="761086172" hpRegen="10.5" mp="68076" mpRegen="3.6" />
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="40034117754185" sp="36030705842" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="761086" hpRegen="13.4" mp="68076" mpRegen="30" />
+			<attack physical="639686" magical="583012" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="301296" magical="1458092" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="36" />
 			<height normal="123" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32909" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="46447" min="3" max="3" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46448" min="2" max="2" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 5 -->
+				<item id="46449" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 6 -->
+				<item id="46450" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 7 -->
+				<item id="46462" min="3" max="3" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+				<item id="46463" min="2" max="2" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 5 -->
+				<item id="46464" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 6 -->
+				<item id="46465" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 7 -->
+				<item id="46477" min="3" max="3" chance="23" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46478" min="2" max="2" chance="23" /> <!-- Leona's Soul Crystal Lv. 5 -->
+				<item id="46479" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 6 -->
+				<item id="46480" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 7 -->
+				<item id="46492" min="3" max="3" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46493" min="2" max="2" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 5 -->
+				<item id="46494" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 6 -->
+				<item id="46495" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 7 -->
+				<item id="46507" min="3" max="3" chance="23" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46508" min="2" max="2" chance="23" /> <!-- Lionel's Soul Crystal Lv. 5 -->
+				<item id="46509" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 6 -->
+				<item id="46510" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 7 -->
+				<item id="80333" min="1" max="1" chance="34" /> <!-- Dragon's Necklace -->
+				<item id="80334" min="1" max="1" chance="33" /> <!-- Dragon's Earring -->
+				<item id="80335" min="1" max="1" chance="33" /> <!-- Dragon's Ring -->
+				<item id="80090" min="2" max="2" chance="7.15" /> <!-- Krishna Shaper -->
+				<item id="80091" min="2" max="2" chance="7.15" /> <!-- Krishna Cutter -->
+				<item id="80092" min="2" max="2" chance="7.15" /> <!-- Krishna Slasher -->
+				<item id="80093" min="2" max="2" chance="7.15" /> <!-- Krishna Avenger -->
+				<item id="80094" min="2" max="2" chance="7.15" /> <!-- Krishna Fighter -->
+				<item id="80095" min="2" max="2" chance="7.15" /> <!-- Krishna Stormer -->
+				<item id="80096" min="2" max="2" chance="7.15" /> <!-- Krishna Thrower -->
+				<item id="80097" min="2" max="2" chance="7.15" /> <!-- Krishna Guardian -->
+				<item id="80098" min="2" max="2" chance="7.15" /> <!-- Krishna Buster -->
+				<item id="80099" min="2" max="2" chance="7.15" /> <!-- Krishna Caster -->
+				<item id="80100" min="2" max="2" chance="7.15" /> <!-- Krishna Retributer -->
+				<item id="80101" min="2" max="2" chance="7.15" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="2" max="2" chance="7.1" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="2" max="2" chance="7.1" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="4" max="4" chance="20" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="4" max="4" chance="20" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="4" max="4" chance="20" /> <!-- Leviathan Gaiters - Heavy armor -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="29386" level="85" type="Folk" name="Magic Device" title="Owned by Eigis">
+	<npc id="29386" level="126" type="Monster" name="Magic Device" title="Owned by Eigis">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="250" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="145.66474" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="56" />
 			<height normal="143" />
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml
index 1f6e899c42..3540355861 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml
@@ -1922,7 +1922,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="33086" toLevel="2" name="Antharas' Claw">
+	<skill id="33086" toLevel="3" name="Antharas' Claw">
 		<!-- Antharas' power imbues his claws. P./ M. Atk. are increased. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33100-33199.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33100-33199.xml
index dca827add7..77b765242b 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33100-33199.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33100-33199.xml
@@ -20,7 +20,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="33104" toLevel="1" name="Party Bonus">
+	<skill id="33104" toLevel="2" name="Party Bonus">
 		<!-- Grants extra XP for party hunting. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
index 20430afd50..bd8244c6ec 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
@@ -1910,20 +1910,21 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="8678" level="85" type="Folk" name="Campfire" title="Made with Matchsticks">
+	<npc id="8678" level="1" type="Monster" name="Campfire" title="Made with Matchsticks">
 		<!-- 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="4039" hpRegen="10.5" mp="1812" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="4039.11672" hpRegen="2" mp="1812" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="29" />
 			<height normal="30.5" />
@@ -2233,96 +2234,101 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="8695" level="85" type="Folk" name="Little Pumpkin">
+	<npc id="8695" level="1" type="Monster" name="Little Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="8696" level="85" type="Folk" name="Ripe Pumpkin">
+	<npc id="8696" level="1" type="Monster" name="Ripe Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8697" level="85" type="Folk" name="Withered Pumpkin">
+	<npc id="8697" level="1" type="Monster" name="Withered Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="8698" level="85" type="Folk" name="Little Honey Pumpkin">
+	<npc id="8698" level="1" type="Monster" name="Little Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="23" />
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="8699" level="85" type="Folk" name="Ripe Honey Pumpkin">
+	<npc id="8699" level="1" type="Monster" name="Ripe Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="38.5" />
 			<height normal="33.4" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
index ed4e66f6af..0167a096fb 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
@@ -1,57 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="8700" level="85" type="Folk" name="Withered Honey Pumpkin">
+	<npc id="8700" level="1" type="Monster" name="Withered Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="8701" level="85" type="Folk" name="Royal Pumpkin">
+	<npc id="8701" level="1" type="Monster" name="Royal Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30.8" />
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8702" level="85" type="Folk" name="Royal Honey Pumpkin">
+	<npc id="8702" level="1" type="Monster" name="Royal Honey Pumpkin">
 		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="43.53312" hpRegen="2" mp="40" mpRegen="0.9" />
+			<attack physical="8.47458" magical="5.78704" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.2" />
 			<height normal="40.68" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
index ec3b98cfdd..b01c798c07 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
@@ -284,58 +284,61 @@
 			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
 		</skillList>
 	</npc>
-	<npc id="13608" level="85" type="Folk" name="Sweet Watermelon">
+	<npc id="13608" level="11" type="Monster" name="Sweet Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="13609" level="85" type="Folk" name="Prime Watermelon">
+	<npc id="13609" level="11" type="Monster" name="Prime Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="17" />
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="13610" level="85" type="Folk" name="Large Prime Watermelon">
+	<npc id="13610" level="11" type="Monster" name="Large Prime Watermelon">
 		<!-- 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="9117" hpRegen="10.5" mp="40" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="5792.42902" hpRegen="2.5" mp="40" mpRegen="1.2" />
+			<attack physical="21.0973" magical="14.40672" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="64.04702" magical="46.86683" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="60" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
index 68704b56cc..d0ec41ef46 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
@@ -2691,134 +2691,141 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="19793" level="85" type="Folk" name="Milk Cow">
+	<npc id="19793" level="99" type="Monster" name="Milk Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19794" level="85" type="Folk" name="Earth Cow">
+	<npc id="19794" level="99" type="Monster" name="Earth Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19795" level="85" type="Folk" name="Luminous Cow">
+	<npc id="19795" level="99" type="Monster" name="Luminous Cow">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="19796" level="85" type="Folk" name="Chorong">
+	<npc id="19796" level="99" type="Monster" name="Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19797" level="85" type="Folk" name="Earth Chorong">
+	<npc id="19797" level="99" type="Monster" name="Earth Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19798" level="85" type="Folk" name="Luminous Chorong">
+	<npc id="19798" level="99" type="Monster" name="Luminous Chorong">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="19799" level="85" type="Folk" name="Nymph">
+	<npc id="19799" level="99" type="Monster" name="Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
index 20d96fac5c..d7b7b0170d 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
@@ -1,152 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="19800" level="85" type="Folk" name="Earth Nymph">
+	<npc id="19800" level="99" type="Monster" name="Earth Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="19801" level="85" type="Folk" name="Luminous Nymph">
+	<npc id="19801" level="99" type="Monster" name="Luminous Nymph">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="19802" level="85" type="Folk" name="Oculus">
+	<npc id="19802" level="99" type="Monster" name="Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19803" level="85" type="Folk" name="Earth Oculus">
+	<npc id="19803" level="99" type="Monster" name="Earth Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19804" level="85" type="Folk" name="Luminous Oculus">
+	<npc id="19804" level="99" type="Monster" name="Luminous Oculus">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<speed>
 				<walk ground="60" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="19805" level="85" type="Folk" name="Fofo">
+	<npc id="19805" level="99" type="Monster" name="Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
 		</collision>
 	</npc>
-	<npc id="19806" level="85" type="Folk" name="Earth Fofo">
+	<npc id="19806" level="99" type="Monster" name="Earth Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
 		</collision>
 	</npc>
-	<npc id="19807" level="85" type="Folk" name="Luminous Fofo">
+	<npc id="19807" level="99" type="Monster" name="Luminous Fofo">
 		<!-- 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" />
+		<sex>MALE</sex>
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="9218.92744" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="6745.74369699808" magical="1186.41216252556" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.700347194163" magical="304.76927121016" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="5" />
 			<height normal="4" />
@@ -171,58 +179,61 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="19809" level="85" type="Folk" name="Blue Snowman" title="Penny Pitcher">
+	<npc id="19809" level="105" type="Monster" name="Blue Snowman" title="Penny Pitcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="10" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="5.78035" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19810" level="85" type="Folk" name="Red Snowman" title="Cheapskate">
+	<npc id="19810" level="105" type="Monster" name="Red Snowman" title="Cheapskate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="1.15607" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="20" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="42" />
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19811" level="85" type="Folk" name="Blue Snowman" title="Penny Pitcher">
+	<npc id="19811" level="105" type="Monster" name="Blue Snowman" title="Penny Pitcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4" hpRegen="10.5" mp="300" mpRegen="3.6" />
+			<vitals hp="2.31214" hpRegen="1" mp="300.8" mpRegen="1" />
+			<attack physical="129440" magical="12670" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4142" magical="1677" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="46.5" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
index 5d418342da..e445fe3ccc 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
@@ -1501,238 +1501,454 @@
 			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24837" level="85" type="Folk" name="Nerba Orc Mercenary">
+	<npc id="24837" level="116" type="Monster" name="Nerba Orc Mercenary">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15304" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14.4" />
 			<height normal="30.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24838" level="85" type="Folk" name="Tel Mahum Raider">
+	<npc id="24838" level="116" type="Monster" name="Tel Mahum Raider">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38430" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38430" /> <!-- Monster Only: Tiger Bow -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="75" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="26.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24839" level="85" type="Folk" name="Wild Monkey">
+	<npc id="24839" level="116" type="Monster" name="Wild Monkey">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38559" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38559" /> <!-- Monster Only: Mahum Throwing Blade -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="31" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="19.5" />
 			<height normal="39.9" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24840" level="85" type="Folk" name="Dwarf Archaeologist">
+	<npc id="24840" level="116" type="Monster" name="Dwarf Archaeologist">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="30" />
 				<run ground="100" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11.7" />
 			<height normal="25.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="18" /> <!-- Dwarves -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24841" level="85" type="Folk" name="Nerba Orc Shaman">
+	<npc id="24841" level="116" type="Monster" name="Nerba Orc Shaman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="8688" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="8688" /> <!-- Daimon Crystal -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14.4" />
 			<height normal="33.6" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24842" level="85" type="Folk" name="Tel Mahum Astrologer">
+	<npc id="24842" level="116" type="Monster" name="Tel Mahum Astrologer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="38564" lhand="38432" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="38564" lhand="38432" /> <!-- Monster Weapon: Invisible Dagger / Monster Only: Tiger Jewel -->
+		<acquire exp="3839010256" sp="3455097" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031.21387" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.2" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5462" level="1" /> <!-- Fire Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="16317" level="10" /> <!-- Pull Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="76200" max="83160" chance="100" /> <!-- Adena -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24843" level="85" type="Folk" name="Royal Guard">
+	<npc id="24843" level="118" type="Monster" name="Royal Guard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="65" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="11" />
-			<height normal="39" />
+			<radius normal="11" grown="13.2" />
+			<height normal="39" grown="46.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24844" level="85" type="Folk" name="Royal Guard Captain">
+	<npc id="24844" level="118" type="Monster" name="Royal Guard Captain">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="65" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="32.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24845" level="85" type="Folk" name="Royal Field Officer">
+	<npc id="24845" level="118" type="Monster" name="Royal Field Officer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="33" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24846" level="85" type="Folk" name="Commander of Operations">
+	<npc id="24846" level="118" type="Monster" name="Commander of Operations">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="33" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24847" level="85" type="Folk" name="Elite Wizard">
+	<npc id="24847" level="118" type="Monster" name="Elite Wizard ">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="73" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="19" />
 			<height normal="44" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24848" level="85" type="Folk" name="Chief Magician">
+	<npc id="24848" level="118" type="Monster" name="Chief Magician ">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="5002948896" sp="4502604" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486.12717" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4671" max="10920" chance="70" /> <!-- Adena -->
+				<item id="81216" min="1" max="1" chance="0.781" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="1.249" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="1.249" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="1.249" /> <!-- Angel's Feather -->
+				<item id="81343" min="1" max="1" chance="0.17" /> <!-- Shining Aden Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="3.243" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="24849" level="112" type="Monster" name="Resurrected Pondus" title="Atelia Protector">
 		<race>DEMONIC</race>
@@ -3483,256 +3699,536 @@
 			</clanList>
 		</ai>
 	</npc>
-	<npc id="24887" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+	<npc id="24887" level="112" type="Monster" name="Mimic" title="Baium's Treasure">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="51874959360" sp="46687388" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="447704.04624" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="1066143" magical="97169" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="334773" magical="165198" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="2100000" max="3180000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.518" /> <!-- Spirit Ore -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0002" /> <!-- Enhanced Rune Stone -->
+				<item id="82012" min="1" max="1" chance="0.014" /> <!-- Orb of Anger - 1st floor -->
+				<item id="82265" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 1 - Armor -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24888" level="114" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="83229373080" sp="74906345" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="598406.93642" hpRegen="12.9" mp="2943" mpRegen="30" />
+			<attack physical="1066143" magical="97169" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="334773" magical="165198" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="4455000" max="5427000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.504" /> <!-- Spirit Ore -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0003" /> <!-- Enhanced Rune Stone -->
+				<item id="82013" min="1" max="1" chance="0.028" /> <!-- Orb of Anger - 2nd Floor -->
+				<item id="82265" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 1 - Armor -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24889" level="116" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="133213592640" sp="119892153" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="834046.24277" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="7290000" max="9000000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0004" /> <!-- Enhanced Rune Stone -->
+				<item id="82014" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 3rd Floor -->
+				<item id="82265" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 1 - Armor -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24890" level="116" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="146650081440" sp="131985060" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="834046.24277" hpRegen="12.9" mp="3024" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+	</npc>
+	<npc id="24891" level="118" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="234683728880" sp="211215245" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1150850.28902" hpRegen="12.9" mp="3107" mpRegen="30" />
+			<attack physical="1230165" magical="112118" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="502160" magical="247796" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="12150000" max="13770000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.504" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.00008" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.00008" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.00008" /> <!-- Enhanced Rune Stone -->
+				<item id="82016" min="1" max="1" chance="0.028" /> <!-- Orb of Anger - 5th Floor -->
+				<item id="82265" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 1 - Armor -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24892" level="120" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="375346080000" sp="337811472" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574869.9422" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="14715000" max="16335000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.0001" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.0001" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0001" /> <!-- Enhanced Rune Stone -->
+				<item id="82017" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 6th Floor -->
+				<item id="82265" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 1 - Armor -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24893" level="120" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="375346080000" sp="337811472" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574869.9422" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="17280000" max="18900000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.0001" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.0001" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0001" /> <!-- Enhanced Rune Stone -->
+				<item id="82017" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 6th Floor -->
+				<item id="82266" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 2 - Armor -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24894" level="122" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="659576273800" sp="593618572" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140139.88439" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="19845000" max="21465000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.0001" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.0001" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0001" /> <!-- Enhanced Rune Stone -->
+				<item id="82017" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 6th Floor -->
+				<item id="82266" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 2 - Armor -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24895" level="124" type="Monster" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1451450.28902" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<hitTime>600</hitTime>
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+		</skillList>
+	</npc>
+	<npc id="24896" level="120" type="Monster" name="Heaven's Palace Watcher">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>DIVINE</race>
+		<sex>MALE</sex>
 		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<acquire exp="37534608000" sp="33781104" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="447704" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24888" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="598407" hpRegen="10.5" mp="2943" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24889" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="834046" hpRegen="10.5" mp="3024" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24890" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="834046" hpRegen="10.5" mp="3024" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24891" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="1150851" hpRegen="10.5" mp="3107" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24892" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24893" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24894" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24895" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
-		<!-- 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="1451454" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<speed>
-				<walk ground="30" />
-				<run ground="120" />
-			</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="16.5" />
-			<height normal="13.5" />
-		</collision>
-	</npc>
-	<npc id="24896" level="85" type="Folk" name="Heaven's Palace Watcher">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1574869.9422" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="30" />
 				<run ground="220" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="13" />
 			<height normal="47" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+			<skill id="34065" level="7" /> <!-- Energy of Insolence -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="1728000" max="1890000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.0001" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.0001" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0001" /> <!-- Enhanced Rune Stone -->
+				<item id="82017" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 6th Floor -->
+				<item id="82266" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 2 - Armor -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24897" level="85" type="Folk" name="Heaven's Palace Pilgrim">
+	<npc id="24897" level="120" type="Monster" name="Heaven's Palace Pilgrim">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
 		<equipment rhand="6717" /> <!-- Monster Only (Einhasad Warrior) -->
+		<acquire exp="37534608000" sp="33781104" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1574869.9422" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<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" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="8" />
-			<height normal="30" />
+			<radius normal="8" grown="9" />
+			<height normal="30" grown="36.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+			<skill id="34065" level="7" /> <!-- Energy of Insolence -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="1728000" max="1890000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.0001" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.0001" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0001" /> <!-- Enhanced Rune Stone -->
+				<item id="82017" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 6th Floor -->
+				<item id="82266" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 2 - Armor -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24898" level="85" type="Folk" name="Heaven's Palace Guardian">
+	<npc id="24898" level="120" type="Monster" name="Heaven's Palace Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
 		<equipment rhand="148" /> <!-- Sword of Valhalla -->
+		<acquire exp="37534608000" sp="33781104" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1574869.9422" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="13.5" />
-			<height normal="36.5" />
+			<radius normal="13.5" grown="16" />
+			<height normal="36.5" grown="42.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+			<skill id="34065" level="7" /> <!-- Energy of Insolence -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="1728000" max="1890000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.0001" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.0001" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0001" /> <!-- Enhanced Rune Stone -->
+				<item id="82017" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 6th Floor -->
+				<item id="82266" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 2 - Armor -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="24899" level="85" type="Folk" name="Heaven's Palace Herald">
+	<npc id="24899" level="120" type="Monster" name="Heaven's Palace Herald">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DIVINE</race>
+		<sex>MALE</sex>
 		<equipment rhand="6718" /> <!-- Monster Only (Einhasad Shaman) -->
+		<acquire exp="37534608000" sp="33781104" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1574869.9422" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="50" />
 				<run ground="165" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="11" />
-			<height normal="38.5" />
+			<radius normal="11" grown="13" />
+			<height normal="38.5" grown="46.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5466" level="1" /> <!-- Holy Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+			<skill id="34065" level="7" /> <!-- Energy of Insolence -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="1728000" max="1890000" chance="70" /> <!-- Adena -->
+				<item id="1785" min="1" max="1" chance="34.3" /> <!-- Soulstone -->
+				<item id="3031" min="1" max="1" chance="35.476" /> <!-- Spirit Ore -->
+				<item id="35566" min="1" max="1" chance="0.0001" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="0.0001" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="39738" min="1" max="1" chance="0.021" /> <!-- Rune Stone -->
+				<item id="81053" min="1" max="1" chance="0.14" /> <!-- Vitality -->
+				<item id="81453" min="1" max="1" chance="0.0001" /> <!-- Enhanced Rune Stone -->
+				<item id="82017" min="1" max="1" chance="0.056" /> <!-- Orb of Anger - 6th Floor -->
+				<item id="82266" min="1" max="1" chance="0.007" /> <!-- Tersi's Soul Crystal Lv. 2 - Armor -->
+			</drop>
+		</dropLists>
 	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
index e342fd1512..6c603c0583 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
@@ -1,44 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="25900" level="104" type="Folk" name="Skill Lind">
+	<npc id="25900" level="104" type="Monster" name="Skill Lind">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>DRAGON</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446.44475689713" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="1949.95411856464" magical="1331.56588332443" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+			<vitals hp="8446.24277" hpRegen="11.4" mp="2355" mpRegen="30" />
+			<attack physical="222054" magical="20716" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="9474" magical="3836" />
 			<speed>
 				<walk ground="100" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="450" holy="500" dark="500" />
-				<attack type="WIND" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" noSleepMode="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5464" level="1" /> <!-- Wind Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="400" />
 			<height normal="210" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="19" /> <!-- Others -->
+			<skill id="5464" level="1" /> <!-- Wind Attribute -->
+		</skillList>
 	</npc>
 	<npc id="25901" level="96" type="RaidBoss" name="Spicula Zero" title="Raid Boss">
 		<race>HUMANOID</race>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
index 17b3db7b8c..ae4980b088 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
@@ -3736,84 +3736,54 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26153" level="96" type="Folk" name="Enchanted Death Knight">
+	<npc id="26153" level="96" type="Monster" name="Enchanted Death Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="75" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="75" /> <!-- Caliburs -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
 			</speed>
-			<hitTime>710</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="12.0" grown="14.5" />
-			<height normal="31.0" grown="36" />
+			<radius normal="12" grown="14.5" />
+			<height normal="31" grown="36" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26154" level="96" type="Folk" name="Enhance Doom Wraith">
+	<npc id="26154" level="96" type="Monster" name="Enhance Doom Wraith">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="1472" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2534672" hpRegen="8.5" mp="23550" mpRegen="30" />
-			<attack physical="675215" magical="152004" random="10" critical="4" accuracy="5" attackSpeed="633" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="4315" magical="1249" />
+		<equipment rhand="1472" /> <!-- Dreadbane -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2766548.26498" hpRegen="8.5" mp="23550" mpRegen="3" />
+			<attack physical="3500.58319" magical="2390.44454" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="796.45232" magical="582.80924" />
 			<speed>
 				<walk ground="100" />
 				<run ground="230" />
 			</speed>
-			<hitTime>450</hitTime>
-			<attribute>
-				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
-				<attack type="DARK" value="300" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="15.0" grown="25" />
-			<height normal="45.0" grown="52" />
+			<radius normal="15" grown="25" />
+			<height normal="45" grown="52" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26155" level="96" type="Monster" name="Enhanced Validus">
@@ -4025,157 +3995,101 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26158" level="91" type="Folk" name="Enhanced Demonic Bathus">
+	<npc id="26158" level="91" type="Monster" name="Enhanced Demonic Bathus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26159" level="91" type="Folk" name="Enhanced Demonic Krakos">
+	<npc id="26159" level="91" type="Monster" name="Enhanced Demonic Krakos">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="15304" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="31302.9915094253" magical="8891.76157255424" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="271.97" magical="154.62" />
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="25.0" grown="32" />
-			<height normal="36.0" grown="55" />
+			<radius normal="25" grown="32" />
+			<height normal="36" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26160" level="91" type="Folk" name="Enhanced Demonic Lotus">
+	<npc id="26160" level="91" type="Monster" name="Enhanced Demonic Lotus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="28.0" grown="32" />
+			<radius normal="28" grown="32" />
 			<height normal="46.15" grown="55" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26161" level="91" type="Folk" name="Enhanced Demonic Rakzan">
+	<npc id="26161" level="91" type="Monster" name="Enhanced Demonic Rakzan">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2507240" hpRegen="8.5" mp="22058" mpRegen="30" />
-			<attack physical="62605.9830188506" magical="17783.5231451085" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="271.97" magical="154.62" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2736608.83281" hpRegen="8.5" mp="22058" mpRegen="3" />
+			<attack physical="2946.71599" magical="2012.22503" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="766.6258" magical="560.9835" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="200" water="200" wind="150" earth="200" holy="200" dark="200" />
-				<attack type="EARTH" value="200" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="42.0" grown="48" />
-			<height normal="79.0" grown="93" />
+			<radius normal="42" grown="48" />
+			<height normal="79" grown="93" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26194" level="101" type="RaidBoss" name="Dimensional Makkum">
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
index 8492c1e6f7..f0dfde5487 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
@@ -5452,24 +5452,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26281" level="101" type="Folk" name="Ashen Shadow Squad Fighter" title="Raid Fighter">
+	<npc id="26281" level="101" type="Monster" name="Ashen Shadow Squad Fighter" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5478,37 +5473,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26282" level="101" type="Folk" name="Ashen Shadow Squad Scout" title="Raid Fighter">
+	<npc id="26282" level="101" type="Monster" name="Ashen Shadow Squad Scout" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="559001" magical="340486" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="220" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5517,37 +5497,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26283" level="101" type="Folk" name="Ashen Shadow Squad Wizard" title="Raid Fighter">
+	<npc id="26283" level="101" type="Monster" name="Ashen Shadow Squad Wizard" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5556,37 +5521,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26284" level="101" type="Folk" name="Ashen Shadow Squad Healer" title="Raid Fighter">
+	<npc id="26284" level="101" type="Monster" name="Ashen Shadow Squad Healer" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1786888" hpRegen="11.4" mp="72788" mpRegen="30" />
-			<attack physical="1118002" magical="340486" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="27522" magical="8310" />
+			<vitals hp="1786890.17341" hpRegen="11.4" mp="72788" mpRegen="30" />
+			<attack physical="138238" magical="13872" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5898" magical="2388" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="500" water="500" wind="500" earth="500" holy="450" dark="500" />
-				<attack type="DARK" value="400" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -5595,19 +5545,10 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-			<skill id="5598" level="12" /> <!-- Petrifaction Attack Resistance -->
+			<skill id="5598" level="1" /> <!-- Petrifaction Attack Resistance -->
 			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
 		</skillList>
 	</npc>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26300-26399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
index 32ab43e259..03c971284a 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
@@ -408,48 +408,25 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26313" level="106" type="Folk" name="Lithra Bud" title="Raid Fighter">
+	<npc id="26313" level="106" type="Monster" name="Lithra Bud" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>PLANT</race>
-		<sex>FEMALE</sex>
+		<race>ETC</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3831006" hpRegen="11.4" mp="26228" mpRegen="30" />
-			<attack physical="914348" magical="103326" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="8532" magical="6418" />
+			<vitals hp="3831009.82659" hpRegen="11.4" mp="26228" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" canMove="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="60" />
 			<height normal="123" />
 		</collision>
-		<skillList>
-			<skill id="4416" level="5" /> <!-- Plants -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
-		</skillList>
 	</npc>
 	<npc id="26314" level="106" type="Monster" name="Lithra Aprias" title="Raid Fighter">
 		<race>PLANT</race>
@@ -689,24 +666,19 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26318" level="106" type="Folk" name="Spezion's Despair" title="Raid Fighter">
+	<npc id="26318" level="106" type="Monster" name="Spezion's Despair" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -715,38 +687,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26319" level="106" type="Folk" name="Spezion's Lunacy" title="Raid Fighter">
+	<npc id="26319" level="106" type="Monster" name="Spezion's Lunacy" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -755,38 +711,22 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26320" level="106" type="Folk" name="Spezion's Rage" title="Raid Fighter">
+	<npc id="26320" level="106" type="Monster" name="Spezion's Rage" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="22216" magical="8996" />
+			<vitals hp="144198" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="10098" />
 			<speed>
 				<walk ground="40" />
 				<run ground="200" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="650" water="650" wind="600" earth="650" holy="650" dark="650" />
-				<attack type="EARTH" value="500" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -795,18 +735,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="26321" level="108" type="RaidBoss" name="Etis van Etina" title="Overlord">
@@ -2484,64 +2413,45 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26353" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26353" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="23" />
-			<height normal="40" />
+			<radius normal="23" grown="32" />
+			<height normal="40" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26354" level="112" type="Folk" name="Halisha's Breath">
+	<npc id="26354" level="116" type="Monster" name="Halisha's Breath">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="876629" hpRegen="12.6" mp="2862" mpRegen="30" />
-			<attack physical="3124230" magical="284760" random="20" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="876628.90173" hpRegen="12.9" mp="2862" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</speed>
-			<hitTime>430</hitTime>
-			<attribute>
-				<defence fire="1300" water="1300" wind="1300" earth="1300" holy="1250" dark="1300" />
-				<attack type="DARK" value="1150" />
-			</attribute>
-			<abnormalResist physical="10" magical="10" />
+			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2550,16 +2460,7 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -3026,24 +2927,20 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26363" level="108" type="Folk" name="Curain" title="Screaming Ghost">
+	<npc id="26363" level="108" type="Monster" name="Curain" title="Screaming Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1562147" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="1562150.28902" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3052,41 +2949,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26364" level="108" type="Folk" name="Flan" title="Suffering Ghost">
+	<npc id="26364" level="108" type="Monster" name="Flan" title="Suffering Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3095,41 +2978,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16514" level="6" /> <!-- Party Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="26365" level="108" type="Folk" name="Aschedor" title="Howling Ghost">
+	<npc id="26365" level="108" type="Monster" name="Aschedor" title="Howling Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="3201558048" sp="2881008" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3138,41 +3007,27 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26366" level="108" type="Folk" name="Panahon" title="Wailing Ghost">
+	<npc id="26366" level="108" type="Monster" name="Panahon" title="Wailing Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="4573664352" sp="4105728" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="6248590" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="6248590.17341" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="46" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3181,42 +3036,28 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16515" level="6" /> <!-- Party Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="26367" level="108" type="Folk" name="Yehan Klodekus' Ghost">
+	<npc id="26367" level="108" type="Monster" name="Yehan Klodekus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3225,38 +3066,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26368" level="108" type="Folk" name="Yehan Klanikus' Ghost">
+	<npc id="26368" level="108" type="Monster" name="Yehan Klanikus' Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="2286832176" sp="2052864" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="312429" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="2082836" magical="237326" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="312428.90173" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3265,38 +3092,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26369" level="108" type="Folk" name="Yehan Klodekus">
+	<npc id="26369" level="108" type="Monster" name="Yehan Klodekus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13982" />
+		<equipment rhand="13982" /> <!-- Monster Only (Death Knight_pole) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3305,38 +3118,24 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26370" level="108" type="Folk" name="Yehan Klanikus">
+	<npc id="26370" level="108" type="Monster" name="Yehan Klanikus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="13983" />
+		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
+		<acquire exp="22868345088" sp="20575296" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="31242952" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="7220" magical="2923" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="73" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -3345,56 +3144,31 @@
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26371" level="108" type="Folk" name="Zahak" title="Tauti Underling">
+	<npc id="26371" level="108" type="Monster" name="Zahak" title="Tauti Underling">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3124295" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="5054" magical="3801" />
+			<vitals hp="31243" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="260354" magical="23732" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="11108" magical="994" />
 			<speed>
 				<walk ground="30" />
 				<run ground="230" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="700" water="700" wind="700" earth="700" holy="650" dark="700" />
-				<attack type="DARK" value="550" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
-			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="26388" level="107" type="RaidBoss" name="Death Reaper" title="Raid Soul Reaver">
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
index d81081c612..24f1e89472 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
@@ -2071,24 +2071,19 @@
 			<height normal="87" />
 		</collision>
 	</npc>
-	<npc id="26447" level="115" type="Folk" name="Handy Cannon Gunner">
+	<npc id="26447" level="116" type="Monster" name="Handy Cannon Gunner">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="191358" magical="9966" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="600" distance="10" width="0" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25848" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="30" />
 				<run ground="80" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2099,36 +2094,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="9" /> <!-- Bow -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26448" level="115" type="Folk" name="Anchor Warrior">
+	<npc id="26448" level="116" type="Monster" name="Anchor Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2139,36 +2121,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26449" level="115" type="Folk" name="Operator">
+	<npc id="26449" level="116" type="Monster" name="Operator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="150" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2179,36 +2148,23 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26450" level="115" type="Folk" name="Axe Warrior">
+	<npc id="26450" level="116" type="Monster" name="Axe Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="578574" hpRegen="11.4" mp="25460" mpRegen="30" />
-			<attack physical="382715" magical="9966" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="88051" magical="43583" />
+			<vitals hp="578573.98844" hpRegen="12.9" mp="25460" mpRegen="30" />
+			<attack physical="246033" magical="224236" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="100432" magical="495592" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="1600" water="1600" wind="1600" earth="1600" holy="1550" dark="1600" />
-				<attack type="DARK" value="1450" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -2219,14 +2175,6 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -2353,42 +2301,29 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="26454" level="125" type="Folk" name="Zahak">
+	<npc id="26454" level="125" type="Monster" name="Zahak">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="48424000" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="109348" magical="1457528" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="80806" magical="39846" />
+			<vitals hp="48424" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2350" holy="2300" dark="2350" />
-				<attack type="DARK" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="16" grown="1.2" />
+			<height normal="50" grown="50" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
@@ -3364,42 +3299,97 @@
 			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26480" level="85" type="Folk" name="Bathin" title="Raid Boss">
+	<npc id="26480" level="125" type="RaidBoss" name="Bathin" title="Raid Boss">
 		<!-- 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="141473764" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+		<sex>MALE</sex>
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="141474" hpRegen="13.4" mp="66584" mpRegen="30" />
+			<attack physical="639686" magical="583012" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="301296" magical="1458092" />
 			<speed>
 				<walk ground="100" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="56" />
 			<height normal="125" />
 		</collision>
 	</npc>
-	<npc id="26481" level="85" type="Folk" name="Bathin" title="Raid Boss">
+	<npc id="26481" level="125" type="RaidBoss" name="Bathin" title="Raid Boss">
 		<!-- 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="141473764" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="15087915390625" sp="13579123750" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="141474" hpRegen="13.4" mp="66584" mpRegen="30" />
+			<attack physical="639686" magical="583012" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="301296" magical="1458092" />
 			<speed>
 				<walk ground="100" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="56" />
 			<height normal="125" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32909" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="35566" min="1" max="1" chance="35" /> <!-- Dark Weapon Enhancement Stone -->
+				<item id="35568" min="1" max="1" chance="65" /> <!-- Bloody Weapon Enhancement Stone -->
+				<item id="46447" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46448" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46449" min="1" max="1" chance="7.75" /> <!-- Kain's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46450" min="1" max="1" chance="4.65" /> <!-- Kain's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46462" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46463" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46464" min="1" max="1" chance="7.75" /> <!-- Mermoden's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46465" min="1" max="1" chance="4.65" /> <!-- Mermoden's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46477" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46478" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46479" min="1" max="1" chance="11.5" /> <!-- Leona's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46480" min="1" max="1" chance="6.9" /> <!-- Leona's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46492" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46493" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46494" min="1" max="1" chance="11.5" /> <!-- Pantheon's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46495" min="1" max="1" chance="6.9" /> <!-- Pantheon's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46507" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46508" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 5 - Weapon -->
+				<item id="81153" min="1" max="1" chance="35" /> <!-- Navari's Mask -->
+				<item id="80090" min="1" max="1" chance="7.15" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="7.15" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="7.15" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="7.15" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="7.15" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="7.15" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="7.15" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="7.15" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="7.15" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="7.15" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="7.15" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="7.15" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="7.1" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="7.1" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="20" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="20" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="20" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="20" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="20" /> <!-- Leviathan Boots - Heavy armor -->
+			</drop>
+		</dropLists>
 	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
index 446170662b..2526ff5b84 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
@@ -1977,36 +1977,21 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29232" level="99" type="Folk" name="Reward" title="Earth Wyrm">
+	<npc id="29232" level="99" type="Monster" name="Reward" title="Earth Wyrm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>CONSTRUCT</race>
+		<race>ETC</race>
 		<sex>MALE</sex>
-		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="13007.8303806237" hpRegen="8.5" mp="2355" mpRegen="3" />
-			<attack physical="3899.90823712927" magical="1917.45487198718" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="405.66735" magical="296.84976" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="14197.47634" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<attack physical="13491.48739" magical="2372.82433" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1051.40069" magical="609.53854" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
 			<hitTime>600</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="true" targetable="false" showName="false" />
-		<skillList>
-			<skill id="4416" level="2" /> <!-- Magical Creatures -->
-			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="0.1" />
 			<height normal="0.1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
index 253460787f..33d75a4ab4 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
@@ -1798,26 +1798,21 @@
 			<height normal="101" />
 		</collision>
 	</npc>
-	<npc id="29328" level="125" type="Folk" name="Torfedo">
+	<npc id="29328" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="13996" magical="10526" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1826,40 +1821,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29329" level="125" type="Folk" name="Harane">
+	<npc id="29329" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="14419824" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="1041418" magical="118663" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="19994" magical="8096" />
+			<vitals hp="144198" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1868,40 +1850,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="29330" level="125" type="Folk" name="Escrito" title="Fragment of the Sea of Spores">
+	<npc id="29330" level="125" type="Monster" name="Escrito" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="32" />
 			<height normal="63.4" />
@@ -1910,41 +1879,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29331" level="125" type="Folk" name="Aranea" title="Fragment of the Sea of Spores">
+	<npc id="29331" level="125" type="Monster" name="Aranea" title="Fragment of the Sea of Spores">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="18.5" />
@@ -1953,41 +1908,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29332" level="125" type="Folk" name="Torfedo">
+	<npc id="29332" level="125" type="Monster" name="Torfedo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -1996,41 +1937,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29333" level="125" type="Folk" name="Harane">
+	<npc id="29333" level="125" type="Monster" name="Harane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2039,41 +1966,27 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
-	<npc id="29334" level="125" type="Folk" name="Escrito">
+	<npc id="29334" level="125" type="Monster" name="Escrito">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="192256" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="4665" magical="3508" />
+			<vitals hp="192256.06936" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2350" earth="2300" holy="2350" dark="2350" />
-				<attack type="WIND" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="80" />
@@ -2082,41 +1995,27 @@
 			<skill id="4416" level="3" /> <!-- Beasts -->
 			<skill id="5464" level="1" /> <!-- Wind Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="5" /> <!-- One-handed Blunt Weapon -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16512" level="6" /> <!-- Solo Mage Monster -->
 		</skillList>
 	</npc>
-	<npc id="29335" level="125" type="Folk" name="Aranea">
+	<npc id="29335" level="125" type="Monster" name="Aranea">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="288385" hpRegen="11.4" mp="25848" mpRegen="30" />
-			<attack physical="130177" magical="11866" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="6664" magical="2698" />
+			<vitals hp="288384.9711" hpRegen="13.4" mp="25848" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="140" />
 				<run ground="180" />
 			</speed>
 			<hitTime>600</hitTime>
-			<attribute>
-				<defence fire="2350" water="2350" wind="2300" earth="2350" holy="2350" dark="2350" />
-				<attack type="EARTH" value="2200" />
-			</attribute>
-			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="true" noSleepMode="true" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="48" />
 			<height normal="31.4" />
@@ -2125,19 +2024,10 @@
 			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="5465" level="1" /> <!-- Earth Attribute -->
 			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
-			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="16511" level="6" /> <!-- Solo Fighter Monster -->
 		</skillList>
 	</npc>
 	<npc id="29336" level="125" type="GrandBoss" name="Lilith" title="Apostle">
@@ -5942,24 +5832,36 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29380" level="85" type="Folk" name="Baylor" title="Warden">
+	<npc id="29380" level="116" type="RaidBoss" name="Baylor" title="Warden">
 		<!-- 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="15971366" hpRegen="10.5" mp="22800" mpRegen="3.6" />
+		<race>DEMONIC</race>
+		<sex>MALE</sex>
+		<acquire exp="3321740194048" sp="2989566078" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="15971399.832" hpRegen="12.9" mp="22800" mpRegen="30" />
+			<attack physical="492066" magical="448472" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="200864" magical="991184" />
 			<speed>
 				<walk ground="34" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="69.12" />
 			<height normal="93.48" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="33180" level="1" /> <!-- Party's Instance Zone Bonus -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
+		</skillList>
 	</npc>
 	<npc id="29381" level="125" type="GrandBoss" name="Queen Ant" title="Wasteland Mistress">
 		<race>BUG</race>
@@ -6061,81 +5963,157 @@
 			<height normal="109" />
 		</collision>
 	</npc>
-	<npc id="29385" level="85" type="Folk" name="Eigis" title="Lady of Despair">
+	<npc id="29385" level="127" type="RaidBoss" name="Eigis" title="Lady of Despair">
 		<!-- 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="761086172" hpRegen="10.5" mp="68076" mpRegen="3.6" />
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="40034117754185" sp="36030705842" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="761086" hpRegen="13.4" mp="68076" mpRegen="30" />
+			<attack physical="639686" magical="583012" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="301296" magical="1458092" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="36" />
 			<height normal="123" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32909" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="46447" min="3" max="3" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46448" min="2" max="2" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46449" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46450" min="1" max="1" chance="15.5" /> <!-- Kain's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46462" min="3" max="3" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46463" min="2" max="2" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46464" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46465" min="1" max="1" chance="15.5" /> <!-- Mermoden's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46477" min="3" max="3" chance="23" /> <!-- Leona's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46478" min="2" max="2" chance="23" /> <!-- Leona's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46479" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46480" min="1" max="1" chance="23" /> <!-- Leona's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46492" min="3" max="3" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46493" min="2" max="2" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46494" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46495" min="1" max="1" chance="23" /> <!-- Pantheon's Soul Crystal Lv. 7 - Weapon -->
+				<item id="46507" min="3" max="3" chance="23" /> <!-- Lionel's Soul Crystal Lv. 4 - Weapon -->
+				<item id="46508" min="2" max="2" chance="23" /> <!-- Lionel's Soul Crystal Lv. 5 - Weapon -->
+				<item id="46509" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 6 - Weapon -->
+				<item id="46510" min="1" max="1" chance="23" /> <!-- Lionel's Soul Crystal Lv. 7 - Weapon -->
+				<item id="80333" min="1" max="1" chance="34" /> <!-- Dragon's Necklace -->
+				<item id="80334" min="1" max="1" chance="33" /> <!-- Dragon's Earring -->
+				<item id="80335" min="1" max="1" chance="33" /> <!-- Dragon's Ring -->
+				<item id="80090" min="2" max="2" chance="7.15" /> <!-- Krishna Shaper -->
+				<item id="80091" min="2" max="2" chance="7.15" /> <!-- Krishna Cutter -->
+				<item id="80092" min="2" max="2" chance="7.15" /> <!-- Krishna Slasher -->
+				<item id="80093" min="2" max="2" chance="7.15" /> <!-- Krishna Avenger -->
+				<item id="80094" min="2" max="2" chance="7.15" /> <!-- Krishna Fighter -->
+				<item id="80095" min="2" max="2" chance="7.15" /> <!-- Krishna Stormer -->
+				<item id="80096" min="2" max="2" chance="7.15" /> <!-- Krishna Thrower -->
+				<item id="80097" min="2" max="2" chance="7.15" /> <!-- Krishna Guardian -->
+				<item id="80098" min="2" max="2" chance="7.15" /> <!-- Krishna Buster -->
+				<item id="80099" min="2" max="2" chance="7.15" /> <!-- Krishna Caster -->
+				<item id="80100" min="2" max="2" chance="7.15" /> <!-- Krishna Retributer -->
+				<item id="80101" min="2" max="2" chance="7.15" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="2" max="2" chance="7.1" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="2" max="2" chance="7.1" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="4" max="4" chance="20" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="4" max="4" chance="20" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="4" max="4" chance="20" /> <!-- Leviathan Gaiters - Heavy armor -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="29386" level="85" type="Folk" name="Magic Device" title="Owned by Eigis">
+	<npc id="29386" level="126" type="Monster" name="Magic Device" title="Owned by Eigis">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="250" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="145.66474" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="56" />
 			<height normal="143" />
 		</collision>
 	</npc>
-	<npc id="29387" level="85" type="Folk" name="Antharas" title="Earth Dragon">
+	<npc id="29387" level="120" type="RaidBoss" name="Antharas" title="Earth Dragon">
 		<!-- 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="87492600" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="66257649331200" sp="59631884352" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="87492600.168" hpRegen="13.4" mp="66584" mpRegen="30" />
+			<attack physical="639686" magical="583012" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="301296" magical="1458092" />
 			<speed>
 				<walk ground="60" />
 				<run ground="250" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="33" />
 			<height normal="90" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+			<skill id="32968" level="1" /> <!-- Shield of Limit -->
+		</skillList>
 	</npc>
-	<npc id="29388" level="85" type="Folk" name="Antharas" title="Earth Dragon's Avatar">
+	<npc id="29388" level="120" type="Monster" name="Antharas" title="Earth Dragon's Avatar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="7874334" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<vitals hp="10837445.08671" hpRegen="13.4" mp="66584" mpRegen="30" />
+			<attack physical="319843" magical="291506" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="150648" magical="729046" />
 			<speed>
 				<walk ground="60" />
 				<run ground="250" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="33" />
 			<height normal="90" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+			<skill id="32968" level="1" /> <!-- Shield of Limit -->
+		</skillList>
 	</npc>
 	<npc id="29389" level="85" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -6156,20 +6134,21 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29390" level="85" type="Folk" name="Antharas' Symbol">
+	<npc id="29390" level="120" type="Monster" name="Antharas' Symbol">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2624778" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2624779.76879" hpRegen="13.4" mp="2355" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="60" />
 			<height normal="100.5" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml
index 0f1a98aeb9..bcb85247df 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml
@@ -1922,7 +1922,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="33086" toLevel="2" name="Antharas' Claw">
+	<skill id="33086" toLevel="3" name="Antharas' Claw">
 		<!-- Antharas' power imbues his claws. P./ M. Atk. are increased. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34000-34099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34000-34099.xml
index 4589356a58..039ae4d6f0 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34000-34099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34000-34099.xml
@@ -901,7 +901,7 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="34065" toLevel="3" name="Energy of Insolence">
+	<skill id="34065" toLevel="7" name="Energy of Insolence">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>