From 47ef829870747c3c2cbb20b2e035fdbc44dc35d6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 23 Nov 2019 19:47:37 +0000
Subject: [PATCH] Updated Dungeon of Abyss monsters. Contributed by robikbobik.

---
 .../dist/game/data/stats/npcs/21600-21699.xml | 144 ++--
 .../dist/game/data/stats/npcs/21600-21699.xml | 309 ++++-----
 .../dist/game/data/stats/npcs/21600-21699.xml | 188 +++---
 .../dist/game/data/stats/npcs/21600-21699.xml |  98 ++-
 .../dist/game/data/stats/npcs/21600-21699.xml |  98 ++-
 .../dist/game/data/stats/npcs/21600-21699.xml |  98 ++-
 .../dist/game/data/stats/npcs/21600-21699.xml | 623 +++++-------------
 7 files changed, 576 insertions(+), 982 deletions(-)

diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml
index c7da5221df..0368e60b8b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml
@@ -2188,12 +2188,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment lhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.53512" hpRegen="5.5" mp="469.935" mpRegen="2.1" />
-			<attack physical="142.261856" magical="88.31491" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="124.2995273" magical="100.0527" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -2220,50 +2219,48 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="503" min="1" max="1" chance="0.03" /> <!-- Sealed Zubei's Helmet -->
+				<item id="2415" min="1" max="1" chance="0.03" /> <!-- Sealed Avadon Circlet -->
+				<item id="2416" min="1" max="1" chance="0.0075" /> <!-- Sealed Blue Wolf Helmet -->
+				<item id="2417" min="1" max="1" chance="0.0075" /> <!-- Sealed Doom Helmet -->
+				<item id="57" min="672" max="1570" chance="70" /> <!-- Adena -->
+				<item id="1870" min="1" max="1" chance="29.07" /> <!-- Coal -->
+				<item id="4102" min="1" max="1" chance="2.327" /> <!-- Sealed Zubei's Helmet Design -->
+				<item id="4072" min="1" max="1" chance="2.273" /> <!-- Sealed Avadon Circlet Pattern -->
+				<item id="1875" min="1" max="1" chance="2.021" /> <!-- Stone of Purity -->
+				<item id="4088" min="1" max="1" chance="1.943" /> <!-- Sealed Blue Wolf Helmet Design -->
+				<item id="1874" min="1" max="1" chance="1.93" /> <!-- Oriharukon Ore -->
+				<item id="4089" min="1" max="1" chance="1.912" /> <!-- Sealed Doom Helmet Design -->
+				<item id="90012" min="1" max="1" chance="0.03" /> <!-- Common Life Stone -->
+			</drop>
+			<spoil>
+				<item id="1870" min="1" max="1" chance="80.73" /> <!-- Coal -->
+				<item id="1874" min="1" max="1" chance="21.16" /> <!-- Oriharukon Ore -->
+				<item id="1875" min="1" max="1" chance="20.3" /> <!-- Stone of Purity -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="21639" level="43" type="Monster" name="Wandering Spirit of the Dungeon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<parameters>
-			<param name="MoveAroundSocial" value="139" />
-			<param name="MoveAroundSocial1" value="35" />
-			<param name="MoveAroundSocial2" value="139" />
-			<param name="SoulShot" value="200" />
-			<param name="SoulShotRate" value="5" />
-			<param name="SpiritShot" value="100" />
-			<param name="SpiritShotRate" value="10" />
-			<param name="LongRangeGuardRate" value="10" />
-			<skill name="PhysicalSpecial" id="4124" level="3" />
-		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.51575" hpRegen="5.5" mp="492.945" mpRegen="2.1" />
-			<attack physical="278.4866334" magical="94.1437" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="154.630058" magical="102.86506" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
 			</speed>
-			<hitTime>720</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" canBeSown="true" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4124" level="3" /> <!-- NPC Spear Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4085" level="1" /> <!-- Critical Damage -->
 			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
-		<shots shotChance="30" spiritChance="30" />
-		<exCrtEffect>false</exCrtEffect>
-		<sNpcPropHpRate>0.5</sNpcPropHpRate>
-		<ai clanHelpRange="300" aggroRange="300">
-			<clanList>
-				<clan>LIZARDMAN</clan>
-			</clanList>
-		</ai>
 		<collision>
 			<radius normal="10" grown="12" />
 			<height normal="22" grown="27" />
@@ -2285,12 +2282,11 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="7" /> <!-- Apprentice's Rod -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.53512" hpRegen="5.5" mp="469.935" mpRegen="2.1" />
-			<attack physical="195.425233" magical="100.26304" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="92.26592261" magical="105.72243" evasion="10" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2334,12 +2330,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.51575" hpRegen="5.5" mp="492.945" mpRegen="2.1" />
-			<attack physical="197.2667018" magical="106.67987" random="50" critical="1" accuracy="9" attackSpeed="182" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="163.287157" magical="108.62405" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2382,12 +2377,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2323" sp="69" />
+		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="5608.72501" hpRegen="5.5" mp="516.84" mpRegen="2.1" />
-			<attack physical="368.9958967" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="129.597392" magical="111.56912" evasion="10" />
+			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
 				<run ground="174" />
@@ -2432,12 +2426,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2430" sp="72" />
+		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="17492.9362" hpRegen="5.5" mp="539.85" mpRegen="2.1" />
-			<attack physical="446.485035" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="107.1052826" magical="111.56912" evasion="10" />
+			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
 				<run ground="174" />
@@ -2482,11 +2475,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="505.18181" hpRegen="5.5" mp="563.745" mpRegen="2.1" />
-			<attack physical="193.4031711" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="114.5511044" magical="111.56912" />
+			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2531,11 +2524,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="524.14768" hpRegen="5.5" mp="588.525" mpRegen="2.1" />
-			<attack physical="205.3941618" magical="120.43155" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="117.618595" magical="114.55675" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
 				<run ground="174" />
@@ -2580,11 +2573,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="505.18181" hpRegen="5.5" mp="563.745" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
@@ -2624,11 +2617,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="524.14768" hpRegen="5.5" mp="588.525" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2670,7 +2663,7 @@
 		<sex>MALE</sex>
 		<acquire exp="2764" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="6521.54987" hpRegen="5.5" mp="612.42" mpRegen="2.1" />
+			<vitals hp="6522.04249" hpRegen="5.5" mp="754.905" mpRegen="2.1" />
 			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
@@ -2696,7 +2689,6 @@
 		</collision>
 	</npc>
 	<npc id="21649" level="49" type="Monster" name="Condemned of Abyss" title="Captured">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -2712,11 +2704,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2881" sp="86" />
+		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="20276.73182" hpRegen="5.5" mp="637.2" mpRegen="2.1" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="230.25444" />
+			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
 				<run ground="174" />
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/21600-21699.xml
index 0bc681089c..2e155a05a3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/npcs/21600-21699.xml
@@ -2786,12 +2786,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.53512" hpRegen="5.5" mp="469.935" mpRegen="2.1" />
-			<attack physical="142.261856" magical="88.31491" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="124.2995273" magical="100.0527" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -2818,50 +2817,48 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="503" min="1" max="1" chance="0.03" /> <!-- Sealed Zubei's Helmet -->
+				<item id="2415" min="1" max="1" chance="0.03" /> <!-- Sealed Avadon Circlet -->
+				<item id="2416" min="1" max="1" chance="0.0075" /> <!-- Sealed Blue Wolf Helmet -->
+				<item id="2417" min="1" max="1" chance="0.0075" /> <!-- Sealed Doom Helmet -->
+				<item id="57" min="672" max="1570" chance="70" /> <!-- Adena -->
+				<item id="1870" min="1" max="1" chance="29.07" /> <!-- Coal -->
+				<item id="4102" min="1" max="1" chance="2.327" /> <!-- Sealed Zubei's Helmet Design -->
+				<item id="4072" min="1" max="1" chance="2.273" /> <!-- Sealed Avadon Circlet Pattern -->
+				<item id="1875" min="1" max="1" chance="2.021" /> <!-- Stone of Purity -->
+				<item id="4088" min="1" max="1" chance="1.943" /> <!-- Sealed Blue Wolf Helmet Design -->
+				<item id="1874" min="1" max="1" chance="1.93" /> <!-- Oriharukon Ore -->
+				<item id="4089" min="1" max="1" chance="1.912" /> <!-- Sealed Doom Helmet Design -->
+				<item id="90012" min="1" max="1" chance="0.03" /> <!-- Common Life Stone -->
+			</drop>
+			<spoil>
+				<item id="1870" min="1" max="1" chance="80.73" /> <!-- Coal -->
+				<item id="1874" min="1" max="1" chance="21.16" /> <!-- Oriharukon Ore -->
+				<item id="1875" min="1" max="1" chance="20.3" /> <!-- Stone of Purity -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="21639" level="43" type="Monster" name="Wandering Spirit of the Dungeon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<parameters>
-			<param name="MoveAroundSocial" value="139" />
-			<param name="MoveAroundSocial1" value="35" />
-			<param name="MoveAroundSocial2" value="139" />
-			<param name="SoulShot" value="200" />
-			<param name="SoulShotRate" value="5" />
-			<param name="SpiritShot" value="100" />
-			<param name="SpiritShotRate" value="10" />
-			<param name="LongRangeGuardRate" value="10" />
-			<skill name="PhysicalSpecial" id="4124" level="3" />
-		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.51575" hpRegen="5.5" mp="492.945" mpRegen="2.1" />
-			<attack physical="278.4866334" magical="94.1437" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="154.630058" magical="102.86506" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="60" />
+				<run ground="174" />
 			</speed>
-			<hitTime>720</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" canBeSown="true" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4124" level="3" /> <!-- NPC Spear Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4085" level="1" /> <!-- Critical Damage -->
 			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
-		<shots shotChance="30" spiritChance="30" />
-		<exCrtEffect>false</exCrtEffect>
-		<sNpcPropHpRate>0.5</sNpcPropHpRate>
-		<ai clanHelpRange="300" aggroRange="300">
-			<clanList>
-				<clan>LIZARDMAN</clan>
-			</clanList>
-		</ai>
 		<collision>
 			<radius normal="10" grown="12" />
 			<height normal="22" grown="27" />
@@ -2883,15 +2880,14 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="7" /> <!-- Apprentice's Rod -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.53512" hpRegen="5.5" mp="469.935" mpRegen="2.1" />
-			<attack physical="195.425233" magical="100.26304" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="92.26592261" magical="105.72243" evasion="10" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>480</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -2913,8 +2909,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="10" />
-			<height normal="29" />
+			<radius normal="15" />
+			<height normal="28" />
 		</collision>
 	</npc>
 	<npc id="21641" level="43" type="Monster" name="Wandering Evil Thoughts of the Dungeon">
@@ -2932,12 +2928,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.51575" hpRegen="5.5" mp="492.945" mpRegen="2.1" />
-			<attack physical="197.2667018" magical="106.67987" random="50" critical="1" accuracy="9" attackSpeed="182" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="163.287157" magical="108.62405" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2980,15 +2975,14 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2323" sp="69" />
+		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="5608.72501" hpRegen="5.5" mp="516.84" mpRegen="2.1" />
-			<attack physical="368.9958967" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="129.597392" magical="111.56912" evasion="10" />
+			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="173.43552" magical="126.91259" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="100" />
+				<run ground="174" />
 			</speed>
 			<hitTime>720</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3030,15 +3024,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2430" sp="72" />
+		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="17492.9362" hpRegen="5.5" mp="539.85" mpRegen="2.1" />
-			<attack physical="446.485035" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="107.1052826" magical="111.56912" evasion="10" />
+			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="177.78746" magical="130.09715" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="45" />
+				<run ground="174" />
 			</speed>
 			<hitTime>720</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3080,14 +3073,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="505.18181" hpRegen="5.5" mp="563.745" mpRegen="2.1" />
-			<attack physical="193.4031711" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="114.5511044" magical="111.56912" />
+			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="182.18816" magical="133.31739" />
 			<speed>
-				<walk ground="100" />
-				<run ground="150" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>460</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3108,8 +3101,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="12" />
-			<height normal="50" />
+			<radius normal="14" />
+			<height normal="36" />
 		</collision>
 	</npc>
 	<npc id="21645" level="47" type="Monster" name="Wandering Spirit of Abyss">
@@ -3129,13 +3122,13 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="524.14768" hpRegen="5.5" mp="588.525" mpRegen="2.1" />
-			<attack physical="205.3941618" magical="120.43155" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="117.618595" magical="114.55675" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
-				<walk ground="100" />
+				<walk ground="27" />
 				<run ground="174" />
 			</speed>
 			<hitTime>460</hitTime>
@@ -3160,7 +3153,7 @@
 		</ai>
 		<collision>
 			<radius normal="12" />
-			<height normal="50" />
+			<height normal="31" />
 		</collision>
 	</npc>
 	<npc id="21646" level="46" type="Monster" name="Wandering Ghost of Abyss">
@@ -3178,14 +3171,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="505.18181" hpRegen="5.5" mp="563.745" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="191.12803" magical="139.8592" />
 			<speed>
-				<walk ground="45" />
-				<run ground="180" />
+				<walk ground="60" />
+				<run ground="174" />
 			</speed>
 			<hitTime>520</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3201,8 +3194,8 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
-			<radius normal="14" />
-			<height normal="22" />
+			<radius normal="10" />
+			<height normal="36" />
 		</collision>
 	</npc>
 	<npc id="21647" level="47" type="Monster" name="Wandering Evil Thoughts of Abyss">
@@ -3222,14 +3215,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="524.14768" hpRegen="5.5" mp="588.525" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
-				<walk ground="45" />
-				<run ground="180" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>520</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3247,8 +3240,8 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="14" />
-			<height normal="22" />
+			<radius normal="9" />
+			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="21648" level="48" type="Monster" name="Abyss Warder" title="Wandering">
@@ -3268,12 +3261,12 @@
 		<sex>MALE</sex>
 		<acquire exp="2764" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="6521.54987" hpRegen="5.5" mp="612.42" mpRegen="2.1" />
+			<vitals hp="6522.04249" hpRegen="5.5" mp="754.905" mpRegen="2.1" />
 			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
-				<walk ground="80" />
-				<run ground="150" />
+				<walk ground="100" />
+				<run ground="174" />
 			</speed>
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3294,7 +3287,6 @@
 		</collision>
 	</npc>
 	<npc id="21649" level="49" type="Monster" name="Condemned of Abyss" title="Captured">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3310,14 +3302,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2881" sp="86" />
+		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="20276.73182" hpRegen="5.5" mp="637.2" mpRegen="2.1" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="230.25444" />
+			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="195.66302" magical="143.17771" />
 			<speed>
-				<walk ground="80" />
-				<run ground="150" />
+				<walk ground="70" />
+				<run ground="174" />
 			</speed>
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3339,7 +3331,7 @@
 			<height normal="17" grown="21" />
 		</collision>
 	</npc>
-	<npc id="21650" level="74" type="Monster" name="Swampland Watchman">
+	<npc id="21650" level="74" type="Monster" name="Swampland Watchman" title="Quest Monster">
 		<parameters>
 			<param name="MoveAroundSocial" value="215" />
 			<param name="MoveAroundSocial1" value="215" />
@@ -3360,12 +3352,12 @@
 		<acquire exp="6571" sp="197" />
 		<equipment rhand="150" lhand="103" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="1080.56197" hpRegen="8.5" mp="1305.375" mpRegen="3" />
+			<vitals hp="1080.31566" hpRegen="8.5" mp="1608.045" mpRegen="3" />
 			<attack physical="794.70901" magical="542.68324" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="319.24623" magical="233.61053" shield="160" shieldRate="20" />
 			<speed>
-				<walk ground="40" />
-				<run ground="165" />
+				<walk ground="52" />
+				<run ground="174" />
 			</speed>
 			<hitTime>170</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3385,31 +3377,11 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
-			<radius normal="10" />
-			<height normal="25" />
+			<radius normal="15" />
+			<height normal="31" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="57" min="538" max="1257" chance="70" /> <!-- Adena -->
-				<item id="1871" min="1" max="1" chance="15.24" /> <!-- Charcoal -->
-				<item id="1866" min="1" max="1" chance="10.82" /> <!-- Suede -->
-				<item id="1870" min="1" max="3" chance="7.876" /> <!-- Coal -->
-				<item id="1895" min="1" max="1" chance="4.529" /> <!-- Metallic Fiber -->
-				<item id="6345" min="1" max="1" chance="4.253" /> <!-- Sealed Phoenix Ring Gemstone -->
-				<item id="1876" min="1" max="1" chance="3.156" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="2.645" /> <!-- Cokes -->
-			</drop>
-			<spoil>
-				<item id="1866" min="1" max="1" chance="85.84" /> <!-- Suede -->
-				<item id="1871" min="1" max="3" chance="65.3" /> <!-- Charcoal -->
-				<item id="1870" min="1" max="3" chance="64.43" /> <!-- Coal -->
-				<item id="1895" min="1" max="1" chance="34.77" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="25.4" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="20.46" /> <!-- Cokes -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="21651" level="74" type="Monster" name="Flame Drake">
+	<npc id="21651" level="74" type="Monster" name="Flame Drake" title="Quest Monster">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3426,12 +3398,12 @@
 		<acquire exp="6571" sp="197" />
 		<equipment rhand="98" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="1080.56197" hpRegen="8.5" mp="1305.375" mpRegen="3" />
+			<vitals hp="1080.31566" hpRegen="8.5" mp="1608.045" mpRegen="3" />
 			<attack physical="794.70901" magical="542.68324" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="319.24623" magical="233.61053" />
 			<speed>
-				<walk ground="50" />
-				<run ground="170" />
+				<walk ground="70" />
+				<run ground="174" />
 			</speed>
 			<hitTime>210</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3450,28 +3422,8 @@
 			<radius normal="10" grown="12" />
 			<height normal="28" grown="33" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="57" min="538" max="1257" chance="70" /> <!-- Adena -->
-				<item id="1871" min="1" max="1" chance="16.22" /> <!-- Charcoal -->
-				<item id="1866" min="1" max="1" chance="10.54" /> <!-- Suede -->
-				<item id="1870" min="1" max="3" chance="7.844" /> <!-- Coal -->
-				<item id="1895" min="1" max="1" chance="4.449" /> <!-- Metallic Fiber -->
-				<item id="6345" min="1" max="1" chance="4.227" /> <!-- Sealed Phoenix Ring Gemstone -->
-				<item id="1876" min="1" max="1" chance="3.18" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="2.566" /> <!-- Cokes -->
-			</drop>
-			<spoil>
-				<item id="1866" min="1" max="1" chance="83.87" /> <!-- Suede -->
-				<item id="1870" min="1" max="3" chance="64.26" /> <!-- Coal -->
-				<item id="1871" min="1" max="3" chance="62.83" /> <!-- Charcoal -->
-				<item id="1895" min="1" max="1" chance="35.12" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="24.73" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="20.62" /> <!-- Cokes -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="21652" level="75" type="Monster" name="Fiery Ifrit">
+	<npc id="21652" level="75" type="Monster" name="Fiery Ifrit" title="Quest Monster">
 		<!-- L2wiki: https://l2wiki.com/classic/Fiery_Ifrit -->
 		<parameters>
 			<param name="MoveAroundSocial" value="62" />
@@ -3482,7 +3434,7 @@
 		<sex>MALE</sex>
 		<acquire exp="6750" sp="202" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="1098.78891" hpRegen="8.5" mp="1333.695" mpRegen="3" />
+			<vitals hp="1098.5426" hpRegen="8.5" mp="1643.445" mpRegen="3" />
 			<attack physical="766.0603913" magical="597.85136" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="337.07008" magical="246.65326" />
 			<speed>
@@ -3501,28 +3453,8 @@
 			<radius normal="10" />
 			<height normal="42" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="57" min="554" max="1294" chance="70" /> <!-- Adena -->
-				<item id="1871" min="1" max="1" chance="15.67" /> <!-- Charcoal -->
-				<item id="1866" min="1" max="1" chance="10.84" /> <!-- Suede -->
-				<item id="1870" min="1" max="3" chance="8.045" /> <!-- Coal -->
-				<item id="1895" min="1" max="1" chance="4.626" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="3.202" /> <!-- Mithril Ore -->
-				<item id="6341" min="1" max="1" chance="3.072" /> <!-- Sealed Phoenix Earring Gemstone -->
-				<item id="1879" min="1" max="1" chance="2.716" /> <!-- Cokes -->
-			</drop>
-			<spoil>
-				<item id="1866" min="1" max="1" chance="84.94" /> <!-- Suede -->
-				<item id="1871" min="1" max="3" chance="66.55" /> <!-- Charcoal -->
-				<item id="1870" min="1" max="3" chance="64.44" /> <!-- Coal -->
-				<item id="1895" min="1" max="1" chance="35.95" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="27.03" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="22" /> <!-- Cokes -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="21653" level="75" type="Monster" name="Ikedit">
+	<npc id="21653" level="75" type="Monster" name="Ikedit" title="Quest Monster">
 		<!-- L2wiki: https://l2wiki.com/classic/Ikedit -->
 		<parameters>
 			<param name="MoveAroundSocial" value="62" />
@@ -3533,7 +3465,7 @@
 		<sex>MALE</sex>
 		<acquire exp="6750" sp="202" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="1098.78891" hpRegen="8.5" mp="1333.695" mpRegen="3" />
+			<vitals hp="1098.5426" hpRegen="8.5" mp="1643.445" mpRegen="3" />
 			<attack physical="894.75854" magical="611.00409" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
@@ -3552,27 +3484,6 @@
 			<radius normal="28" />
 			<height normal="75" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="57" min="554" max="1294" chance="70" /> <!-- Adena -->
-				<item id="1871" min="1" max="1" chance="14.31" /> <!-- Charcoal -->
-				<item id="1870" min="1" max="1" chance="13.76" /> <!-- Coal -->
-				<item id="1866" min="1" max="1" chance="9.229" /> <!-- Suede -->
-				<item id="1895" min="1" max="1" chance="3.965" /> <!-- Metallic Fiber -->
-				<item id="6341" min="1" max="1" chance="3.07" /> <!-- Sealed Phoenix Earring Gemstone -->
-				<item id="1876" min="1" max="1" chance="2.813" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="2.286" /> <!-- Cokes -->
-				<item id="90045" min="1" max="1" chance="0.0075" /> <!-- Magical Tablet -->
-			</drop>
-			<spoil>
-				<item id="1866" min="1" max="1" chance="86.16" /> <!-- Suede -->
-				<item id="1870" min="1" max="3" chance="64.76" /> <!-- Coal -->
-				<item id="1871" min="1" max="3" chance="64.44" /> <!-- Charcoal -->
-				<item id="1895" min="1" max="1" chance="37.02" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="25.52" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="22.48" /> <!-- Cokes -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="21654" level="81" type="Monster" name="Dreco" title="Earth Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/21600-21699.xml
index 205701cc65..53cb6ca9c9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/npcs/21600-21699.xml
@@ -2726,12 +2726,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="142.261856" magical="88.31491" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="124.2995273" magical="100.0527" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -2782,48 +2781,24 @@
 		</dropLists>
 	</npc>
 	<npc id="21639" level="43" type="Monster" name="Wandering Spirit of the Dungeon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<parameters>
-			<param name="MoveAroundSocial" value="139" />
-			<param name="MoveAroundSocial1" value="35" />
-			<param name="MoveAroundSocial2" value="139" />
-			<param name="SoulShot" value="200" />
-			<param name="SoulShotRate" value="5" />
-			<param name="SpiritShot" value="100" />
-			<param name="SpiritShotRate" value="10" />
-			<param name="LongRangeGuardRate" value="10" />
-			<skill name="PhysicalSpecial" id="4124" level="3" />
-		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
-			<attack physical="278.4866334" magical="94.1437" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="154.630058" magical="102.86506" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="60" />
+				<run ground="174" />
 			</speed>
-			<hitTime>720</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" canBeSown="true" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4124" level="3" /> <!-- NPC Spear Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4085" level="1" /> <!-- Critical Damage -->
 			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
-		<shots shotChance="30" spiritChance="30" />
-		<exCrtEffect>false</exCrtEffect>
-		<sNpcPropHpRate>0.5</sNpcPropHpRate>
-		<ai clanHelpRange="300" aggroRange="300">
-			<clanList>
-				<clan>LIZARDMAN</clan>
-			</clanList>
-		</ai>
 		<collision>
 			<radius normal="10" grown="12" />
 			<height normal="22" grown="27" />
@@ -2845,15 +2820,14 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="7" /> <!-- Apprentice's Rod -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="195.425233" magical="100.26304" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="92.26592261" magical="105.72243" evasion="10" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>480</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -2875,8 +2849,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="10" />
-			<height normal="29" />
+			<radius normal="15" />
+			<height normal="28" />
 		</collision>
 	</npc>
 	<npc id="21641" level="43" type="Monster" name="Wandering Evil Thoughts of the Dungeon">
@@ -2894,12 +2868,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
-			<attack physical="197.2667018" magical="106.67987" random="50" critical="1" accuracy="9" attackSpeed="182" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="163.287157" magical="108.62405" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2942,15 +2915,14 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2323" sp="69" />
+		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="5609.21763" hpRegen="5.5" mp="637.2" mpRegen="2.1" />
-			<attack physical="368.9958967" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="129.597392" magical="111.56912" evasion="10" />
+			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="173.43552" magical="126.91259" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="100" />
+				<run ground="174" />
 			</speed>
 			<hitTime>720</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -2992,15 +2964,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2430" sp="72" />
+		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="17494.66037" hpRegen="5.5" mp="665.52" mpRegen="2.1" />
-			<attack physical="446.485035" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="107.1052826" magical="111.56912" evasion="10" />
+			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="177.78746" magical="130.09715" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="45" />
+				<run ground="174" />
 			</speed>
 			<hitTime>720</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3042,14 +3013,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="193.4031711" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="114.5511044" magical="111.56912" />
+			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="182.18816" magical="133.31739" />
 			<speed>
-				<walk ground="100" />
-				<run ground="150" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>460</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3070,8 +3041,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="12" />
-			<height normal="50" />
+			<radius normal="14" />
+			<height normal="36" />
 		</collision>
 	</npc>
 	<npc id="21645" level="47" type="Monster" name="Wandering Spirit of Abyss">
@@ -3091,13 +3062,13 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="205.3941618" magical="120.43155" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="117.618595" magical="114.55675" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
-				<walk ground="100" />
+				<walk ground="27" />
 				<run ground="174" />
 			</speed>
 			<hitTime>460</hitTime>
@@ -3122,7 +3093,7 @@
 		</ai>
 		<collision>
 			<radius normal="12" />
-			<height normal="50" />
+			<height normal="31" />
 		</collision>
 	</npc>
 	<npc id="21646" level="46" type="Monster" name="Wandering Ghost of Abyss">
@@ -3140,14 +3111,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="191.12803" magical="139.8592" />
 			<speed>
-				<walk ground="45" />
-				<run ground="180" />
+				<walk ground="60" />
+				<run ground="174" />
 			</speed>
 			<hitTime>520</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3163,8 +3134,8 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
-			<radius normal="14" />
-			<height normal="22" />
+			<radius normal="10" />
+			<height normal="36" />
 		</collision>
 	</npc>
 	<npc id="21647" level="47" type="Monster" name="Wandering Evil Thoughts of Abyss">
@@ -3184,14 +3155,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
-				<walk ground="45" />
-				<run ground="180" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>520</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3209,8 +3180,8 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="14" />
-			<height normal="22" />
+			<radius normal="9" />
+			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="21648" level="48" type="Monster" name="Abyss Warder" title="Wandering">
@@ -3234,8 +3205,8 @@
 			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
-				<walk ground="80" />
-				<run ground="150" />
+				<walk ground="100" />
+				<run ground="174" />
 			</speed>
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3256,7 +3227,6 @@
 		</collision>
 	</npc>
 	<npc id="21649" level="49" type="Monster" name="Condemned of Abyss" title="Captured">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3272,14 +3242,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2881" sp="86" />
+		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="20278.94861" hpRegen="5.5" mp="784.995" mpRegen="2.1" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="230.25444" />
+			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="195.66302" magical="143.17771" />
 			<speed>
-				<walk ground="80" />
-				<run ground="150" />
+				<walk ground="70" />
+				<run ground="174" />
 			</speed>
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3326,8 +3296,8 @@
 			<attack physical="794.70901" magical="542.68324" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="319.24623" magical="233.61053" shield="160" shieldRate="20" />
 			<speed>
-				<walk ground="40" />
-				<run ground="165" />
+				<walk ground="52" />
+				<run ground="174" />
 			</speed>
 			<hitTime>170</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3347,8 +3317,8 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
-			<radius normal="10" />
-			<height normal="25" />
+			<radius normal="15" />
+			<height normal="31" />
 		</collision>
 	</npc>
 	<npc id="21651" level="74" type="Monster" name="Flame Drake" title="Quest Monster">
@@ -3372,8 +3342,8 @@
 			<attack physical="794.70901" magical="542.68324" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="319.24623" magical="233.61053" />
 			<speed>
-				<walk ground="50" />
-				<run ground="170" />
+				<walk ground="70" />
+				<run ground="174" />
 			</speed>
 			<hitTime>210</hitTime>
 			<abnormalResist physical="10" magical="10" />
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml
index 7af22c05a3..07ba583ab8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml
@@ -2725,12 +2725,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="142.261856" magical="88.31491" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="124.2995273" magical="100.0527" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -2781,17 +2780,17 @@
 		</dropLists>
 	</npc>
 	<npc id="21639" level="43" type="Monster" name="Wandering Spirit of the Dungeon">
-		<!-- Source: www.l2wiki.com -->
 		<race>UNDEAD</race>
-		<acquire exp="2218" sp="66" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
+		<sex>MALE</sex>
+		<acquire exp="2589" sp="78" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
 			</speed>
-			<attack physical="1277.5" magical="501.3" critical="4" attackSpeed="253" range="40" />
-			<defence physical="547.5" magical="278.5" />
 		</stats>
 		<status attackable="true" />
 		<skillList>
@@ -2820,12 +2819,11 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="7" /> <!-- Apprentice's Rod -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="195.425233" magical="100.26304" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="92.26592261" magical="105.72243" evasion="10" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2869,12 +2867,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
-			<attack physical="197.2667018" magical="106.67987" random="50" critical="1" accuracy="9" attackSpeed="182" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="163.287157" magical="108.62405" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2917,12 +2914,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2323" sp="69" />
+		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="5609.21763" hpRegen="5.5" mp="637.2" mpRegen="2.1" />
-			<attack physical="368.9958967" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="129.597392" magical="111.56912" evasion="10" />
+			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
 				<run ground="174" />
@@ -2967,12 +2963,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2430" sp="72" />
+		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="17494.66037" hpRegen="5.5" mp="665.52" mpRegen="2.1" />
-			<attack physical="446.485035" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="107.1052826" magical="111.56912" evasion="10" />
+			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
 				<run ground="174" />
@@ -3017,11 +3012,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="193.4031711" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="114.5511044" magical="111.56912" />
+			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -3066,11 +3061,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="205.3941618" magical="120.43155" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="117.618595" magical="114.55675" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
 				<run ground="174" />
@@ -3115,11 +3110,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
@@ -3159,11 +3154,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -3231,7 +3226,6 @@
 		</collision>
 	</npc>
 	<npc id="21649" level="49" type="Monster" name="Condemned of Abyss" title="Captured">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3247,11 +3241,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2881" sp="86" />
+		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="20278.94861" hpRegen="5.5" mp="784.995" mpRegen="2.1" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="230.25444" />
+			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
 				<run ground="174" />
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml
index 7af22c05a3..07ba583ab8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml
@@ -2725,12 +2725,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="142.261856" magical="88.31491" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="124.2995273" magical="100.0527" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -2781,17 +2780,17 @@
 		</dropLists>
 	</npc>
 	<npc id="21639" level="43" type="Monster" name="Wandering Spirit of the Dungeon">
-		<!-- Source: www.l2wiki.com -->
 		<race>UNDEAD</race>
-		<acquire exp="2218" sp="66" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
+		<sex>MALE</sex>
+		<acquire exp="2589" sp="78" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
 			</speed>
-			<attack physical="1277.5" magical="501.3" critical="4" attackSpeed="253" range="40" />
-			<defence physical="547.5" magical="278.5" />
 		</stats>
 		<status attackable="true" />
 		<skillList>
@@ -2820,12 +2819,11 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="7" /> <!-- Apprentice's Rod -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="195.425233" magical="100.26304" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="92.26592261" magical="105.72243" evasion="10" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2869,12 +2867,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
-			<attack physical="197.2667018" magical="106.67987" random="50" critical="1" accuracy="9" attackSpeed="182" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="163.287157" magical="108.62405" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2917,12 +2914,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2323" sp="69" />
+		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="5609.21763" hpRegen="5.5" mp="637.2" mpRegen="2.1" />
-			<attack physical="368.9958967" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="129.597392" magical="111.56912" evasion="10" />
+			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
 				<run ground="174" />
@@ -2967,12 +2963,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2430" sp="72" />
+		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="17494.66037" hpRegen="5.5" mp="665.52" mpRegen="2.1" />
-			<attack physical="446.485035" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="107.1052826" magical="111.56912" evasion="10" />
+			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
 				<run ground="174" />
@@ -3017,11 +3012,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="193.4031711" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="114.5511044" magical="111.56912" />
+			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -3066,11 +3061,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="205.3941618" magical="120.43155" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="117.618595" magical="114.55675" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
 				<run ground="174" />
@@ -3115,11 +3110,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
@@ -3159,11 +3154,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -3231,7 +3226,6 @@
 		</collision>
 	</npc>
 	<npc id="21649" level="49" type="Monster" name="Condemned of Abyss" title="Captured">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3247,11 +3241,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2881" sp="86" />
+		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="20278.94861" hpRegen="5.5" mp="784.995" mpRegen="2.1" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="230.25444" />
+			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
 				<run ground="174" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml
index 7af22c05a3..07ba583ab8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml
@@ -2725,12 +2725,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="142.261856" magical="88.31491" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="124.2995273" magical="100.0527" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -2781,17 +2780,17 @@
 		</dropLists>
 	</npc>
 	<npc id="21639" level="43" type="Monster" name="Wandering Spirit of the Dungeon">
-		<!-- Source: www.l2wiki.com -->
 		<race>UNDEAD</race>
-		<acquire exp="2218" sp="66" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
+		<sex>MALE</sex>
+		<acquire exp="2589" sp="78" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
 			</speed>
-			<attack physical="1277.5" magical="501.3" critical="4" attackSpeed="253" range="40" />
-			<defence physical="547.5" magical="278.5" />
 		</stats>
 		<status attackable="true" />
 		<skillList>
@@ -2820,12 +2819,11 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="7" /> <!-- Apprentice's Rod -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.28881" hpRegen="5.5" mp="578.79" mpRegen="2.1" />
-			<attack physical="195.425233" magical="100.26304" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="92.26592261" magical="105.72243" evasion="10" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2869,12 +2867,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.02313" hpRegen="5.5" mp="607.11" mpRegen="2.1" />
-			<attack physical="197.2667018" magical="106.67987" random="50" critical="1" accuracy="9" attackSpeed="182" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="163.287157" magical="108.62405" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -2917,12 +2914,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2323" sp="69" />
+		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="5609.21763" hpRegen="5.5" mp="637.2" mpRegen="2.1" />
-			<attack physical="368.9958967" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="129.597392" magical="111.56912" evasion="10" />
+			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
 				<run ground="174" />
@@ -2967,12 +2963,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2430" sp="72" />
+		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="17494.66037" hpRegen="5.5" mp="665.52" mpRegen="2.1" />
-			<attack physical="446.485035" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="107.1052826" magical="111.56912" evasion="10" />
+			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
 				<run ground="174" />
@@ -3017,11 +3012,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="193.4031711" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="114.5511044" magical="111.56912" />
+			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -3066,11 +3061,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="205.3941618" magical="120.43155" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="117.618595" magical="114.55675" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
 				<run ground="174" />
@@ -3115,11 +3110,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="504.68919" hpRegen="5.5" mp="694.725" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
 				<run ground="174" />
@@ -3159,11 +3154,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="523.90137" hpRegen="5.5" mp="724.815" mpRegen="2.1" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="226.8662" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -3231,7 +3226,6 @@
 		</collision>
 	</npc>
 	<npc id="21649" level="49" type="Monster" name="Condemned of Abyss" title="Captured">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3247,11 +3241,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2881" sp="86" />
+		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="20278.94861" hpRegen="5.5" mp="784.995" mpRegen="2.1" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="230.25444" />
+			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
 				<run ground="174" />
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/21600-21699.xml
index 0eaf7a79ec..9e17861209 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/npcs/21600-21699.xml
@@ -2917,12 +2917,11 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.53512" hpRegen="5.5" mp="469.935" mpRegen="2.1" />
-			<attack physical="142.261856" magical="88.31491" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="124.2995273" magical="100.0527" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -2949,50 +2948,48 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="503" min="1" max="1" chance="0.03" /> <!-- Sealed Zubei's Helmet -->
+				<item id="2415" min="1" max="1" chance="0.03" /> <!-- Sealed Avadon Circlet -->
+				<item id="2416" min="1" max="1" chance="0.0075" /> <!-- Sealed Blue Wolf Helmet -->
+				<item id="2417" min="1" max="1" chance="0.0075" /> <!-- Sealed Doom Helmet -->
+				<item id="57" min="672" max="1570" chance="70" /> <!-- Adena -->
+				<item id="1870" min="1" max="1" chance="29.07" /> <!-- Coal -->
+				<item id="4102" min="1" max="1" chance="2.327" /> <!-- Sealed Zubei's Helmet Design -->
+				<item id="4072" min="1" max="1" chance="2.273" /> <!-- Sealed Avadon Circlet Pattern -->
+				<item id="1875" min="1" max="1" chance="2.021" /> <!-- Stone of Purity -->
+				<item id="4088" min="1" max="1" chance="1.943" /> <!-- Sealed Blue Wolf Helmet Design -->
+				<item id="1874" min="1" max="1" chance="1.93" /> <!-- Oriharukon Ore -->
+				<item id="4089" min="1" max="1" chance="1.912" /> <!-- Sealed Doom Helmet Design -->
+				<item id="90012" min="1" max="1" chance="0.03" /> <!-- Common Life Stone -->
+			</drop>
+			<spoil>
+				<item id="1870" min="1" max="1" chance="80.73" /> <!-- Coal -->
+				<item id="1874" min="1" max="1" chance="21.16" /> <!-- Oriharukon Ore -->
+				<item id="1875" min="1" max="1" chance="20.3" /> <!-- Stone of Purity -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="21639" level="43" type="Monster" name="Wandering Spirit of the Dungeon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<parameters>
-			<param name="MoveAroundSocial" value="139" />
-			<param name="MoveAroundSocial1" value="35" />
-			<param name="MoveAroundSocial2" value="139" />
-			<param name="SoulShot" value="200" />
-			<param name="SoulShotRate" value="5" />
-			<param name="SpiritShot" value="100" />
-			<param name="SpiritShotRate" value="10" />
-			<param name="LongRangeGuardRate" value="10" />
-			<skill name="PhysicalSpecial" id="4124" level="3" />
-		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.51575" hpRegen="5.5" mp="492.945" mpRegen="2.1" />
-			<attack physical="278.4866334" magical="94.1437" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="154.630058" magical="102.86506" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="60" />
+				<run ground="174" />
 			</speed>
-			<hitTime>720</hitTime>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" canBeSown="true" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4124" level="3" /> <!-- NPC Spear Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4085" level="1" /> <!-- Critical Damage -->
 			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
-		<shots shotChance="30" spiritChance="30" />
-		<exCrtEffect>false</exCrtEffect>
-		<sNpcPropHpRate>0.5</sNpcPropHpRate>
-		<ai clanHelpRange="300" aggroRange="300">
-			<clanList>
-				<clan>LIZARDMAN</clan>
-			</clanList>
-		</ai>
 		<collision>
 			<radius normal="10" grown="12" />
 			<height normal="22" grown="27" />
@@ -3014,15 +3011,14 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="7" /> <!-- Apprentice's Rod -->
-		<acquire exp="2116" sp="63" />
+		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="431.53512" hpRegen="5.5" mp="469.935" mpRegen="2.1" />
-			<attack physical="195.425233" magical="100.26304" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="92.26592261" magical="105.72243" evasion="10" />
+			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="164.88513" magical="120.65578" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>480</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3044,8 +3040,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="10" />
-			<height normal="29" />
+			<radius normal="15" />
+			<height normal="28" />
 		</collision>
 	</npc>
 	<npc id="21641" level="43" type="Monster" name="Wandering Evil Thoughts of the Dungeon">
@@ -3063,12 +3059,11 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2218" sp="66" />
+		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="449.51575" hpRegen="5.5" mp="492.945" mpRegen="2.1" />
-			<attack physical="197.2667018" magical="106.67987" random="50" critical="1" accuracy="9" attackSpeed="182" type="BLUNT" range="40" distance="80" width="120" />
-			<defence physical="163.287157" magical="108.62405" />
+			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
@@ -3111,15 +3106,14 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2323" sp="69" />
+		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="5608.72501" hpRegen="5.5" mp="516.84" mpRegen="2.1" />
-			<attack physical="368.9958967" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="129.597392" magical="111.56912" evasion="10" />
+			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="173.43552" magical="126.91259" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="100" />
+				<run ground="174" />
 			</speed>
 			<hitTime>720</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3161,15 +3155,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="2507" /> <!-- Lizardspear -->
-		<acquire exp="2430" sp="72" />
+		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="17492.9362" hpRegen="5.5" mp="539.85" mpRegen="2.1" />
-			<attack physical="446.485035" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="227" reuseDelay="1500" type="BOW" range="500" distance="10" width="0" />
-			<defence physical="107.1052826" magical="111.56912" evasion="10" />
+			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="177.78746" magical="130.09715" />
 			<speed>
-				<walk ground="43" />
-				<run ground="140" />
+				<walk ground="45" />
+				<run ground="174" />
 			</speed>
 			<hitTime>720</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3211,14 +3204,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="2539" sp="76" />
+		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="505.18181" hpRegen="5.5" mp="563.745" mpRegen="2.1" />
-			<attack physical="193.4031711" magical="113.4007" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="114.5511044" magical="111.56912" />
+			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="182.18816" magical="133.31739" />
 			<speed>
-				<walk ground="100" />
-				<run ground="150" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>460</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -3239,8 +3232,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="12" />
-			<height normal="50" />
+			<radius normal="14" />
+			<height normal="36" />
 		</collision>
 	</npc>
 	<npc id="21645" level="47" type="Monster" name="Wandering Spirit of Abyss">
@@ -3260,13 +3253,13 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="2650" sp="79" />
+		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="524.14768" hpRegen="5.5" mp="588.525" mpRegen="2.1" />
-			<attack physical="205.3941618" magical="120.43155" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
-			<defence physical="117.618595" magical="114.55675" />
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
-				<walk ground="100" />
+				<walk ground="27" />
 				<run ground="174" />
 			</speed>
 			<hitTime>460</hitTime>
@@ -3291,11 +3284,11 @@
 		</ai>
 		<collision>
 			<radius normal="12" />
-			<height normal="50" />
+			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="21646" level="73" type="Monster" name="Grave Scarab">
-		<!-- Confirmed CT2.5 -->
+	<npc id="21646" level="46" type="Monster" name="Wandering Ghost of Abyss">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="65" />
 			<param name="MoveAroundSocial1" value="65" />
@@ -3305,75 +3298,39 @@
 			<param name="SpiritShot" value="100" />
 			<param name="SpiritShotRate" value="10" />
 			<param name="LongRangeGuardRate" value="10" />
-			<skill name="Buff" id="4575" level="2" /> <!-- NPC Clan Buff - Haste -->
+			<skill name="Buff" id="4575" level="2" />
 		</parameters>
-		<race>BUG</race>
+		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="12247" sp="1260" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2586.66898" hpRegen="8.5" mp="1442.4" mpRegen="3" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="206.421198742611" />
-			<attribute>
-				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
-			</attribute>
+		<acquire exp="3226" sp="97" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="191.12803" magical="139.8592" />
 			<speed>
-				<walk ground="45" />
-				<run ground="180" />
+				<walk ground="60" />
+				<run ground="174" />
 			</speed>
 			<hitTime>520</hitTime>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
-			<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="4416" level="12" /> <!-- Bugs -->
 			<skill id="4575" level="2" /> <!-- NPC Clan Buff - Haste -->
-			<skill id="4789" level="3" /> <!-- NPC High Level -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="false" />
-		<dropLists>
-			<drop>
-				<item id="57" min="1701" max="3463" chance="70" /> <!-- Adena -->
-				<item id="12225" min="1" max="1" chance="0.0879400063666105" /> <!-- Common Item - Sealed Dark Crystal Shield -->
-				<item id="5494" min="1" max="1" chance="0.445104723140478" /> <!-- Sealed Dark Crystal Shield Fragment -->
-				<item id="12226" min="1" max="1" chance="0.0616090218048096" /> <!-- Common Item - Sealed Dark Crystal Helmet -->
-				<item id="5525" min="1" max="1" chance="0.327617934326649" /> <!-- Sealed Dark Crystal Helmet Design -->
-				<item id="12234" min="1" max="1" chance="0.0616090218048096" /> <!-- Common Item - Sealed Tallum Helmet -->
-				<item id="5526" min="1" max="1" chance="0.327619245826602" /> <!-- Sealed Tallum Helm Design -->
-				<item id="1867" min="1" max="1" chance="15.4137062058792" /> <!-- Animal Skin -->
-				<item id="1872" min="1" max="1" chance="15.4137062058792" /> <!-- Animal Bone -->
-				<item id="1882" min="1" max="1" chance="2.5689510343132" /> <!-- Leather -->
-				<item id="1894" min="1" max="1" chance="0.405605946975708" /> <!-- Crafted Leather -->
-				<item id="4042" min="1" max="1" chance="0.192648248653412" /> <!-- Enria -->
-				<item id="5277" min="1" max="1" chance="0.00515024321746826" /> <!-- Recipe: Greater Spiritshot (S) Compressed Package(100%) -->
-				<item id="8731" min="1" max="1" chance="0.107037601963043" /> <!-- Life Stone - Level 70 -->
-				<item id="8741" min="1" max="1" chance="0.026771547290802" /> <!-- Mid-Grade Life Stone - Level 70 -->
-				<item id="8751" min="1" max="1" chance="0.00267229600906372" /> <!-- High-Grade Life Stone - Level 70 -->
-				<item id="8761" min="1" max="1" chance="0.000534459201812744" /> <!-- Top-Grade Life Stone - Level 70 -->
-				<item id="1344" min="10" max="30" chance="14.450416375412" /> <!-- Mithril Arrow -->
-			</drop>
-			<spoil>
-				<item id="5508" min="1" max="1" chance="8.075" /> <!-- Sealed Dark Crystal Gloves Design -->
-				<item id="730" min="1" max="1" chance="0.287" /> <!-- Scroll: Enchant Armor (A-Grade) -->
-				<item id="1894" min="1" max="1" chance="12.0842" /> <!-- Crafted Leather -->
-			</spoil>
-		</dropLists>
+		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
-			<radius normal="14" />
-			<height normal="22" />
+			<radius normal="10" />
+			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="21647" level="73" type="Monster" name="Scavenger Scarab">
-		<!-- Confirmed CT2.5 -->
+	<npc id="21647" level="47" type="Monster" name="Wandering Evil Thoughts of Abyss">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="65" />
 			<param name="MoveAroundSocial1" value="65" />
@@ -3383,78 +3340,43 @@
 			<param name="SpiritShot" value="100" />
 			<param name="SpiritShotRate" value="10" />
 			<param name="LongRangeGuardRate" value="10" />
-			<skill name="DDMagic1" id="4001" level="7" /> <!-- NPC Windstrike -->
-			<skill name="DDMagic2" id="4002" level="7" /> <!-- NPC HP Drain -->
-			<skill name="DeBuff" id="4035" level="7" /> <!-- Poison -->
+			<skill name="DDMagic1" id="4001" level="7" />
+			<skill name="DDMagic2" id="4002" level="7" />
+			<skill name="DeBuff" id="4035" level="7" />
 		</parameters>
-		<race>BUG</race>
+		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="10331" sp="1063" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2586.66898" hpRegen="8.5" mp="1442.4" mpRegen="3" />
-			<attack physical="752.73928" magical="514.02335" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="310.02959" magical="206.421198742611" />
-			<attribute>
-				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
-			</attribute>
+		<acquire exp="3093" sp="93" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="186.63569" magical="136.5719" />
 			<speed>
-				<walk ground="45" />
-				<run ground="180" />
+				<walk ground="80" />
+				<run ground="174" />
 			</speed>
 			<hitTime>520</hitTime>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4001" level="7" /> <!-- NPC Windstrike -->
 			<skill id="4002" level="7" /> <!-- NPC HP Drain -->
 			<skill id="4035" level="7" /> <!-- Poison -->
-			<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="4416" level="12" /> <!-- Bugs -->
-			<skill id="4789" level="3" /> <!-- NPC High Level -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="1435" max="2921" chance="70" /> <!-- Adena -->
-				<item id="12227" min="1" max="1" chance="0.019489060318619" /> <!-- Common Item - Sealed Dark Crystal Breastplate -->
-				<item id="5520" min="1" max="1" chance="0.115307333926857" /> <!-- Sealed Dark Crystal Breastplate Pattern -->
-				<item id="12233" min="1" max="1" chance="0.0120006378883123" /> <!-- Common Item - Sealed Tallum Plate Armor -->
-				<item id="5521" min="1" max="1" chance="0.0813653352427483" /> <!-- Sealed Tallum Plate Armor Pattern -->
-				<item id="12220" min="1" max="1" chance="0.0310977482105792" /> <!-- Common Item - Sealed Dark Crystal Gaiters -->
-				<item id="5524" min="1" max="1" chance="0.176239880359769" /> <!-- Sealed Dark Crystal Gaiters Pattern -->
-				<item id="1868" min="1" max="1" chance="21.4552255037308" /> <!-- Thread -->
-				<item id="1873" min="1" max="1" chance="4.29104510074616" /> <!-- Silver Nugget -->
-				<item id="5549" min="1" max="1" chance="1.07274726333618" /> <!-- Metallic Thread -->
-				<item id="1889" min="1" max="1" chance="0.715164842224121" /> <!-- Compound Braid -->
-				<item id="4044" min="1" max="1" chance="0.357582421112061" /> <!-- Thons -->
-				<item id="5282" min="1" max="1" chance="0.00476402912139893" /> <!-- Recipe: Greater Blessed Spiritshot (S) Compressed Package(100%) -->
-				<item id="8731" min="1" max="1" chance="0.0993159953308106" /> <!-- Life Stone - Level 70 -->
-				<item id="8741" min="1" max="1" chance="0.0248289988327026" /> <!-- Mid-Grade Life Stone - Level 70 -->
-				<item id="8751" min="1" max="1" chance="0.00249410936355591" /> <!-- High-Grade Life Stone - Level 70 -->
-				<item id="8761" min="1" max="1" chance="0.000532450313568115" /> <!-- Top-Grade Life Stone - Level 70 -->
-			</drop>
-			<spoil>
-				<item id="4044" min="1" max="1" chance="9.6846" /> <!-- Thons -->
-				<item id="5509" min="1" max="1" chance="6.8122" /> <!-- Sealed Tallum Gloves Design -->
-				<item id="5462" min="1" max="1" chance="0.1076" /> <!-- Recipe: Branch of the Mother Tree(60%) -->
-			</spoil>
-		</dropLists>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="14" />
-			<height normal="22" />
+			<radius normal="9" />
+			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="21648" level="74" type="Monster" name="Grave Ant">
-		<!-- Confirmed CT2.5 -->
+	<npc id="21648" level="48" type="Monster" name="Abyss Warder" title="Wandering">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3464,75 +3386,38 @@
 			<param name="SpiritShot" value="100" />
 			<param name="SpiritShotRate" value="10" />
 			<param name="LongRangeGuardRate" value="10" />
-			<skill name="PhysicalSpecial" id="4067" level="7" /> <!-- NPC Mortal Blow -->
+			<skill name="PhysicalSpecial" id="4067" level="7" />
 		</parameters>
-		<race>BUG</race>
+		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="11260" sp="1174" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2632.19636" hpRegen="8.5" mp="1475.0" mpRegen="3" />
+		<acquire exp="2764" sp="82" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="6522.04249" hpRegen="5.5" mp="754.905" mpRegen="2.1" />
 			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="209.50409325236" />
-			<attribute>
-				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
-			</attribute>
+			<defence physical="314.65987" magical="230.25444" />
 			<speed>
-				<walk ground="80" />
-				<run ground="150" />
+				<walk ground="100" />
+				<run ground="174" />
 			</speed>
 			<hitTime>610</hitTime>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4067" level="7" /> <!-- NPC Mortal Blow -->
-			<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="4416" level="12" /> <!-- Bugs -->
-			<skill id="4789" level="3" /> <!-- NPC High Level -->
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="false" />
-		<dropLists>
-			<drop>
-				<item id="57" min="1566" max="3192" chance="70" /> <!-- Adena -->
-				<item id="12225" min="1" max="1" chance="0.081040258767128" /> <!-- Common Item - Sealed Dark Crystal Shield -->
-				<item id="5494" min="1" max="1" chance="0.410181934617996" /> <!-- Sealed Dark Crystal Shield Fragment -->
-				<item id="12226" min="1" max="1" chance="0.0567751956787109" /> <!-- Common Item - Sealed Dark Crystal Helmet -->
-				<item id="5525" min="1" max="1" chance="0.301913125453949" /> <!-- Sealed Dark Crystal Helmet Design -->
-				<item id="12234" min="1" max="1" chance="0.0567751956787109" /> <!-- Common Item - Sealed Tallum Helmet -->
-				<item id="5526" min="1" max="1" chance="0.301914334053993" /> <!-- Sealed Tallum Helm Design -->
-				<item id="1869" min="1" max="1" chance="10.6532872741203" /> <!-- Iron Ore -->
-				<item id="1870" min="1" max="1" chance="10.6532872741203" /> <!-- Coal -->
-				<item id="1871" min="1" max="1" chance="10.6532872741203" /> <!-- Charcoal -->
-				<item id="1872" min="1" max="3" chance="7.10220726841354" /> <!-- Animal Bone -->
-				<item id="1867" min="1" max="3" chance="4.73477334094238" /> <!-- Animal Skin -->
-				<item id="5167" min="1" max="1" chance="0.00472569999694824" /> <!-- Recipe: Blessed Spiritshot (S) Compressed Package (100%) -->
-				<item id="8731" min="1" max="1" chance="0.0986253589363098" /> <!-- Life Stone - Level 70 -->
-				<item id="8741" min="1" max="1" chance="0.0246681539840698" /> <!-- Mid-Grade Life Stone - Level 70 -->
-				<item id="8751" min="1" max="1" chance="0.00245736399841309" /> <!-- High-Grade Life Stone - Level 70 -->
-				<item id="8761" min="1" max="1" chance="0.000472569999694824" /> <!-- Top-Grade Life Stone - Level 70 -->
-				<item id="1344" min="40" max="120" chance="3.32920839085007" /> <!-- Mithril Arrow -->
-			</drop>
-			<spoil>
-				<item id="5482" min="1" max="1" chance="4.189" /> <!-- Sealed Dark Crystal Leggings Design -->
-				<item id="5464" min="1" max="1" chance="0.1175" /> <!-- Recipe: Dark Legion's Edge(60%) -->
-				<item id="5485" min="1" max="1" chance="2.6688" /> <!-- Sealed Tallum Tunic Texture -->
-			</spoil>
-		</dropLists>
+		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
 			<radius normal="35" grown="42" />
 			<height normal="17" grown="21" />
 		</collision>
 	</npc>
-	<npc id="21649" level="74" type="Monster" name="Scavenger Ant">
-		<!-- Confirmed CT2.5 -->
+	<npc id="21649" level="49" type="Monster" name="Condemned of Abyss" title="Captured">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3542,77 +3427,42 @@
 			<param name="SpiritShot" value="100" />
 			<param name="SpiritShotRate" value="10" />
 			<param name="LongRangeGuardRate" value="10" />
-			<skill name="SelfRangeDDMagic" id="4232" level="7" /> <!-- NPC AE Strike -->
-			<!-- <skill name="SelfBuff" id="4091" level="1" /> --> <!-- NPC Ogre Spirit Totem -->
-			<skill name="PhysicalSpecial" id="4067" level="7" /> <!-- NPC Mortal Blow -->
+			<skill name="SelfRangeDDMagic" id="4232" level="7" />
+			<skill name="SelfBuff" id="4091" level="1" />
+			<skill name="PhysicalSpecial" id="4067" level="7" />
 		</parameters>
-		<race>BUG</race>
+		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="13319" sp="1388" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2632.19636" hpRegen="8.5" mp="1475.0" mpRegen="3" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="314.65987" magical="209.50409325236" />
-			<attribute>
-				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
-			</attribute>
+		<acquire exp="3362" sp="101" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="195.66302" magical="143.17771" />
 			<speed>
-				<walk ground="80" />
-				<run ground="150" />
+				<walk ground="70" />
+				<run ground="174" />
 			</speed>
 			<hitTime>610</hitTime>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4067" level="7" /> <!-- NPC Mortal Blow -->
 			<skill id="4091" level="1" /> <!-- NPC Ogre Spirit Totem -->
 			<skill id="4232" level="7" /> <!-- NPC AE Strike -->
-			<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="4416" level="12" /> <!-- Bugs -->
-			<skill id="4789" level="3" /> <!-- NPC High Level -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="1853" max="3776" chance="70" /> <!-- Adena -->
-				<item id="12227" min="1" max="1" chance="0.0251813865178227" /> <!-- Common Item - Sealed Dark Crystal Breastplate -->
-				<item id="5520" min="1" max="1" chance="0.14898607200563" /> <!-- Sealed Dark Crystal Breastplate Pattern -->
-				<item id="12233" min="1" max="1" chance="0.0155057604720592" /> <!-- Common Item - Sealed Tallum Plate Armor -->
-				<item id="5521" min="1" max="1" chance="0.1051303614645" /> <!-- Sealed Tallum Plate Armor Pattern -->
-				<item id="12220" min="1" max="1" chance="0.0401807170136571" /> <!-- Common Item - Sealed Dark Crystal Gaiters -->
-				<item id="5524" min="1" max="1" chance="0.227715676109552" /> <!-- Sealed Dark Crystal Gaiters Pattern -->
-				<item id="1894" min="1" max="1" chance="0.540410753551483" /> <!-- Crafted Leather -->
-				<item id="4039" min="1" max="1" chance="0.513389837773919" /> <!-- Mold Glue -->
-				<item id="4041" min="1" max="1" chance="0.13392679741931" /> <!-- Mold Hardener -->
-				<item id="4044" min="1" max="1" chance="0.513389837773919" /> <!-- Thons -->
-				<item id="5272" min="1" max="1" chance="0.0068455003169775" /> <!-- Recipe: Greater Soulshot (S) Compressed Package(100%) -->
-				<item id="8731" min="1" max="1" chance="0.142607973187208" /> <!-- Life Stone - Level 70 -->
-				<item id="8741" min="1" max="1" chance="0.0356529385467768" /> <!-- Mid-Grade Life Stone - Level 70 -->
-				<item id="8751" min="1" max="1" chance="0.00356548290467262" /> <!-- High-Grade Life Stone - Level 70 -->
-				<item id="8761" min="1" max="1" chance="0.000710827980995178" /> <!-- Top-Grade Life Stone - Level 70 -->
-			</drop>
-			<spoil>
-				<item id="729" min="1" max="1" chance="0.0417" /> <!-- Scroll: Enchant Weapon (A-Grade) -->
-				<item id="4044" min="1" max="1" chance="12.5138" /> <!-- Thons -->
-				<item id="1894" min="1" max="1" chance="13.1724" /> <!-- Crafted Leather -->
-			</spoil>
-		</dropLists>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
 		<collision>
 			<radius normal="35" grown="42" />
 			<height normal="17" grown="21" />
 		</collision>
 	</npc>
-	<npc id="21650" level="75" type="Monster" name="Shrine Knight">
-		<!-- Confirmed CT2.5 -->
+	<npc id="21650" level="74" type="Monster" name="Swampland Watchman" title="Quest Monster">
 		<parameters>
 			<param name="MoveAroundSocial" value="215" />
 			<param name="MoveAroundSocial1" value="215" />
@@ -3622,80 +3472,47 @@
 			<param name="SpiritShot" value="100" />
 			<param name="SpiritShotRate" value="10" />
 			<param name="LongRangeGuardRate" value="10" />
-			<skill name="W_MiddleRangeDDMagic" id="4630" level="8" /> <!-- NPC MR - Twister -->
-			<skill name="W_ShortRangeDDMagic" id="4160" level="8" /> <!-- NPC Aura Burn - Magic -->
-			<skill name="W_SelfRangeDDMagic" id="4571" level="8" /> <!-- NPC Blazing Circle -->
-			<skill name="Buff" id="4635" level="3" /> <!-- NPC Buff - Acumen Berserk WildMagic -->
-			<skill name="DeBuff" id="4035" level="8" /> <!-- Poison -->
+			<skill name="W_MiddleRangeDDMagic" id="4630" level="8" />
+			<skill name="W_ShortRangeDDMagic" id="4160" level="8" />
+			<skill name="W_SelfRangeDDMagic" id="4571" level="8" />
+			<skill name="Buff" id="4635" level="3" />
+			<skill name="DeBuff" id="4035" level="8" />
 		</parameters>
-		<race>UNDEAD</race>
+		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<equipment rhand="150" lhand="103" /> <!-- rhand: Elemental Sword lhand: Tower Shield -->
-		<acquire exp="12179" sp="1285" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />
+		<acquire exp="6571" sp="197" />
+		<equipment rhand="150" lhand="103" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1080.31566" hpRegen="8.5" mp="1608.045" mpRegen="3" />
 			<attack physical="794.70901" magical="542.68324" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="319.24623" magical="212.557735094503" shield="160" shieldRate="20" />
-			<attribute>
-				<attack type="DARK" value="20" />
-				<defence fire="20" water="20" wind="20" earth="20" holy="-32" dark="53" />
-			</attribute>
+			<defence physical="319.24623" magical="233.61053" shield="160" shieldRate="20" />
 			<speed>
-				<walk ground="40" />
-				<run ground="165" />
+				<walk ground="52" />
+				<run ground="174" />
 			</speed>
 			<hitTime>170</hitTime>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4035" level="8" /> <!-- Poison -->
 			<skill id="4160" level="8" /> <!-- NPC Aura Burn - Magic -->
-			<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="4416" level="1" /> <!-- Undead -->
 			<skill id="4571" level="8" /> <!-- NPC Blazing Circle -->
 			<skill id="4630" level="8" /> <!-- NPC MR - Twister -->
 			<skill id="4635" level="3" /> <!-- NPC Buff - Acumen Berserk WildMagic -->
-			<skill id="4789" level="4" /> <!-- NPC High Level -->
+			<skill id="4416" level="6" /> <!-- Humanoid -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="false" />
-		<dropLists>
-			<drop>
-				<item id="57" min="1698" max="3464" chance="70" /> <!-- Adena -->
-				<item id="11951" min="1" max="1" chance="0.0174943151389956" /> <!-- Common Item - Bloody Orchid -->
-				<item id="5536" min="1" max="1" chance="0.216205692061245" /> <!-- Bloody Orchid Head -->
-				<item id="1895" min="1" max="1" chance="3.63109674349976" /> <!-- Metallic Fiber -->
-				<item id="4040" min="1" max="1" chance="0.25417923960495" /> <!-- Mold Lubricant -->
-				<item id="4042" min="1" max="1" chance="0.211819460170746" /> <!-- Enria -->
-				<item id="4043" min="1" max="1" chance="0.423618357341766" /> <!-- Asofe -->
-				<item id="3957" min="1" max="1" chance="0.00565482492446899" /> <!-- Recipe: Blessed Spiritshot S -->
-				<item id="8731" min="1" max="1" chance="0.117682047428131" /> <!-- Life Stone - Level 70 -->
-				<item id="8741" min="1" max="1" chance="0.0294256526069641" /> <!-- Mid-Grade Life Stone - Level 70 -->
-				<item id="8751" min="1" max="1" chance="0.00294050896072388" /> <!-- High-Grade Life Stone - Level 70 -->
-				<item id="8761" min="1" max="1" chance="0.000596326992034912" /> <!-- Top-Grade Life Stone - Level 70 -->
-				<item id="1344" min="10" max="30" chance="15.8859865638123" /> <!-- Mithril Arrow -->
-			</drop>
-			<spoil>
-				<item id="5162" min="1" max="1" chance="0.153" /> <!-- Recipe: Spiritshot (S) Compressed Package (100%) -->
-				<item id="5514" min="1" max="1" chance="5.8132" /> <!-- Sealed Gauntlets of Nightmare Design -->
-				<item id="5167" min="1" max="1" chance="0.153" /> <!-- Recipe: Blessed Spiritshot (S) Compressed Package (100%) -->
-			</spoil>
-		</dropLists>
+		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
-			<radius normal="10" />
-			<height normal="25" />
+			<radius normal="15" />
+			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="21651" level="75" type="Monster" name="Shrine Guard">
-		<!-- Confirmed CT2.5 -->
+	<npc id="21651" level="74" type="Monster" name="Flame Drake" title="Quest Monster">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3705,77 +3522,39 @@
 			<param name="SpiritShot" value="100" />
 			<param name="SpiritShotRate" value="10" />
 			<param name="LongRangeGuardRate" value="10" />
-			<skill name="SelfRangeDDMagic" id="4033" level="8" /> <!-- NPC Burn -->
+			<skill name="SelfRangeDDMagic" id="4033" level="8" />
 		</parameters>
-		<race>UNDEAD</race>
+		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="98" /> <!-- rhand: Halberd -->
-		<acquire exp="11634" sp="1228" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2676.65854" hpRegen="8.5" mp="1507.8" mpRegen="3" />
+		<acquire exp="6571" sp="197" />
+		<equipment rhand="98" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
+			<vitals hp="1080.31566" hpRegen="8.5" mp="1608.045" mpRegen="3" />
 			<attack physical="794.70901" magical="542.68324" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="319.24623" magical="212.557735094503" />
-			<attribute>
-				<attack type="DARK" value="20" />
-				<defence fire="20" water="20" wind="20" earth="20" holy="-32" dark="53" />
-			</attribute>
+			<defence physical="319.24623" magical="233.61053" />
 			<speed>
-				<walk ground="50" />
-				<run ground="170" />
+				<walk ground="70" />
+				<run ground="174" />
 			</speed>
 			<hitTime>210</hitTime>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
 		<skillList>
 			<skill id="4033" level="8" /> <!-- NPC Burn -->
-			<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="4416" level="1" /> <!-- Undead -->
-			<skill id="4789" level="4" /> <!-- NPC High Level -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
 		</skillList>
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="false" />
-		<dropLists>
-			<drop>
-				<item id="57" min="1622" max="3309" chance="70" /> <!-- Adena -->
-				<item id="11946" min="1" max="1" chance="0.0041771593901217" /> <!-- Common Item - Dasparion's Staff -->
-				<item id="5543" min="1" max="1" chance="0.0516510094778538" /> <!-- Dasparion's Staff Head -->
-				<item id="11949" min="1" max="1" chance="0.0041771593901217" /> <!-- Common Item - Meteor Shower -->
-				<item id="5532" min="1" max="1" chance="0.0511685944789946" /> <!-- Meteor Shower Head -->
-				<item id="11953" min="1" max="1" chance="0.0041771593901217" /> <!-- Common Item - Spiritual Eye -->
-				<item id="8341" min="1" max="1" chance="0.0511031634791493" /> <!-- Spiritual Eye Piece -->
-				<item id="11958" min="1" max="1" chance="0.0041771593901217" /> <!-- Common Item - Destroyer Hammer -->
-				<item id="8346" min="1" max="1" chance="0.0511685944789946" /> <!-- Hammer Piece of Destroyer -->
-				<item id="1868" min="1" max="1" chance="24.2817038615418" /> <!-- Thread -->
-				<item id="1873" min="1" max="1" chance="4.85634077230835" /> <!-- Silver Nugget -->
-				<item id="5549" min="1" max="1" chance="1.21406933532715" /> <!-- Metallic Thread -->
-				<item id="1889" min="1" max="1" chance="0.809379556884766" /> <!-- Compound Braid -->
-				<item id="4044" min="1" max="1" chance="0.404689778442383" /> <!-- Thons -->
-				<item id="5157" min="1" max="1" chance="0.00539163497924805" /> <!-- Recipe: Soulshot (S) Compressed Package (100%) -->
-				<item id="8731" min="1" max="1" chance="0.112399731567383" /> <!-- Life Stone - Level 70 -->
-				<item id="8741" min="1" max="1" chance="0.0280999328918457" /> <!-- Mid-Grade Life Stone - Level 70 -->
-				<item id="8751" min="1" max="1" chance="0.00282267948913574" /> <!-- High-Grade Life Stone - Level 70 -->
-				<item id="8761" min="1" max="1" chance="0.000602594497680664" /> <!-- Top-Grade Life Stone - Level 70 -->
-			</drop>
-			<spoil>
-				<item id="5515" min="1" max="1" chance="5.5534" /> <!-- Sealed Majestic Gauntlets Design -->
-				<item id="1889" min="1" max="1" chance="21.921" /> <!-- Compound Braid -->
-				<item id="4044" min="1" max="1" chance="10.9605" /> <!-- Thons -->
-			</spoil>
-		</dropLists>
+		<ai clanHelpRange="300" aggroRange="300" />
 		<collision>
 			<radius normal="10" grown="12" />
 			<height normal="28" grown="33" />
 		</collision>
 	</npc>
-	<npc id="21652" level="75" type="Monster" name="Fiery Ifrit">
+	<npc id="21652" level="75" type="Monster" name="Fiery Ifrit" title="Quest Monster">
 		<!-- L2wiki: https://l2wiki.com/classic/Fiery_Ifrit -->
 		<parameters>
 			<param name="MoveAroundSocial" value="62" />
@@ -3786,7 +3565,7 @@
 		<sex>MALE</sex>
 		<acquire exp="6750" sp="202" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="1098.78891" hpRegen="8.5" mp="1333.695" mpRegen="3" />
+			<vitals hp="1098.5426" hpRegen="8.5" mp="1643.445" mpRegen="3" />
 			<attack physical="766.0603913" magical="597.85136" random="10" critical="8" accuracy="0" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="337.07008" magical="246.65326" />
 			<speed>
@@ -3805,28 +3584,8 @@
 			<radius normal="10" />
 			<height normal="42" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="57" min="554" max="1294" chance="70" /> <!-- Adena -->
-				<item id="1871" min="1" max="1" chance="15.67" /> <!-- Charcoal -->
-				<item id="1866" min="1" max="1" chance="10.84" /> <!-- Suede -->
-				<item id="1870" min="1" max="3" chance="8.045" /> <!-- Coal -->
-				<item id="1895" min="1" max="1" chance="4.626" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="3.202" /> <!-- Mithril Ore -->
-				<item id="6341" min="1" max="1" chance="3.072" /> <!-- Sealed Phoenix Earring Gemstone -->
-				<item id="1879" min="1" max="1" chance="2.716" /> <!-- Cokes -->
-			</drop>
-			<spoil>
-				<item id="1866" min="1" max="1" chance="84.94" /> <!-- Suede -->
-				<item id="1871" min="1" max="3" chance="66.55" /> <!-- Charcoal -->
-				<item id="1870" min="1" max="3" chance="64.44" /> <!-- Coal -->
-				<item id="1895" min="1" max="1" chance="35.95" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="27.03" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="22" /> <!-- Cokes -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="21653" level="75" type="Monster" name="Ikedit">
+	<npc id="21653" level="75" type="Monster" name="Ikedit" title="Quest Monster">
 		<!-- L2wiki: https://l2wiki.com/classic/Ikedit -->
 		<parameters>
 			<param name="MoveAroundSocial" value="62" />
@@ -3837,7 +3596,7 @@
 		<sex>MALE</sex>
 		<acquire exp="6750" sp="202" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="1098.78891" hpRegen="8.5" mp="1333.695" mpRegen="3" />
+			<vitals hp="1098.5426" hpRegen="8.5" mp="1643.445" mpRegen="3" />
 			<attack physical="894.75854" magical="611.00409" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
@@ -3856,26 +3615,6 @@
 			<radius normal="28" />
 			<height normal="75" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="57" min="554" max="1294" chance="70" /> <!-- Adena -->
-				<item id="1871" min="1" max="1" chance="14.31" /> <!-- Charcoal -->
-				<item id="1870" min="1" max="1" chance="13.76" /> <!-- Coal -->
-				<item id="1866" min="1" max="1" chance="9.229" /> <!-- Suede -->
-				<item id="1895" min="1" max="1" chance="3.965" /> <!-- Metallic Fiber -->
-				<item id="6341" min="1" max="1" chance="3.07" /> <!-- Sealed Phoenix Earring Gemstone -->
-				<item id="1876" min="1" max="1" chance="2.813" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="2.286" /> <!-- Cokes -->
-			</drop>
-			<spoil>
-				<item id="1866" min="1" max="1" chance="86.16" /> <!-- Suede -->
-				<item id="1870" min="1" max="3" chance="64.76" /> <!-- Coal -->
-				<item id="1871" min="1" max="3" chance="64.44" /> <!-- Charcoal -->
-				<item id="1895" min="1" max="1" chance="37.02" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="25.52" /> <!-- Mithril Ore -->
-				<item id="1879" min="1" max="1" chance="22.48" /> <!-- Cokes -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="21654" level="81" type="Monster" name="Dreco" title="Earth Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->