From 182dcbacd8b9fa3693fecf93b85a7a7beba5eea4 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 12 Mar 2019 01:30:04 +0000
Subject: [PATCH] =?UTF-8?q?Mystic=20Tavern=20=E2=80=93=20Kelbim=20monster?=
 =?UTF-8?q?=20adjustments.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dist/game/data/stats/npcs/23600-23699.xml | 189 +++++++++++-----
 .../dist/game/data/stats/npcs/23700-23799.xml | 206 +++++++++---------
 .../dist/game/data/stats/npcs/23600-23699.xml | 189 +++++++++++-----
 .../dist/game/data/stats/npcs/23700-23799.xml | 206 +++++++++---------
 .../dist/game/data/stats/npcs/23600-23699.xml | 187 +++++++++++-----
 .../dist/game/data/stats/npcs/23700-23799.xml | 206 +++++++++---------
 .../dist/game/data/stats/npcs/24000-24099.xml |  35 +--
 .../dist/game/data/stats/npcs/23600-23699.xml | 187 +++++++++++-----
 .../dist/game/data/stats/npcs/23700-23799.xml | 206 +++++++++---------
 .../dist/game/data/stats/npcs/24000-24099.xml |  35 +--
 .../dist/game/data/stats/npcs/23600-23699.xml | 187 +++++++++++-----
 .../dist/game/data/stats/npcs/23700-23799.xml | 206 +++++++++---------
 .../dist/game/data/stats/npcs/24000-24099.xml |  35 +--
 .../dist/game/data/stats/npcs/23600-23699.xml | 187 ++++++++++++----
 .../dist/game/data/stats/npcs/23700-23799.xml | 206 +++++++++---------
 .../dist/game/data/stats/npcs/24000-24099.xml |  36 +--
 16 files changed, 1521 insertions(+), 982 deletions(-)

diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23600-23699.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23600-23699.xml
index 4a3759de72..f52bb66897 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23600-23699.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23600-23699.xml
@@ -3942,7 +3942,7 @@
 			<skill id="4416" level="8" /> <!-- Angels -->
 			<skill id="5466" level="1" /> <!-- Holy Attacks -->
 			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="23684" level="100" type="L2Monster" name="Seal Angel">
@@ -3997,7 +3997,6 @@
 				<item id="19448" min="1" max="1" chance="80.25" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
 				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
 				<item id="19447" min="1" max="1" chance="20.42" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
-				<item id="48568" min="1" max="3" chance="19.02" /> <!-- Guard Agathion Fragment -->
 				<item id="35340" min="1" max="1" chance="3" /> <!-- Eternal Gaiter Ingredient -->
 				<item id="35353" min="1" max="1" chance="2.993" /> <!-- Eternal Shoe Ingredient -->
 				<item id="35347" min="1" max="1" chance="2.967" /> <!-- Eternal Leather Glove Ingredient -->
@@ -4227,155 +4226,245 @@
 			<height normal="35.1" />
 		</collision>
 	</npc>
-	<npc id="23691" level="101" type="L2Npc" name="Haren" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23691" level="101" type="L2Monster" name="Haren" title="Dragonclaw Knight Captain">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23692" level="101" type="L2Npc" name="Fiora" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23692" level="101" type="L2Monster" name="Fiora" title="Dragonclaw Knight Captain">
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="23693" level="85" type="L2Npc" name="Typhoon" title="Dragonclaw Royal Guard Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23693" level="101" type="L2Monster" name="Typhoon" title="Dragonclaw Royal Guard Captain">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2511960" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="3396139.104285" hpRegen="9.5" mp="4365514.869" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="28" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="19448" min="1" max="1" chance="79.36" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
+				<item id="19447" min="1" max="1" chance="20.41" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35347" min="1" max="1" chance="3.001" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35348" min="1" max="1" chance="2.992" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35346" min="1" max="1" chance="2.985" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35341" min="1" max="1" chance="2.984" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35354" min="1" max="1" chance="2.966" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35338" min="1" max="1" chance="2.955" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35350" min="1" max="1" chance="2.949" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35340" min="1" max="1" chance="2.949" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35344" min="1" max="1" chance="2.934" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35351" min="1" max="1" chance="2.928" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35343" min="1" max="1" chance="2.924" /> <!-- Eternal Shield Ingredient -->
+				<item id="35349" min="1" max="1" chance="2.917" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="2.905" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35353" min="1" max="1" chance="2.903" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35345" min="1" max="1" chance="2.9" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="2.899" /> <!-- Eternal Boot Ingredient -->
+				<item id="35352" min="1" max="1" chance="2.885" /> <!-- Eternal Glove Ingredient -->
+				<item id="35473" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46537" min="1" max="1" chance="0.75" /> <!-- Mystic Soul Crystal Fragment -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35464" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="38065" min="1" max="1" chance="0.3" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="0.3" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="0.3" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="0.3" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="0.3" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="0.3" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="0.3" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="0.3" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="0.3" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="38057" min="1" max="1" chance="0.3" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="0.3" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="0.3" /> <!-- Eternal Shield Crafting Box -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23694" level="100" type="L2Npc" name="Royal Guard Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23694" level="100" type="L2Monster" name="Royal Guard Knight">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23695" level="100" type="L2Npc" name="Royal Guard Healer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23695" level="100" type="L2Monster" name="Royal Guard Healer">
+		<race>ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23696" level="85" type="L2Npc" name="Domithan" title="Dragonclaw Royal Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23696" level="101" type="L2Monster" name="Domithan" title="Dragonclaw Royal Guard">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="30297" min="1" max="2" chance="85.95" /> <!-- Superior Giant's Codex -->
+				<item id="17527" min="2" max="3" chance="79.19" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="2" chance="20.41" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="10.048" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.55" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.519" /> <!-- Rune Stone -->
+				<item id="46151" min="1" max="1" chance="2.495" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23697" level="85" type="L2Npc" name="Knight Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23697" level="85" type="L2Monster" name="Knight Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23698" level="85" type="L2Npc" name="Knight Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23698" level="100" type="L2Monster" name="Knight Archer">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23699" level="100" type="L2Npc" name="Royal Guard Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23699" level="100" type="L2Monster" name="Royal Guard Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml
index 8df23c15b6..aeba0072bf 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,64 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="23700" level="100" type="L2Npc" name="Altar Guardian">
+	<npc id="23700" level="100" type="L2Monster" name="Altar Guardian">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="240" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23701" level="100" type="L2Npc" name="Knight Guard" title="Dragonclaw Clan">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23701" level="100" type="L2Monster" name="Knight Guard" title="Dragonclaw Clan">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="23702" level="101" type="L2Npc" name="Duran" title="Dragonclaw Royal Guard">
+	<npc id="23702" level="101" type="L2Npc" name="L2Monster" title="Dragonclaw Royal Guard">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="2" max="3" chance="80.93" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="30297" min="1" max="2" chance="85.05" /> <!-- Superior Giant's Codex -->
+				<item id="17526" min="1" max="2" chance="19.85" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="9.997" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="46151" min="1" max="1" chance="2.51" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.475" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.475" /> <!-- Rune Stone -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="23703" level="101" type="L2Npc" name="Ice Knight" title="Winter Omen">
 		<race>HUMANOID</race>
@@ -157,61 +166,58 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23706" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23706" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23707" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
+	<npc id="23707" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23708" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23708" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
@@ -241,82 +247,78 @@
 			<skill id="14817" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23710" level="100" type="L2Npc" name="Knight Guardian">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23710" level="100" type="L2Monster" name="Knight Guardian">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23711" level="100" type="L2Npc" name="Altar Guardian Soldier">
-		<race>HUMAN</race>
+	<npc id="23711" level="100" type="L2Monster" name="Altar Guardian Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23712" level="100" type="L2Npc" name="Altar Guardian Archer">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="23712" level="100" type="L2Monster" name="Altar Guardian Archer">
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23713" level="100" type="L2Npc" name="Altar Guardian Wizard">
+	<npc id="23713" level="100" type="L2Monster" name="Altar Guardian Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
@@ -356,41 +358,39 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="23716" level="100" type="L2Npc" name="Wild Hog Cannon">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23716" level="100" type="L2Monster" name="Wild Hog Cannon">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="10" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.5" />
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="23717" level="100" type="L2Npc" name="Siege Golem">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23717" level="100" type="L2Monster" name="Siege Golem">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="50" />
 			<height normal="68" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23600-23699.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23600-23699.xml
index 4a3759de72..f52bb66897 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23600-23699.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23600-23699.xml
@@ -3942,7 +3942,7 @@
 			<skill id="4416" level="8" /> <!-- Angels -->
 			<skill id="5466" level="1" /> <!-- Holy Attacks -->
 			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 	</npc>
 	<npc id="23684" level="100" type="L2Monster" name="Seal Angel">
@@ -3997,7 +3997,6 @@
 				<item id="19448" min="1" max="1" chance="80.25" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
 				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
 				<item id="19447" min="1" max="1" chance="20.42" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
-				<item id="48568" min="1" max="3" chance="19.02" /> <!-- Guard Agathion Fragment -->
 				<item id="35340" min="1" max="1" chance="3" /> <!-- Eternal Gaiter Ingredient -->
 				<item id="35353" min="1" max="1" chance="2.993" /> <!-- Eternal Shoe Ingredient -->
 				<item id="35347" min="1" max="1" chance="2.967" /> <!-- Eternal Leather Glove Ingredient -->
@@ -4227,155 +4226,245 @@
 			<height normal="35.1" />
 		</collision>
 	</npc>
-	<npc id="23691" level="101" type="L2Npc" name="Haren" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23691" level="101" type="L2Monster" name="Haren" title="Dragonclaw Knight Captain">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23692" level="101" type="L2Npc" name="Fiora" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23692" level="101" type="L2Monster" name="Fiora" title="Dragonclaw Knight Captain">
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="23693" level="85" type="L2Npc" name="Typhoon" title="Dragonclaw Royal Guard Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23693" level="101" type="L2Monster" name="Typhoon" title="Dragonclaw Royal Guard Captain">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2511960" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="3396139.104285" hpRegen="9.5" mp="4365514.869" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="28" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="19448" min="1" max="1" chance="79.36" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
+				<item id="19447" min="1" max="1" chance="20.41" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35347" min="1" max="1" chance="3.001" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35348" min="1" max="1" chance="2.992" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35346" min="1" max="1" chance="2.985" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35341" min="1" max="1" chance="2.984" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35354" min="1" max="1" chance="2.966" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35338" min="1" max="1" chance="2.955" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35350" min="1" max="1" chance="2.949" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35340" min="1" max="1" chance="2.949" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35344" min="1" max="1" chance="2.934" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35351" min="1" max="1" chance="2.928" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35343" min="1" max="1" chance="2.924" /> <!-- Eternal Shield Ingredient -->
+				<item id="35349" min="1" max="1" chance="2.917" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="2.905" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35353" min="1" max="1" chance="2.903" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35345" min="1" max="1" chance="2.9" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="2.899" /> <!-- Eternal Boot Ingredient -->
+				<item id="35352" min="1" max="1" chance="2.885" /> <!-- Eternal Glove Ingredient -->
+				<item id="35473" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46537" min="1" max="1" chance="0.75" /> <!-- Mystic Soul Crystal Fragment -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35464" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="38065" min="1" max="1" chance="0.3" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="0.3" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="0.3" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="0.3" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="0.3" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="0.3" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="0.3" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="0.3" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="0.3" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="38057" min="1" max="1" chance="0.3" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="0.3" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="0.3" /> <!-- Eternal Shield Crafting Box -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23694" level="100" type="L2Npc" name="Royal Guard Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23694" level="100" type="L2Monster" name="Royal Guard Knight">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23695" level="100" type="L2Npc" name="Royal Guard Healer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23695" level="100" type="L2Monster" name="Royal Guard Healer">
+		<race>ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23696" level="85" type="L2Npc" name="Domithan" title="Dragonclaw Royal Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23696" level="101" type="L2Monster" name="Domithan" title="Dragonclaw Royal Guard">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="30297" min="1" max="2" chance="85.95" /> <!-- Superior Giant's Codex -->
+				<item id="17527" min="2" max="3" chance="79.19" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="2" chance="20.41" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="10.048" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.55" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.519" /> <!-- Rune Stone -->
+				<item id="46151" min="1" max="1" chance="2.495" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23697" level="85" type="L2Npc" name="Knight Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23697" level="85" type="L2Monster" name="Knight Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23698" level="85" type="L2Npc" name="Knight Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23698" level="100" type="L2Monster" name="Knight Archer">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23699" level="100" type="L2Npc" name="Royal Guard Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23699" level="100" type="L2Monster" name="Royal Guard Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml
index 6c72c20b5d..ccbf408db1 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,64 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="23700" level="100" type="L2Npc" name="Altar Guardian">
+	<npc id="23700" level="100" type="L2Monster" name="Altar Guardian">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="240" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23701" level="100" type="L2Npc" name="Knight Guard" title="Dragonclaw Clan">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23701" level="100" type="L2Monster" name="Knight Guard" title="Dragonclaw Clan">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="23702" level="101" type="L2Npc" name="Duran" title="Dragonclaw Royal Guard">
+	<npc id="23702" level="101" type="L2Npc" name="L2Monster" title="Dragonclaw Royal Guard">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="2" max="3" chance="80.93" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="30297" min="1" max="2" chance="85.05" /> <!-- Superior Giant's Codex -->
+				<item id="17526" min="1" max="2" chance="19.85" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="9.997" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="46151" min="1" max="1" chance="2.51" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.475" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.475" /> <!-- Rune Stone -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="23703" level="101" type="L2Npc" name="Ice Knight" title="Winter Omen">
 		<race>HUMANOID</race>
@@ -157,61 +166,58 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23706" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23706" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23707" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
+	<npc id="23707" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23708" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23708" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
@@ -241,82 +247,78 @@
 			<skill id="14817" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23710" level="100" type="L2Npc" name="Knight Guardian">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23710" level="100" type="L2Monster" name="Knight Guardian">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23711" level="100" type="L2Npc" name="Altar Guardian Soldier">
-		<race>HUMAN</race>
+	<npc id="23711" level="100" type="L2Monster" name="Altar Guardian Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23712" level="100" type="L2Npc" name="Altar Guardian Archer">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="23712" level="100" type="L2Monster" name="Altar Guardian Archer">
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23713" level="100" type="L2Npc" name="Altar Guardian Wizard">
+	<npc id="23713" level="100" type="L2Monster" name="Altar Guardian Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
@@ -356,41 +358,39 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="23716" level="100" type="L2Npc" name="Wild Hog Cannon">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23716" level="100" type="L2Monster" name="Wild Hog Cannon">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="10" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.5" />
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="23717" level="100" type="L2Npc" name="Siege Golem">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23717" level="100" type="L2Monster" name="Siege Golem">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="50" />
 			<height normal="68" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23600-23699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23600-23699.xml
index 4a3759de72..1fe569c033 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23600-23699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23600-23699.xml
@@ -3997,7 +3997,6 @@
 				<item id="19448" min="1" max="1" chance="80.25" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
 				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
 				<item id="19447" min="1" max="1" chance="20.42" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
-				<item id="48568" min="1" max="3" chance="19.02" /> <!-- Guard Agathion Fragment -->
 				<item id="35340" min="1" max="1" chance="3" /> <!-- Eternal Gaiter Ingredient -->
 				<item id="35353" min="1" max="1" chance="2.993" /> <!-- Eternal Shoe Ingredient -->
 				<item id="35347" min="1" max="1" chance="2.967" /> <!-- Eternal Leather Glove Ingredient -->
@@ -4227,155 +4226,245 @@
 			<height normal="35.1" />
 		</collision>
 	</npc>
-	<npc id="23691" level="101" type="L2Npc" name="Haren" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23691" level="101" type="L2Monster" name="Haren" title="Dragonclaw Knight Captain">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23692" level="101" type="L2Npc" name="Fiora" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23692" level="101" type="L2Monster" name="Fiora" title="Dragonclaw Knight Captain">
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="23693" level="85" type="L2Npc" name="Typhoon" title="Dragonclaw Royal Guard Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23693" level="101" type="L2Monster" name="Typhoon" title="Dragonclaw Royal Guard Captain">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2511960" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="3396139.104285" hpRegen="9.5" mp="4365514.869" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="28" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="19448" min="1" max="1" chance="79.36" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
+				<item id="19447" min="1" max="1" chance="20.41" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35347" min="1" max="1" chance="3.001" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35348" min="1" max="1" chance="2.992" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35346" min="1" max="1" chance="2.985" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35341" min="1" max="1" chance="2.984" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35354" min="1" max="1" chance="2.966" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35338" min="1" max="1" chance="2.955" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35350" min="1" max="1" chance="2.949" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35340" min="1" max="1" chance="2.949" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35344" min="1" max="1" chance="2.934" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35351" min="1" max="1" chance="2.928" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35343" min="1" max="1" chance="2.924" /> <!-- Eternal Shield Ingredient -->
+				<item id="35349" min="1" max="1" chance="2.917" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="2.905" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35353" min="1" max="1" chance="2.903" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35345" min="1" max="1" chance="2.9" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="2.899" /> <!-- Eternal Boot Ingredient -->
+				<item id="35352" min="1" max="1" chance="2.885" /> <!-- Eternal Glove Ingredient -->
+				<item id="35473" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46537" min="1" max="1" chance="0.75" /> <!-- Mystic Soul Crystal Fragment -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35464" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="38065" min="1" max="1" chance="0.3" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="0.3" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="0.3" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="0.3" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="0.3" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="0.3" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="0.3" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="0.3" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="0.3" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="38057" min="1" max="1" chance="0.3" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="0.3" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="0.3" /> <!-- Eternal Shield Crafting Box -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23694" level="100" type="L2Npc" name="Royal Guard Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23694" level="100" type="L2Monster" name="Royal Guard Knight">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23695" level="100" type="L2Npc" name="Royal Guard Healer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23695" level="100" type="L2Monster" name="Royal Guard Healer">
+		<race>ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23696" level="85" type="L2Npc" name="Domithan" title="Dragonclaw Royal Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23696" level="101" type="L2Monster" name="Domithan" title="Dragonclaw Royal Guard">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="30297" min="1" max="2" chance="85.95" /> <!-- Superior Giant's Codex -->
+				<item id="17527" min="2" max="3" chance="79.19" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="2" chance="20.41" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="10.048" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.55" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.519" /> <!-- Rune Stone -->
+				<item id="46151" min="1" max="1" chance="2.495" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23697" level="85" type="L2Npc" name="Knight Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23697" level="85" type="L2Monster" name="Knight Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23698" level="85" type="L2Npc" name="Knight Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23698" level="100" type="L2Monster" name="Knight Archer">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23699" level="100" type="L2Npc" name="Royal Guard Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23699" level="100" type="L2Monster" name="Royal Guard Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml
index cd5ef920aa..e86824f36e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,64 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="23700" level="100" type="L2Npc" name="Altar Guardian">
+	<npc id="23700" level="100" type="L2Monster" name="Altar Guardian">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="240" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23701" level="100" type="L2Npc" name="Knight Guard" title="Dragonclaw Clan">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23701" level="100" type="L2Monster" name="Knight Guard" title="Dragonclaw Clan">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="23702" level="101" type="L2Npc" name="Duran" title="Dragonclaw Royal Guard">
+	<npc id="23702" level="101" type="L2Npc" name="L2Monster" title="Dragonclaw Royal Guard">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="2" max="3" chance="80.93" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="30297" min="1" max="2" chance="85.05" /> <!-- Superior Giant's Codex -->
+				<item id="17526" min="1" max="2" chance="19.85" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="9.997" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="46151" min="1" max="1" chance="2.51" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.475" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.475" /> <!-- Rune Stone -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="23703" level="101" type="L2Npc" name="Ice Knight" title="Winter Omen">
 		<race>HUMANOID</race>
@@ -157,61 +166,58 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23706" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23706" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23707" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
+	<npc id="23707" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23708" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23708" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
@@ -241,82 +247,78 @@
 			<skill id="14817" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23710" level="100" type="L2Npc" name="Knight Guardian">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23710" level="100" type="L2Monster" name="Knight Guardian">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23711" level="100" type="L2Npc" name="Altar Guardian Soldier">
-		<race>HUMAN</race>
+	<npc id="23711" level="100" type="L2Monster" name="Altar Guardian Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23712" level="100" type="L2Npc" name="Altar Guardian Archer">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="23712" level="100" type="L2Monster" name="Altar Guardian Archer">
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23713" level="100" type="L2Npc" name="Altar Guardian Wizard">
+	<npc id="23713" level="100" type="L2Monster" name="Altar Guardian Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
@@ -356,41 +358,39 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="23716" level="100" type="L2Npc" name="Wild Hog Cannon">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23716" level="100" type="L2Monster" name="Wild Hog Cannon">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="10" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.5" />
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="23717" level="100" type="L2Npc" name="Siege Golem">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23717" level="100" type="L2Monster" name="Siege Golem">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="50" />
 			<height normal="68" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/24000-24099.xml
index 8a9f0105e2..3ccce631ce 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/24000-24099.xml
@@ -1332,27 +1332,27 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24052" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="24052" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
+		<race>HUMAN</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23.5" />
 		</collision>
 		<skillList>
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4416" level="14" /> <!-- Humans -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
@@ -1436,20 +1436,21 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24056" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="24056" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="233823400" sp="233900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="26.5" />
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23600-23699.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23600-23699.xml
index 2c01456c31..2d73b55413 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23600-23699.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23600-23699.xml
@@ -3997,7 +3997,6 @@
 				<item id="19448" min="1" max="1" chance="80.25" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
 				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
 				<item id="19447" min="1" max="1" chance="20.42" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
-				<item id="48568" min="1" max="3" chance="19.02" /> <!-- Guard Agathion Fragment -->
 				<item id="35340" min="1" max="1" chance="3" /> <!-- Eternal Gaiter Ingredient -->
 				<item id="35353" min="1" max="1" chance="2.993" /> <!-- Eternal Shoe Ingredient -->
 				<item id="35347" min="1" max="1" chance="2.967" /> <!-- Eternal Leather Glove Ingredient -->
@@ -4227,155 +4226,245 @@
 			<height normal="35.1" />
 		</collision>
 	</npc>
-	<npc id="23691" level="101" type="L2Npc" name="Haren" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23691" level="101" type="L2Monster" name="Haren" title="Dragonclaw Knight Captain">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23692" level="101" type="L2Npc" name="Fiora" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23692" level="101" type="L2Monster" name="Fiora" title="Dragonclaw Knight Captain">
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="23693" level="85" type="L2Npc" name="Typhoon" title="Dragonclaw Royal Guard Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23693" level="101" type="L2Monster" name="Typhoon" title="Dragonclaw Royal Guard Captain">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2511960" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="3396139.104285" hpRegen="9.5" mp="4365514.869" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="28" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="19448" min="1" max="1" chance="79.36" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
+				<item id="19447" min="1" max="1" chance="20.41" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35347" min="1" max="1" chance="3.001" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35348" min="1" max="1" chance="2.992" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35346" min="1" max="1" chance="2.985" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35341" min="1" max="1" chance="2.984" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35354" min="1" max="1" chance="2.966" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35338" min="1" max="1" chance="2.955" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35350" min="1" max="1" chance="2.949" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35340" min="1" max="1" chance="2.949" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35344" min="1" max="1" chance="2.934" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35351" min="1" max="1" chance="2.928" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35343" min="1" max="1" chance="2.924" /> <!-- Eternal Shield Ingredient -->
+				<item id="35349" min="1" max="1" chance="2.917" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="2.905" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35353" min="1" max="1" chance="2.903" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35345" min="1" max="1" chance="2.9" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="2.899" /> <!-- Eternal Boot Ingredient -->
+				<item id="35352" min="1" max="1" chance="2.885" /> <!-- Eternal Glove Ingredient -->
+				<item id="35473" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46537" min="1" max="1" chance="0.75" /> <!-- Mystic Soul Crystal Fragment -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35464" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="38065" min="1" max="1" chance="0.3" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="0.3" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="0.3" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="0.3" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="0.3" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="0.3" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="0.3" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="0.3" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="0.3" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="38057" min="1" max="1" chance="0.3" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="0.3" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="0.3" /> <!-- Eternal Shield Crafting Box -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23694" level="100" type="L2Npc" name="Royal Guard Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23694" level="100" type="L2Monster" name="Royal Guard Knight">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23695" level="100" type="L2Npc" name="Royal Guard Healer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23695" level="100" type="L2Monster" name="Royal Guard Healer">
+		<race>ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23696" level="85" type="L2Npc" name="Domithan" title="Dragonclaw Royal Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23696" level="101" type="L2Monster" name="Domithan" title="Dragonclaw Royal Guard">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="30297" min="1" max="2" chance="85.95" /> <!-- Superior Giant's Codex -->
+				<item id="17527" min="2" max="3" chance="79.19" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="2" chance="20.41" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="10.048" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.55" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.519" /> <!-- Rune Stone -->
+				<item id="46151" min="1" max="1" chance="2.495" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23697" level="85" type="L2Npc" name="Knight Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23697" level="85" type="L2Monster" name="Knight Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23698" level="85" type="L2Npc" name="Knight Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23698" level="100" type="L2Monster" name="Knight Archer">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23699" level="100" type="L2Npc" name="Royal Guard Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23699" level="100" type="L2Monster" name="Royal Guard Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23700-23799.xml
index cf906aa5be..3da5567f06 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,64 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="23700" level="100" type="L2Npc" name="Altar Guardian">
+	<npc id="23700" level="100" type="L2Monster" name="Altar Guardian">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="240" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23701" level="100" type="L2Npc" name="Knight Guard" title="Dragonclaw Clan">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23701" level="100" type="L2Monster" name="Knight Guard" title="Dragonclaw Clan">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="23702" level="101" type="L2Npc" name="Duran" title="Dragonclaw Royal Guard">
+	<npc id="23702" level="101" type="L2Npc" name="L2Monster" title="Dragonclaw Royal Guard">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="2" max="3" chance="80.93" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="30297" min="1" max="2" chance="85.05" /> <!-- Superior Giant's Codex -->
+				<item id="17526" min="1" max="2" chance="19.85" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="9.997" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="46151" min="1" max="1" chance="2.51" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.475" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.475" /> <!-- Rune Stone -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="23703" level="101" type="L2Npc" name="Ice Knight" title="Winter Omen">
 		<race>HUMANOID</race>
@@ -157,61 +166,58 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23706" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23706" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23707" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
+	<npc id="23707" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23708" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23708" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
@@ -241,82 +247,78 @@
 			<skill id="14817" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23710" level="100" type="L2Npc" name="Knight Guardian">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23710" level="100" type="L2Monster" name="Knight Guardian">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23711" level="100" type="L2Npc" name="Altar Guardian Soldier">
-		<race>HUMAN</race>
+	<npc id="23711" level="100" type="L2Monster" name="Altar Guardian Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23712" level="100" type="L2Npc" name="Altar Guardian Archer">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="23712" level="100" type="L2Monster" name="Altar Guardian Archer">
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23713" level="100" type="L2Npc" name="Altar Guardian Wizard">
+	<npc id="23713" level="100" type="L2Monster" name="Altar Guardian Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
@@ -356,41 +358,39 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="23716" level="100" type="L2Npc" name="Wild Hog Cannon">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23716" level="100" type="L2Monster" name="Wild Hog Cannon">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="10" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.5" />
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="23717" level="100" type="L2Npc" name="Siege Golem">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23717" level="100" type="L2Monster" name="Siege Golem">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="50" />
 			<height normal="68" />
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml
index 507c00f448..3297da1720 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/24000-24099.xml
@@ -1332,27 +1332,27 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24052" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="24052" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
+		<race>HUMAN</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23.5" />
 		</collision>
 		<skillList>
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4416" level="14" /> <!-- Humans -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
@@ -1436,20 +1436,21 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24056" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="24056" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="233823400" sp="233900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="26.5" />
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23600-23699.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23600-23699.xml
index 402e0a147f..382f417697 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23600-23699.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23600-23699.xml
@@ -3997,7 +3997,6 @@
 				<item id="19448" min="1" max="1" chance="80.25" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
 				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
 				<item id="19447" min="1" max="1" chance="20.42" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
-				<item id="48568" min="1" max="3" chance="19.02" /> <!-- Guard Agathion Fragment -->
 				<item id="35340" min="1" max="1" chance="3" /> <!-- Eternal Gaiter Ingredient -->
 				<item id="35353" min="1" max="1" chance="2.993" /> <!-- Eternal Shoe Ingredient -->
 				<item id="35347" min="1" max="1" chance="2.967" /> <!-- Eternal Leather Glove Ingredient -->
@@ -4227,155 +4226,245 @@
 			<height normal="35.1" />
 		</collision>
 	</npc>
-	<npc id="23691" level="101" type="L2Npc" name="Haren" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23691" level="101" type="L2Monster" name="Haren" title="Dragonclaw Knight Captain">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23692" level="101" type="L2Npc" name="Fiora" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23692" level="101" type="L2Monster" name="Fiora" title="Dragonclaw Knight Captain">
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="23693" level="85" type="L2Npc" name="Typhoon" title="Dragonclaw Royal Guard Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23693" level="101" type="L2Monster" name="Typhoon" title="Dragonclaw Royal Guard Captain">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2511960" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="3396139.104285" hpRegen="9.5" mp="4365514.869" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="28" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="19448" min="1" max="1" chance="79.36" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
+				<item id="19447" min="1" max="1" chance="20.41" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35347" min="1" max="1" chance="3.001" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35348" min="1" max="1" chance="2.992" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35346" min="1" max="1" chance="2.985" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35341" min="1" max="1" chance="2.984" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35354" min="1" max="1" chance="2.966" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35338" min="1" max="1" chance="2.955" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35350" min="1" max="1" chance="2.949" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35340" min="1" max="1" chance="2.949" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35344" min="1" max="1" chance="2.934" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35351" min="1" max="1" chance="2.928" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35343" min="1" max="1" chance="2.924" /> <!-- Eternal Shield Ingredient -->
+				<item id="35349" min="1" max="1" chance="2.917" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="2.905" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35353" min="1" max="1" chance="2.903" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35345" min="1" max="1" chance="2.9" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="2.899" /> <!-- Eternal Boot Ingredient -->
+				<item id="35352" min="1" max="1" chance="2.885" /> <!-- Eternal Glove Ingredient -->
+				<item id="35473" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46537" min="1" max="1" chance="0.75" /> <!-- Mystic Soul Crystal Fragment -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35464" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="38065" min="1" max="1" chance="0.3" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="0.3" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="0.3" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="0.3" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="0.3" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="0.3" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="0.3" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="0.3" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="0.3" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="38057" min="1" max="1" chance="0.3" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="0.3" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="0.3" /> <!-- Eternal Shield Crafting Box -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23694" level="100" type="L2Npc" name="Royal Guard Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23694" level="100" type="L2Monster" name="Royal Guard Knight">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23695" level="100" type="L2Npc" name="Royal Guard Healer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23695" level="100" type="L2Monster" name="Royal Guard Healer">
+		<race>ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23696" level="85" type="L2Npc" name="Domithan" title="Dragonclaw Royal Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23696" level="101" type="L2Monster" name="Domithan" title="Dragonclaw Royal Guard">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="30297" min="1" max="2" chance="85.95" /> <!-- Superior Giant's Codex -->
+				<item id="17527" min="2" max="3" chance="79.19" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="2" chance="20.41" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="10.048" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.55" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.519" /> <!-- Rune Stone -->
+				<item id="46151" min="1" max="1" chance="2.495" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23697" level="85" type="L2Npc" name="Knight Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23697" level="85" type="L2Monster" name="Knight Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23698" level="85" type="L2Npc" name="Knight Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23698" level="100" type="L2Monster" name="Knight Archer">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23699" level="100" type="L2Npc" name="Royal Guard Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23699" level="100" type="L2Monster" name="Royal Guard Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23700-23799.xml
index 3b15c00ec7..37bf9224f0 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,64 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="23700" level="100" type="L2Npc" name="Altar Guardian">
+	<npc id="23700" level="100" type="L2Monster" name="Altar Guardian">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="240" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23701" level="100" type="L2Npc" name="Knight Guard" title="Dragonclaw Clan">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23701" level="100" type="L2Monster" name="Knight Guard" title="Dragonclaw Clan">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="23702" level="101" type="L2Npc" name="Duran" title="Dragonclaw Royal Guard">
+	<npc id="23702" level="101" type="L2Npc" name="L2Monster" title="Dragonclaw Royal Guard">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="2" max="3" chance="80.93" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="30297" min="1" max="2" chance="85.05" /> <!-- Superior Giant's Codex -->
+				<item id="17526" min="1" max="2" chance="19.85" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="9.997" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="46151" min="1" max="1" chance="2.51" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.475" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.475" /> <!-- Rune Stone -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="23703" level="101" type="L2Npc" name="Ice Knight" title="Winter Omen">
 		<race>HUMANOID</race>
@@ -157,61 +166,58 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23706" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23706" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23707" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
+	<npc id="23707" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23708" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23708" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
@@ -241,82 +247,78 @@
 			<skill id="14817" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23710" level="100" type="L2Npc" name="Knight Guardian">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23710" level="100" type="L2Monster" name="Knight Guardian">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23711" level="100" type="L2Npc" name="Altar Guardian Soldier">
-		<race>HUMAN</race>
+	<npc id="23711" level="100" type="L2Monster" name="Altar Guardian Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23712" level="100" type="L2Npc" name="Altar Guardian Archer">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="23712" level="100" type="L2Monster" name="Altar Guardian Archer">
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23713" level="100" type="L2Npc" name="Altar Guardian Wizard">
+	<npc id="23713" level="100" type="L2Monster" name="Altar Guardian Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
@@ -356,41 +358,39 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="23716" level="100" type="L2Npc" name="Wild Hog Cannon">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23716" level="100" type="L2Monster" name="Wild Hog Cannon">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="10" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.5" />
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="23717" level="100" type="L2Npc" name="Siege Golem">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23717" level="100" type="L2Monster" name="Siege Golem">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="50" />
 			<height normal="68" />
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/24000-24099.xml
index 5d5298443b..e963790975 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/24000-24099.xml
@@ -1332,27 +1332,27 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24052" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="24052" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
+		<race>HUMAN</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23.5" />
 		</collision>
 		<skillList>
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4416" level="14" /> <!-- Humans -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
@@ -1436,20 +1436,21 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24056" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="24056" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="233823400" sp="233900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="26.5" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23600-23699.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23600-23699.xml
index 2c01456c31..4ab61a38ba 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23600-23699.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23600-23699.xml
@@ -4227,155 +4227,246 @@
 			<height normal="35.1" />
 		</collision>
 	</npc>
-	<npc id="23691" level="101" type="L2Npc" name="Haren" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23691" level="101" type="L2Monster" name="Haren" title="Dragonclaw Knight Captain">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23692" level="101" type="L2Npc" name="Fiora" title="Dragonclaw Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23692" level="101" type="L2Monster" name="Fiora" title="Dragonclaw Knight Captain">
+		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="837320" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="1132046.368095" hpRegen="9.5" mp="1455171.623" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="23693" level="85" type="L2Npc" name="Typhoon" title="Dragonclaw Royal Guard Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23693" level="101" type="L2Monster" name="Typhoon" title="Dragonclaw Royal Guard Captain">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="1893041700" sp="3786101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2511960" hpRegen="7.5" mp="47856" mpRegen="2.7" />
+			<vitals hp="3396139.104285" hpRegen="9.5" mp="4365514.869" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="11" />
 			<height normal="28" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="19448" min="1" max="1" chance="79.36" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="57" min="35000000" max="70000000" chance="20" /> <!-- Adena -->
+				<item id="19447" min="1" max="1" chance="20.41" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="48568" min="1" max="3" chance="19.66" /> <!-- Guard Agathion Fragment -->
+				<item id="35347" min="1" max="1" chance="3.001" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35348" min="1" max="1" chance="2.992" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35346" min="1" max="1" chance="2.985" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35341" min="1" max="1" chance="2.984" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35354" min="1" max="1" chance="2.966" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35338" min="1" max="1" chance="2.955" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35350" min="1" max="1" chance="2.949" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35340" min="1" max="1" chance="2.949" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35344" min="1" max="1" chance="2.934" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35351" min="1" max="1" chance="2.928" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35343" min="1" max="1" chance="2.924" /> <!-- Eternal Shield Ingredient -->
+				<item id="35349" min="1" max="1" chance="2.917" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="2.905" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35353" min="1" max="1" chance="2.903" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35345" min="1" max="1" chance="2.9" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="2.899" /> <!-- Eternal Boot Ingredient -->
+				<item id="35352" min="1" max="1" chance="2.885" /> <!-- Eternal Glove Ingredient -->
+				<item id="35473" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46537" min="1" max="1" chance="0.75" /> <!-- Mystic Soul Crystal Fragment -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35464" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="38065" min="1" max="1" chance="0.3" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38066" min="1" max="1" chance="0.3" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="0.3" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="0.3" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="0.3" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38070" min="1" max="1" chance="0.3" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="0.3" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="0.3" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="0.3" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="38057" min="1" max="1" chance="0.3" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="0.3" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="0.3" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="0.3" /> <!-- Eternal Shield Crafting Box -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23694" level="100" type="L2Npc" name="Royal Guard Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23694" level="100" type="L2Monster" name="Royal Guard Knight">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23695" level="100" type="L2Npc" name="Royal Guard Healer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23695" level="100" type="L2Monster" name="Royal Guard Healer">
+		<race>ELF</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23696" level="85" type="L2Npc" name="Domithan" title="Dragonclaw Royal Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23696" level="101" type="L2Monster" name="Domithan" title="Dragonclaw Royal Guard">
+		<race>ORC</race>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="30297" min="1" max="2" chance="85.95" /> <!-- Superior Giant's Codex -->
+				<item id="17527" min="2" max="3" chance="79.19" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="2" chance="20.41" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="10.048" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.55" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.519" /> <!-- Rune Stone -->
+				<item id="46151" min="1" max="1" chance="2.495" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="23697" level="85" type="L2Npc" name="Knight Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+	<npc id="23697" level="85" type="L2Monster" name="Knight Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23698" level="85" type="L2Npc" name="Knight Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23698" level="100" type="L2Monster" name="Knight Archer">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23699" level="100" type="L2Npc" name="Royal Guard Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23699" level="100" type="L2Monster" name="Royal Guard Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23700-23799.xml
index 88dcffa304..7efc773aa4 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,64 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="23700" level="100" type="L2Npc" name="Altar Guardian">
+	<npc id="23700" level="100" type="L2Monster" name="Altar Guardian">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="240" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="23701" level="100" type="L2Npc" name="Knight Guard" title="Dragonclaw Clan">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23701" level="100" type="L2Monster" name="Knight Guard" title="Dragonclaw Clan">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="23702" level="101" type="L2Npc" name="Duran" title="Dragonclaw Royal Guard">
+	<npc id="23702" level="101" type="L2Npc" name="L2Monster" title="Dragonclaw Royal Guard">
 		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<sex>MALE</sex>
+		<acquire exp="946520799" sp="1893101" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="1906838.37927" hpRegen="9.5" mp="2451116.118" mpRegen="3.3" />
+			<attack physical="42356" magical="31566" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3777" magical="2192" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="23" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="2" max="3" chance="80.93" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="30297" min="1" max="2" chance="85.05" /> <!-- Superior Giant's Codex -->
+				<item id="17526" min="1" max="2" chance="19.85" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46150" min="1" max="1" chance="9.997" /> <!-- Superior Giant's Codex - Chapter 1 -->
+				<item id="46151" min="1" max="1" chance="2.51" /> <!-- Superior Giant's Codex - Mastery Chapter 1 -->
+				<item id="30298" min="1" max="1" chance="2.475" /> <!-- Superior Giant's Codex - Mastery -->
+				<item id="39738" min="1" max="1" chance="2.475" /> <!-- Rune Stone -->
+				<item id="46587" min="1" max="1" chance="0.75" /> <!-- Mystic Armor Piece -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="23703" level="101" type="L2Npc" name="Ice Knight" title="Winter Omen">
 		<race>HUMANOID</race>
@@ -157,61 +166,58 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23706" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23706" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23707" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
+	<npc id="23707" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="15841" hpRegen="7.5" mp="2355" mpRegen="2.7" />
+			<vitals hp="17290.225575" hpRegen="9.5" mp="22225.455" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23708" level="100" type="L2Npc" name="Kelbim's Follower">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23708" level="100" type="L2Monster" name="Kelbim's Follower">
+		<race>DWARF</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="9" />
 			<height normal="18" />
@@ -241,82 +247,78 @@
 			<skill id="14817" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23710" level="100" type="L2Npc" name="Knight Guardian">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23710" level="100" type="L2Monster" name="Knight Guardian">
+		<race>DARK_ELF</race>
+		<sex>MALE</sex>
+		<acquire exp="463935300" sp="927900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23711" level="100" type="L2Npc" name="Altar Guardian Soldier">
-		<race>HUMAN</race>
+	<npc id="23711" level="100" type="L2Monster" name="Altar Guardian Soldier">
+		<race>ORC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23712" level="100" type="L2Npc" name="Altar Guardian Archer">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="23712" level="100" type="L2Monster" name="Altar Guardian Archer">
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
+			<vitals hp="58690.23696" hpRegen="9.5" mp="75442.464" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="7.5" />
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="23713" level="100" type="L2Npc" name="Altar Guardian Wizard">
+	<npc id="23713" level="100" type="L2Monster" name="Altar Guardian Wizard">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="119177.31984" hpRegen="9.5" mp="153194.656" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="6.5" />
 			<height normal="22.5" />
@@ -356,41 +358,39 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="23716" level="100" type="L2Npc" name="Wild Hog Cannon">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23716" level="100" type="L2Monster" name="Wild Hog Cannon">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="10" />
 				<run ground="200" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="46.5" />
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="23717" level="100" type="L2Npc" name="Siege Golem">
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+	<npc id="23717" level="100" type="L2Monster" name="Siege Golem">
+		<race>ETC</race>
+		<sex>MALE</sex>
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="436754" hpRegen="7.5" mp="24308" mpRegen="2.7" />
+			<vitals hp="476709.27936" hpRegen="9.5" mp="612778.624" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
 			</speed>
-			<attack physical="23610.1029394933" magical="5767.28134561036" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3839.95121517957" magical="2066.69244923556" />
-			<attribute>
-			<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
-			</attribute>
 		</stats>
+		<status attackable="true" />
 		<collision>
 			<radius normal="50" />
 			<height normal="68" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml
index 919004d2cc..d3180a787e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/24000-24099.xml
@@ -1332,27 +1332,27 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24052" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+	<npc id="24052" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
+		<race>HUMAN</race>
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="0" sp="0" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23.5" />
 		</collision>
 		<skillList>
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4416" level="14" /> <!-- Humans -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
@@ -1436,21 +1436,21 @@
 			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24056" level="100" type="L2Npc" name="Knights Archer" title="Rune Castle Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="24056" level="100" type="L2Monster" name="Knights Archer" title="Rune Castle Unit">
 		<race>UNDEAD</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" />
+		<sex>MALE</sex>
+		<equipment rhand="15302" /> 
+		<acquire exp="233823400" sp="233900" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="873508" hpRegen="10.5" mp="23928" mpRegen="3.6" />
+			<vitals hp="772268.98209" hpRegen="9.5" mp="992701.306" mpRegen="3.3" />
+			<attack physical="38999" magical="27961" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3421" magical="1985" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="26.5" />