From 328e943a3f5b2ad1a50fabda39866b50bab68ebb Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 11 Mar 2019 13:55:09 +0000
Subject: [PATCH] Altar of Shilen monster adjustments.

---
 .../dist/game/data/stats/npcs/23100-23199.xml | 815 ++++++-----------
 .../dist/game/data/stats/npcs/25800-25899.xml | 392 ++++++---
 .../dist/game/data/stats/npcs/23100-23199.xml | 832 ++++++------------
 .../dist/game/data/stats/npcs/25800-25899.xml | 454 +++++++---
 .../dist/game/data/stats/npcs/23100-23199.xml | 832 ++++++------------
 .../dist/game/data/stats/npcs/25800-25899.xml | 454 +++++++---
 .../dist/game/data/stats/npcs/23100-23199.xml | 828 ++++++-----------
 .../dist/game/data/stats/npcs/25800-25899.xml | 413 ++++-----
 .../dist/game/data/stats/npcs/26200-26299.xml | 279 ++----
 .../dist/game/data/stats/npcs/23100-23199.xml | 828 ++++++-----------
 .../dist/game/data/stats/npcs/25800-25899.xml | 357 +++-----
 .../dist/game/data/stats/npcs/26200-26299.xml | 270 ++----
 .../dist/game/data/stats/npcs/23100-23199.xml | 830 ++++++-----------
 .../dist/game/data/stats/npcs/25800-25899.xml | 355 +++-----
 .../dist/game/data/stats/npcs/26200-26299.xml | 270 ++----
 .../dist/game/data/stats/npcs/23100-23199.xml | 828 ++++++-----------
 .../dist/game/data/stats/npcs/25800-25899.xml | 322 +++----
 .../dist/game/data/stats/npcs/26200-26299.xml | 265 ++----
 18 files changed, 3543 insertions(+), 6081 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml
index 9167635f59..7d00f5ef44 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/23100-23199.xml
@@ -1301,69 +1301,46 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="23126" level="95" type="L2Monster" name="Elite Escort" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23126" level="104" type="L2Monster" name="Embryo Elite Escort">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1683" level="1" />
 			<skill name="Skill02_ID" id="1637" level="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>MALE</sex>
-		<acquire exp="3551001" sp="852" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.877" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.62" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23127" level="95" type="L2Monster" name="Elite Manhunter" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23127" level="104" type="L2Monster" name="Embryo Elite Chaser">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1692" level="1" />
@@ -1372,59 +1349,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="2542693" sp="610" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="48" />
 				<run ground="180" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3168" max="7389" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.13" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23128" level="95" type="L2Monster" name="Elite Warrior" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23128" level="104" type="L2Monster" name="Embryo Elite Warrior">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1433,59 +1390,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="2578796" sp="618" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="80" type="POLE" distance="80" width="120" random="10" accuracy="0" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5275" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.4" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23129" level="95" type="L2Monster" name="Elite Alchemist" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23129" level="104" type="L2Monster" name="Embryo Elite Alchemist">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1698" level="1" />
@@ -1494,32 +1431,31 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2640687" sp="633" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="5312" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
@@ -1539,13 +1475,8 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23130" level="95" type="L2Monster" name="Elite High Priest" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23130" level="104" type="L2Monster" name="Embryo Elite High Priest">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="11" />
@@ -1554,58 +1485,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.562" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.74" /> <!-- Synthetic Braid -->
-				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23131" level="95" type="L2Monster" name="Executor Captain" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23131" level="104" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1614,55 +1526,35 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="8739270" sp="2097" />
+		<acquire exp="1772430" sp="1772430" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
-				<walk ground="36.48" />
+				<walk ground="36" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="4.386" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="58.16" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5273" level="1" /> <!-- Power Strike -->
+		</skillList>
 	</npc>
-	<npc id="23132" level="95" type="L2Monster" name="Shilen's Enchanter" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23132" level="104" type="L2Monster" name="Etina Gospel">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1652" level="1" />
@@ -1679,54 +1571,35 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="5795272" sp="1390" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="7161" max="16701" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="3.51" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="25.25" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.391" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23133" level="95" type="L2Monster" name="Shilen's Priest" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23133" level="104" type="L2Monster" name="Etina Priests">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="12" />
@@ -1743,54 +1616,35 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.585" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.34" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="4002" level="1" /> <!-- Blood Siphon -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23134" level="95" type="L2Monster" name="Shilen's Protector" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23134" level="104" type="L2Monster" name="Etina Protectors">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1807,56 +1661,35 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="3551001" sp="852" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="30425" min="1" max="1" chance="0.750000000000001" /> <!-- Recipe: Blessed Spiritshot (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.45" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="31.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23135" level="95" type="L2Monster" name="Shilen's Warrior" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23135" level="104" type="L2Monster" name="Etina Punishers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1873,51 +1706,35 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="2326074" sp="558" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3031" max="7069" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.54" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23136" level="95" type="L2Monster" name="Shilen's Mage" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23136" level="104" type="L2Monster" name="Etina Commination">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1697" level="1" />
@@ -1934,54 +1751,35 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2640687" sp="633" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5373" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3233" max="7540" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.6" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="32" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="5373" level="1" /> <!-- Blaze -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23137" level="95" type="L2Monster" name="Shilen's Assassin" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23137" level="104" type="L2Monster" name="Etina Darkmongers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -1998,55 +1796,35 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="2578796" sp="618" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="19" /> <!-- Misc. -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.02" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23138" level="95" type="L2Monster" name="Shilen's Bladers" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23138" level="104" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -2055,55 +1833,35 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="8739270" sp="2097" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="28.53" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.79" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="34" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23139" level="95" type="L2Monster" name="Researcher" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23139" level="103" type="L2Monster" name="Embryo Researcher">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1653" level="1" />
@@ -2112,60 +1870,40 @@
 		</parameters>
 		<race>DARK_ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="1792262" sp="430" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="10278" lhand="10278" /> <!-- Monster Only (Behamah Dual) / Monster Only (Behamah Dual) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
-				<walk ground="29.8" />
+				<walk ground="29" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="33" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="16" /> <!-- Dark Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5328" level="1" /> <!-- Unholy Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2651" max="6183" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.64" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="33" />
-		</collision>
 	</npc>
-	<npc id="23140" level="95" type="L2Monster" name="Archer Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23140" level="103" type="L2Monster" name="Embryo Watchman">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1654" level="1" />
@@ -2174,59 +1912,39 @@
 		</parameters>
 		<race>ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="1774210" sp="425" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="15" /> <!-- Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2630" max="6135" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.343" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.32" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23141" level="95" type="L2Monster" name="Soldier Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23141" level="103" type="L2Monster" name="Embryo Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -2235,59 +1953,40 @@
 		</parameters>
 		<race>ORC</race>
 		<sex>MALE</sex>
-		<acquire exp="1820630" sp="436" />
-		<equipment rhand="10004" /> <!-- Dynasty Dualsword -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<equipment rhand="10004" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="17" /> <!-- Orcs -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2675" max="6238" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.17" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="36" />
-		</collision>
 	</npc>
-	<npc id="23142" level="95" type="L2Monster" name="Knight Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23142" level="103" type="L2Monster" name="Embryo Guard">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1682" level="1" />
@@ -2296,56 +1995,38 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="1794842" sp="430" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="10" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2641" max="6159" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.9" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="10" />
-			<height normal="29" />
-		</collision>
 	</npc>
 	<npc id="23143" level="99" type="L2Monster" name="Octavis' Gladiator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml
index 1bb46e5f7a..44686f9cc2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25800-25899.xml
@@ -2388,6 +2388,24 @@
 				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
 				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
 				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Cutter (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shaper (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Avenger (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Buster (60%) -->
+				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Caster (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Slasher (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Retributer (60%) -->
 				<!-- FIXME: Also drops herbs. -->
 				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
 				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
@@ -2404,100 +2422,71 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25857" level="103" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25857" level="104" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="38462527312" sp="38462505" />
+		<acquire exp="4060653" sp="4060653" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1699.83051425557" magical="966.370712187984" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="14194" level="1" /> <!-- Range Stun -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17413" min="1" max="1" chance="0.3" /> <!-- Seraph Necklace -->
-				<item id="17414" min="1" max="1" chance="0.3" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="24" />
 			<height normal="45" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14194" level="1" /> <!-- Range Stun -->
+		</skillList>
+		<ai clanHelpRange="300" aggroRange="300" />
 	</npc>
-	<npc id="25858" level="103" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25858" level="104" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="51283369715" sp="51283269" />
-		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="4060653" sp="4060653" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="28094.3792762502" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1189.8813599789" magical="1159.64485462558" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" randomWalk="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17415" min="1" max="1" chance="0.749999999999996" /> <!-- Seraph Ring -->
-				<item id="17414" min="1" max="1" chance="0.300000000000004" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" randomWalk="false" />
 		<collision>
 			<radius normal="18" />
 			<height normal="39" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+		</skillList>
+		<ai clanHelpRange="300" aggroRange="300" />
 	</npc>
 	<npc id="25859" level="97" type="L2RaidBoss" name="Flynt" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3303,20 +3292,24 @@
 		<acquire exp="159805184" sp="38353" raidPoints="30" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="1277698" hpRegen="8.5" mp="22800" mpRegen="30" />
+			<vitals hp="1919368.982085" hpRegen="8.5" mp="22800" mpRegen="30" />
+			<attack physical="22357.8239450089" magical="4004.46625608211" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2959.60951220743" magical="1625.94816873311" />
 			<speed>
 				<walk ground="60" />
 				<run ground="300" />
 			</speed>
-			<attack physical="22357.8239450089" magical="4004.46625608211" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="2959.60951220743" magical="1625.94816873311" />
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" />
 				<attack type="DARK" value="280" />
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="80" />
+		</collision>
 		<skillList>
 			<skill id="14720" level="1" /> <!-- Raid Boss (Lv. 88) -->
 			<skill id="4416" level="1" /> <!-- Undead -->
@@ -3330,85 +3323,132 @@
 		<ai clanHelpRange="300" aggroRange="300" />
 		<dropLists>
 			<drop>
-				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
-				<item id="17308" min="1" max="1" chance="4.270" /> <!-- Immortal Boots - Heavy Armor -->
-				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
-				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
-				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
-				<item id="17319" min="1" max="1" chance="2.714" /> <!-- Immortal Shoes - Robe -->
-				<item id="17300" min="1" max="1" chance="0.75" /> <!-- Requiem Retributer -->
-				<item id="17296" min="1" max="1" chance="0.75" /> <!-- Requiem Thrower -->
-				<item id="17291" min="1" max="1" chance="0.75" /> <!-- Requiem Cutter -->
-				<item id="17290" min="1" max="1" chance="0.75" /> <!-- Requiem Shaper -->
-				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="17308" min="1" max="1" chance="4.273" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17318" min="1" max="1" chance="4.227" /> <!-- Immortal Gloves - Robe -->
+				<item id="17310" min="1" max="1" chance="2.848" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17304" min="1" max="1" chance="2.78" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17313" min="1" max="1" chance="2.15" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.366" /> <!-- Immortal Shoes - Robe -->
+				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
+				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
+				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
+				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
+				<item id="17527" min="1" max="1" chance="30.33" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.327" /> <!-- Scroll: Enchant Weapon (R-grade) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="24" />
-			<height normal="80" />
-		</collision>
 	</npc>
-	<npc id="25876" level="96" type="L2Monster" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25876" level="105" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="14515" level="1" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="708857856" sp="170125" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="530201" hpRegen="8.5" mp="2242" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
-			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflect Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14516" level="1" /> <!-- Darkness Scream -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="1" max="1" chance="59.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36586" min="1" max="1" chance="50.13" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="49.94" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="39.97" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35341" min="1" max="1" chance="1.951" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.94" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35353" min="1" max="1" chance="1.936" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.927" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.92" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.916" /> <!-- Eternal Shield Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.909" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.908" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.902" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.876" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.87" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.849" /> <!-- Eternal Boot Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.837" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.827" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.827" /> <!-- Eternal Glove Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.825" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
+				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="25877" level="96" type="L2Monster" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25877" level="105" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill02_ID" id="14519" level="1" />
@@ -3416,52 +3456,109 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="708857856" sp="170125" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="530201" hpRegen="8.5" mp="2242" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflect Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14520" level="1" /> <!-- Ice Box of Hell -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="1" max="1" chance="58.9" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="51.16" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="36586" min="1" max="1" chance="49.42" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="40.74" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35353" min="1" max="1" chance="1.961" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.956" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.949" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.937" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.925" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.915" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.907" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.906" /> <!-- Eternal Glove Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.903" /> <!-- Eternal Shield Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.883" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35341" min="1" max="1" chance="1.875" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.873" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.867" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.862" /> <!-- Eternal Boot Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.856" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.832" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
+				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="25878" level="85" type="L2Monster" name="Arbitor of Darkness" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3502,6 +3599,32 @@
 			<radius normal="20" />
 			<height normal="38" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17299" min="1" max="1" chance="0.003" /> <!-- Requiem Caster -->
+				<item id="57" min="652" max="1520" chance="20" /> <!-- Adena -->
+				<item id="36803" min="1" max="1" chance="0.3" /> <!-- Requiem Caster Fragment -->
+				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36741" min="1" max="1" chance="0.0075" /> <!-- Recipe: Requiem Caster (60%) -->
+				<!-- FIXME: Also drops herbs. -->
+				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
+				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
+				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
+				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
+				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
+				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
+				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
+				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
+				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+			</drop>
+			<spoil>
+				<item id="36532" min="1" max="1" chance="6.728" /> <!-- Thin Braid -->
+				<item id="36533" min="1" max="1" chance="1.362" /> <!-- Synthetic Braid -->
+			</spoil>
+			<lucky>
+				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
+			</lucky>
+		</dropLists>
 	</npc>
 	<npc id="25879" level="88" type="L2RaidBoss" name="Queen of Darkness" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3543,6 +3666,35 @@
 			<radius normal="24" />
 			<height normal="80" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
+				<item id="17308" min="1" max="1" chance="4.27" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.357" /> <!-- Immortal Shoes - Robe -->
+				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
+				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
+				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
+				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
+				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<!-- FIXME: Also drops herbs. -->
+				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
+				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
+				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
+				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
+				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
+				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
+				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
+				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
+				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+			</drop>
+			<lucky>
+				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
+			</lucky>
+		</dropLists>
 	</npc>
 	<npc id="25880" level="97" type="L2RaidBoss" name="Georgios" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml
index d23757edd1..199fafc6f3 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23100-23199.xml
@@ -1301,69 +1301,47 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="23126" level="95" type="L2Monster" name="Elite Escort" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23126" level="104" type="L2Monster" name="Embryo Elite Escort">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1683" level="1" />
 			<skill name="Skill02_ID" id="1637" level="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>MALE</sex>
-		<acquire exp="3551001" sp="852" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.877" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.62" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23127" level="95" type="L2Monster" name="Elite Manhunter" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23127" level="104" type="L2Monster" name="Embryo Elite Chaser">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1692" level="1" />
@@ -1372,59 +1350,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="2542693" sp="610" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="48" />
 				<run ground="180" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3168" max="7389" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.13" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23128" level="95" type="L2Monster" name="Elite Warrior" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23128" level="104" type="L2Monster" name="Embryo Elite Warrior">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1433,59 +1392,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="2578796" sp="618" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="80" type="POLE" distance="80" width="120" random="10" accuracy="0" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5275" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.4" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23129" level="95" type="L2Monster" name="Elite Alchemist" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23129" level="104" type="L2Monster" name="Embryo Elite Alchemist">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1698" level="1" />
@@ -1494,32 +1434,32 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2640687" sp="633" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="5312" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
@@ -1539,13 +1479,8 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23130" level="95" type="L2Monster" name="Elite High Priest" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23130" level="104" type="L2Monster" name="Embryo Elite High Priest">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="11" />
@@ -1554,58 +1489,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.562" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.74" /> <!-- Synthetic Braid -->
-				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23131" level="95" type="L2Monster" name="Executor Captain" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23131" level="104" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1614,55 +1531,36 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="8739270" sp="2097" />
+		<acquire exp="1772430" sp="1772430" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
-				<walk ground="36.48" />
+				<walk ground="36" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="4.386" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="58.16" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29.5" />
 		</collision>
+		<skillList>
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5273" level="1" /> <!-- Power Strike -->
+		</skillList>
 	</npc>
-	<npc id="23132" level="95" type="L2Monster" name="Shilen's Enchanter" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23132" level="104" type="L2Monster" name="Etina Gospel">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1652" level="1" />
@@ -1679,54 +1577,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="5795272" sp="1390" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="7161" max="16701" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="3.51" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="25.25" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.391" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23133" level="95" type="L2Monster" name="Shilen's Priest" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23133" level="104" type="L2Monster" name="Etina Priests">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="12" />
@@ -1743,54 +1623,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.585" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.34" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="4002" level="1" /> <!-- Blood Siphon -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23134" level="95" type="L2Monster" name="Shilen's Protector" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23134" level="104" type="L2Monster" name="Etina Protectors">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1807,56 +1669,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="3551001" sp="852" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="30425" min="1" max="1" chance="0.750000000000001" /> <!-- Recipe: Blessed Spiritshot (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.45" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="31.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23135" level="95" type="L2Monster" name="Shilen's Warrior" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23135" level="104" type="L2Monster" name="Etina Punishers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1873,51 +1715,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="2326074" sp="558" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3031" max="7069" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.54" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23136" level="95" type="L2Monster" name="Shilen's Mage" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23136" level="104" type="L2Monster" name="Etina Commination">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1697" level="1" />
@@ -1934,54 +1761,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2640687" sp="633" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5373" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3233" max="7540" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.6" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="32" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="5373" level="1" /> <!-- Blaze -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23137" level="95" type="L2Monster" name="Shilen's Assassin" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23137" level="104" type="L2Monster" name="Etina Darkmongers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -1998,55 +1807,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="2578796" sp="618" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="19" /> <!-- Misc. -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.02" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23138" level="95" type="L2Monster" name="Shilen's Bladers" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23138" level="104" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -2055,55 +1845,36 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="8739270" sp="2097" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="28.53" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.79" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="34" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23139" level="95" type="L2Monster" name="Researcher" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23139" level="103" type="L2Monster" name="Embryo Researcher">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1653" level="1" />
@@ -2112,60 +1883,41 @@
 		</parameters>
 		<race>DARK_ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="1792262" sp="430" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="10278" lhand="10278" /> <!-- Monster Only (Behamah Dual) / Monster Only (Behamah Dual) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
-				<walk ground="29.8" />
+				<walk ground="29" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="33" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="16" /> <!-- Dark Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5328" level="1" /> <!-- Unholy Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2651" max="6183" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.64" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="33" />
-		</collision>
 	</npc>
-	<npc id="23140" level="95" type="L2Monster" name="Archer Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23140" level="103" type="L2Monster" name="Embryo Watchman">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1654" level="1" />
@@ -2174,59 +1926,40 @@
 		</parameters>
 		<race>ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="1774210" sp="425" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="15" /> <!-- Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2630" max="6135" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.343" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.32" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23141" level="95" type="L2Monster" name="Soldier Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23141" level="103" type="L2Monster" name="Embryo Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -2235,59 +1968,41 @@
 		</parameters>
 		<race>ORC</race>
 		<sex>MALE</sex>
-		<acquire exp="1820630" sp="436" />
-		<equipment rhand="10004" /> <!-- Dynasty Dualsword -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<equipment rhand="10004" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="17" /> <!-- Orcs -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2675" max="6238" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.17" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="36" />
-		</collision>
 	</npc>
-	<npc id="23142" level="95" type="L2Monster" name="Knight Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23142" level="103" type="L2Monster" name="Embryo Guard">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1682" level="1" />
@@ -2296,56 +2011,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="1794842" sp="430" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="10" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2641" max="6159" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.9" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="10" />
-			<height normal="29" />
-		</collision>
 	</npc>
 	<npc id="23143" level="99" type="L2Monster" name="Octavis' Gladiator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
index 60ca43950f..30875c2723 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25800-25899.xml
@@ -2504,56 +2504,41 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25857" level="103" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25857" level="104" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="38462527312" sp="38462505" />
+		<acquire exp="4060653" sp="4060653" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1699.83051425557" magical="966.370712187984" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="14194" level="1" /> <!-- Range Stun -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17413" min="1" max="1" chance="0.3" /> <!-- Seraph Necklace -->
-				<item id="17414" min="1" max="1" chance="0.3" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="24" />
 			<height normal="45" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14194" level="1" /> <!-- Range Stun -->
+		</skillList>
+		<ai clanHelpRange="300" aggroRange="300" />
 	</npc>
-	<npc id="25858" level="103" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25858" level="104" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="23707" level="4" /> <!-- Chaos Fire -->
@@ -2561,45 +2546,31 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="51283369715" sp="51283269" />
-		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="4060653" sp="4060653" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="28094.3792762502" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1189.8813599789" magical="1159.64485462558" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" randomWalk="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="23707" level="1" /> <!-- Chaos Fire -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17415" min="1" max="1" chance="0.749999999999996" /> <!-- Seraph Ring -->
-				<item id="17414" min="1" max="1" chance="0.300000000000004" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" randomWalk="false" />
 		<collision>
 			<radius normal="18" />
 			<height normal="39" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="23707" level="1" /> <!-- Chaos Fire -->
+		</skillList>
+		<ai clanHelpRange="300" aggroRange="300" />
 	</npc>
 	<npc id="25859" level="97" type="L2RaidBoss" name="Flynt" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3406,20 +3377,24 @@
 		<acquire exp="159805184" sp="38353" raidPoints="30" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="1277698" hpRegen="8.5" mp="22800" mpRegen="30" />
+			<vitals hp="1919368.982085" hpRegen="8.5" mp="22800" mpRegen="30" />
+			<attack physical="22357.8239450089" magical="4004.46625608211" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2959.60951220743" magical="1625.94816873311" />
 			<speed>
 				<walk ground="60" />
 				<run ground="300" />
 			</speed>
-			<attack physical="22357.8239450089" magical="4004.46625608211" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="2959.60951220743" magical="1625.94816873311" />
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" />
 				<attack type="DARK" value="280" />
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="80" />
+		</collision>
 		<skillList>
 			<skill id="14720" level="1" /> <!-- Raid Boss (Lv. 88) -->
 			<skill id="4416" level="1" /> <!-- Undead -->
@@ -3433,21 +3408,21 @@
 		<ai clanHelpRange="300" aggroRange="300" />
 		<dropLists>
 			<drop>
-				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
-				<item id="17308" min="1" max="1" chance="4.270" /> <!-- Immortal Boots - Heavy Armor -->
-				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
-				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
-				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
-				<item id="17319" min="1" max="1" chance="2.714" /> <!-- Immortal Shoes - Robe -->
-				<item id="17300" min="1" max="1" chance="0.75" /> <!-- Requiem Retributer -->
-				<item id="17296" min="1" max="1" chance="0.75" /> <!-- Requiem Thrower -->
-				<item id="17291" min="1" max="1" chance="0.75" /> <!-- Requiem Cutter -->
-				<item id="17290" min="1" max="1" chance="0.75" /> <!-- Requiem Shaper -->
-				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="46474" min="1" max="1" chance="1.173" /> <!-- Leona's Soul Crystal - Stage 1 -->
-				<item id="46489" min="1" max="1" chance="1.077" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
-				<item id="46504" min="1" max="1" chance="1.061" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="17308" min="1" max="1" chance="4.273" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17318" min="1" max="1" chance="4.227" /> <!-- Immortal Gloves - Robe -->
+				<item id="17310" min="1" max="1" chance="2.848" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17304" min="1" max="1" chance="2.78" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17313" min="1" max="1" chance="2.15" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.366" /> <!-- Immortal Shoes - Robe -->
+				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
+				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
+				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
+				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
+				<item id="17527" min="1" max="1" chance="30.33" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.327" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46504" min="1" max="1" chance="1.171" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46474" min="1" max="1" chance="1.17" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46489" min="1" max="1" chance="1.043" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
 				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
 				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
@@ -3466,72 +3441,145 @@
 				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
 				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="24" />
-			<height normal="80" />
-		</collision>
 	</npc>
-	<npc id="25876" level="96" type="L2Monster" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25876" level="105" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="14515" level="1" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="708857856" sp="170125" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="530201" hpRegen="8.5" mp="2242" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
-			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflect Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14516" level="1" /> <!-- Darkness Scream -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="1" max="1" chance="59.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36586" min="1" max="1" chance="50.13" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="49.94" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="39.97" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35341" min="1" max="1" chance="1.951" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.94" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35353" min="1" max="1" chance="1.936" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.927" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.92" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.916" /> <!-- Eternal Shield Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.909" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.908" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.902" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.876" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.87" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.849" /> <!-- Eternal Boot Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.837" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.827" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.827" /> <!-- Eternal Glove Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.825" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
+				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
+				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
+				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
+				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
+				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
+				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
+				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
+				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="25877" level="96" type="L2Monster" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25877" level="105" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill02_ID" id="14519" level="1" />
@@ -3539,52 +3587,135 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="708857856" sp="170125" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="530201" hpRegen="8.5" mp="2242" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflect Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14520" level="1" /> <!-- Ice Box of Hell -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="1" max="1" chance="58.9" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="51.16" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="36586" min="1" max="1" chance="49.42" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="40.74" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35353" min="1" max="1" chance="1.961" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.956" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.949" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.937" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.925" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.915" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.907" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.906" /> <!-- Eternal Glove Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.903" /> <!-- Eternal Shield Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.883" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35341" min="1" max="1" chance="1.875" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.873" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.867" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.862" /> <!-- Eternal Boot Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.856" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.832" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
+				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
+				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
+				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
+				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
+				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
+				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
+				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
+				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="25878" level="85" type="L2Monster" name="Arbitor of Darkness" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3625,6 +3756,32 @@
 			<radius normal="20" />
 			<height normal="38" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17299" min="1" max="1" chance="0.003" /> <!-- Requiem Caster -->
+				<item id="57" min="652" max="1520" chance="20" /> <!-- Adena -->
+				<item id="36803" min="1" max="1" chance="0.3" /> <!-- Requiem Caster Fragment -->
+				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36741" min="1" max="1" chance="0.0075" /> <!-- Recipe: Requiem Caster (60%) -->
+				<!-- FIXME: Also drops herbs. -->
+				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
+				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
+				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
+				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
+				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
+				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
+				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
+				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
+				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+			</drop>
+			<spoil>
+				<item id="36532" min="1" max="1" chance="6.728" /> <!-- Thin Braid -->
+				<item id="36533" min="1" max="1" chance="1.362" /> <!-- Synthetic Braid -->
+			</spoil>
+			<lucky>
+				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
+			</lucky>
+		</dropLists>
 	</npc>
 	<npc id="25879" level="88" type="L2RaidBoss" name="Queen of Darkness" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3666,6 +3823,55 @@
 			<radius normal="24" />
 			<height normal="80" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
+				<item id="17308" min="1" max="1" chance="4.27" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.357" /> <!-- Immortal Shoes - Robe -->
+				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
+				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
+				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
+				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
+				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46474" min="1" max="1" chance="1.173" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46489" min="1" max="1" chance="1.077" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
+				<item id="46504" min="1" max="1" chance="1.065" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
+				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
+				<item id="46476" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46475" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 2 -->
+				<item id="46491" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46461" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46444" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 1 -->
+				<item id="46460" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 2 -->
+				<item id="46459" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 1 -->
+				<item id="46445" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 2 -->
+				<item id="46446" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46492" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<!-- FIXME: Also drops herbs. -->
+				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
+				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
+				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
+				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
+				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
+				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
+				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
+				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
+				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+			</drop>
+			<lucky>
+				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
+			</lucky>
+		</dropLists>
 	</npc>
 	<npc id="25880" level="97" type="L2RaidBoss" name="Georgios" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml
index 838e8a68c8..eab9e09960 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23100-23199.xml
@@ -1301,69 +1301,47 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="23126" level="95" type="L2Monster" name="Elite Escort" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23126" level="104" type="L2Monster" name="Embryo Elite Escort">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1683" level="1" />
 			<skill name="Skill02_ID" id="1637" level="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>MALE</sex>
-		<acquire exp="3551001" sp="852" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.877" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.62" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23127" level="95" type="L2Monster" name="Elite Manhunter" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23127" level="104" type="L2Monster" name="Embryo Elite Chaser">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1692" level="1" />
@@ -1372,59 +1350,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="2542693" sp="610" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="48" />
 				<run ground="180" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3168" max="7389" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.13" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23128" level="95" type="L2Monster" name="Elite Warrior" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23128" level="104" type="L2Monster" name="Embryo Elite Warrior">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1433,59 +1392,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="2578796" sp="618" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="80" type="POLE" distance="80" width="120" random="10" accuracy="0" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5275" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.4" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23129" level="95" type="L2Monster" name="Elite Alchemist" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23129" level="104" type="L2Monster" name="Embryo Elite Alchemist">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1698" level="1" />
@@ -1494,32 +1434,32 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2640687" sp="633" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="5312" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
@@ -1539,13 +1479,8 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23130" level="95" type="L2Monster" name="Elite High Priest" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23130" level="104" type="L2Monster" name="Embryo Elite High Priest">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="11" />
@@ -1554,58 +1489,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.562" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.74" /> <!-- Synthetic Braid -->
-				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23131" level="95" type="L2Monster" name="Executor Captain" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23131" level="104" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1614,55 +1531,36 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="8739270" sp="2097" />
+		<acquire exp="1772430" sp="1772430" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
-				<walk ground="36.48" />
+				<walk ground="36" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="4.386" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="58.16" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29.5" />
 		</collision>
+		<skillList>
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5273" level="1" /> <!-- Power Strike -->
+		</skillList>
 	</npc>
-	<npc id="23132" level="95" type="L2Monster" name="Shilen's Enchanter" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23132" level="104" type="L2Monster" name="Etina Gospel">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1652" level="1" />
@@ -1679,54 +1577,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="5795272" sp="1390" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="7161" max="16701" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="3.51" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="25.25" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.391" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23133" level="95" type="L2Monster" name="Shilen's Priest" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23133" level="104" type="L2Monster" name="Etina Priests">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="12" />
@@ -1743,54 +1623,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.585" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.34" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="4002" level="1" /> <!-- Blood Siphon -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23134" level="95" type="L2Monster" name="Shilen's Protector" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23134" level="104" type="L2Monster" name="Etina Protectors">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1807,56 +1669,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="3551001" sp="852" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="30425" min="1" max="1" chance="0.750000000000001" /> <!-- Recipe: Blessed Spiritshot (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.45" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="31.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23135" level="95" type="L2Monster" name="Shilen's Warrior" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23135" level="104" type="L2Monster" name="Etina Punishers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1873,51 +1715,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="2326074" sp="558" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3031" max="7069" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.54" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23136" level="95" type="L2Monster" name="Shilen's Mage" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23136" level="104" type="L2Monster" name="Etina Commination">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1697" level="1" />
@@ -1934,54 +1761,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2640687" sp="633" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5373" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3233" max="7540" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.6" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="32" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="5373" level="1" /> <!-- Blaze -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23137" level="95" type="L2Monster" name="Shilen's Assassin" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23137" level="104" type="L2Monster" name="Etina Darkmongers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -1998,55 +1807,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="2578796" sp="618" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="19" /> <!-- Misc. -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.02" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23138" level="95" type="L2Monster" name="Shilen's Bladers" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23138" level="104" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -2055,55 +1845,36 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="8739270" sp="2097" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="28.53" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.79" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="34" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23139" level="95" type="L2Monster" name="Researcher" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23139" level="103" type="L2Monster" name="Embryo Researcher">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1653" level="1" />
@@ -2112,60 +1883,41 @@
 		</parameters>
 		<race>DARK_ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="1792262" sp="430" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="10278" lhand="10278" /> <!-- Monster Only (Behamah Dual) / Monster Only (Behamah Dual) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
-				<walk ground="29.8" />
+				<walk ground="29" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="33" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="16" /> <!-- Dark Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5328" level="1" /> <!-- Unholy Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2651" max="6183" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.64" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="33" />
-		</collision>
 	</npc>
-	<npc id="23140" level="95" type="L2Monster" name="Archer Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23140" level="103" type="L2Monster" name="Embryo Watchman">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1654" level="1" />
@@ -2174,59 +1926,40 @@
 		</parameters>
 		<race>ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="1774210" sp="425" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="15" /> <!-- Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2630" max="6135" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.343" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.32" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23141" level="95" type="L2Monster" name="Soldier Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23141" level="103" type="L2Monster" name="Embryo Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -2235,59 +1968,41 @@
 		</parameters>
 		<race>ORC</race>
 		<sex>MALE</sex>
-		<acquire exp="1820630" sp="436" />
-		<equipment rhand="10004" /> <!-- Dynasty Dualsword -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<equipment rhand="10004" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="17" /> <!-- Orcs -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2675" max="6238" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.17" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="36" />
-		</collision>
 	</npc>
-	<npc id="23142" level="95" type="L2Monster" name="Knight Recruit" title="Embryo">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23142" level="103" type="L2Monster" name="Embryo Guard">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1682" level="1" />
@@ -2296,56 +2011,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="1794842" sp="430" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="321920" hpRegen="8.5" mp="22058" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="10" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2641" max="6159" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.9" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="10" />
-			<height normal="29" />
-		</collision>
 	</npc>
 	<npc id="23143" level="99" type="L2Monster" name="Octavis' Gladiator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml
index 60ca43950f..30875c2723 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/25800-25899.xml
@@ -2504,56 +2504,41 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25857" level="103" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25857" level="104" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="38462527312" sp="38462505" />
+		<acquire exp="4060653" sp="4060653" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1699.83051425557" magical="966.370712187984" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="14194" level="1" /> <!-- Range Stun -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17413" min="1" max="1" chance="0.3" /> <!-- Seraph Necklace -->
-				<item id="17414" min="1" max="1" chance="0.3" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="24" />
 			<height normal="45" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14194" level="1" /> <!-- Range Stun -->
+		</skillList>
+		<ai clanHelpRange="300" aggroRange="300" />
 	</npc>
-	<npc id="25858" level="103" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25858" level="104" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="23707" level="4" /> <!-- Chaos Fire -->
@@ -2561,45 +2546,31 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="51283369715" sp="51283269" />
-		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="4060653" sp="4060653" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="28094.3792762502" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1189.8813599789" magical="1159.64485462558" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" randomWalk="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="23707" level="1" /> <!-- Chaos Fire -->
-		</skillList>
-		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17415" min="1" max="1" chance="0.749999999999996" /> <!-- Seraph Ring -->
-				<item id="17414" min="1" max="1" chance="0.300000000000004" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" randomWalk="false" />
 		<collision>
 			<radius normal="18" />
 			<height normal="39" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="23707" level="1" /> <!-- Chaos Fire -->
+		</skillList>
+		<ai clanHelpRange="300" aggroRange="300" />
 	</npc>
 	<npc id="25859" level="97" type="L2RaidBoss" name="Flynt" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3406,20 +3377,24 @@
 		<acquire exp="159805184" sp="38353" raidPoints="30" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="1277698" hpRegen="8.5" mp="22800" mpRegen="30" />
+			<vitals hp="1919368.982085" hpRegen="8.5" mp="22800" mpRegen="30" />
+			<attack physical="22357.8239450089" magical="4004.46625608211" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2959.60951220743" magical="1625.94816873311" />
 			<speed>
 				<walk ground="60" />
 				<run ground="300" />
 			</speed>
-			<attack physical="22357.8239450089" magical="4004.46625608211" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="2959.60951220743" magical="1625.94816873311" />
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" />
 				<attack type="DARK" value="280" />
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="80" />
+		</collision>
 		<skillList>
 			<skill id="14720" level="1" /> <!-- Raid Boss (Lv. 88) -->
 			<skill id="4416" level="1" /> <!-- Undead -->
@@ -3433,21 +3408,21 @@
 		<ai clanHelpRange="300" aggroRange="300" />
 		<dropLists>
 			<drop>
-				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
-				<item id="17308" min="1" max="1" chance="4.270" /> <!-- Immortal Boots - Heavy Armor -->
-				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
-				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
-				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
-				<item id="17319" min="1" max="1" chance="2.714" /> <!-- Immortal Shoes - Robe -->
-				<item id="17300" min="1" max="1" chance="0.75" /> <!-- Requiem Retributer -->
-				<item id="17296" min="1" max="1" chance="0.75" /> <!-- Requiem Thrower -->
-				<item id="17291" min="1" max="1" chance="0.75" /> <!-- Requiem Cutter -->
-				<item id="17290" min="1" max="1" chance="0.75" /> <!-- Requiem Shaper -->
-				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="46474" min="1" max="1" chance="1.173" /> <!-- Leona's Soul Crystal - Stage 1 -->
-				<item id="46489" min="1" max="1" chance="1.077" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
-				<item id="46504" min="1" max="1" chance="1.061" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="17308" min="1" max="1" chance="4.273" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17318" min="1" max="1" chance="4.227" /> <!-- Immortal Gloves - Robe -->
+				<item id="17310" min="1" max="1" chance="2.848" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17304" min="1" max="1" chance="2.78" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17313" min="1" max="1" chance="2.15" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.366" /> <!-- Immortal Shoes - Robe -->
+				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
+				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
+				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
+				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
+				<item id="17527" min="1" max="1" chance="30.33" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.327" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46504" min="1" max="1" chance="1.171" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46474" min="1" max="1" chance="1.17" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46489" min="1" max="1" chance="1.043" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
 				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
 				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
@@ -3466,72 +3441,145 @@
 				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
 				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="24" />
-			<height normal="80" />
-		</collision>
 	</npc>
-	<npc id="25876" level="96" type="L2Monster" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25876" level="105" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="14515" level="1" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="708857856" sp="170125" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="530201" hpRegen="8.5" mp="2242" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
-			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflect Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14516" level="1" /> <!-- Darkness Scream -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="1" max="1" chance="59.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36586" min="1" max="1" chance="50.13" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="49.94" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="39.97" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35341" min="1" max="1" chance="1.951" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.94" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35353" min="1" max="1" chance="1.936" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.927" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.92" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.916" /> <!-- Eternal Shield Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.909" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.908" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.902" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.876" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.87" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.849" /> <!-- Eternal Boot Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.837" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.827" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.827" /> <!-- Eternal Glove Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.825" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
+				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
+				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
+				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
+				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
+				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
+				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
+				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
+				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="25877" level="96" type="L2Monster" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25877" level="105" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill02_ID" id="14519" level="1" />
@@ -3539,52 +3587,135 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="708857856" sp="170125" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="530201" hpRegen="8.5" mp="2242" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="1" /> <!-- Damage Reflect Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14520" level="1" /> <!-- Ice Box of Hell -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
+		<dropLists>
+			<drop>
+				<item id="17527" min="1" max="1" chance="58.9" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="51.16" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="36586" min="1" max="1" chance="49.42" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="40.74" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35353" min="1" max="1" chance="1.961" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.956" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.949" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.937" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.925" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.915" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.907" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.906" /> <!-- Eternal Glove Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.903" /> <!-- Eternal Shield Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.883" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35341" min="1" max="1" chance="1.875" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.873" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.867" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.862" /> <!-- Eternal Boot Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.856" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.832" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
+				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
+				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
+				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
+				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
+				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
+				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
+				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
+				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
+				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
+				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
+				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
+				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
+				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
+				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
+				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="25878" level="85" type="L2Monster" name="Arbitor of Darkness" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3625,6 +3756,32 @@
 			<radius normal="20" />
 			<height normal="38" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17299" min="1" max="1" chance="0.003" /> <!-- Requiem Caster -->
+				<item id="57" min="652" max="1520" chance="20" /> <!-- Adena -->
+				<item id="36803" min="1" max="1" chance="0.3" /> <!-- Requiem Caster Fragment -->
+				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36741" min="1" max="1" chance="0.0075" /> <!-- Recipe: Requiem Caster (60%) -->
+				<!-- FIXME: Also drops herbs. -->
+				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
+				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
+				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
+				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
+				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
+				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
+				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
+				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
+				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+			</drop>
+			<spoil>
+				<item id="36532" min="1" max="1" chance="6.728" /> <!-- Thin Braid -->
+				<item id="36533" min="1" max="1" chance="1.362" /> <!-- Synthetic Braid -->
+			</spoil>
+			<lucky>
+				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
+			</lucky>
+		</dropLists>
 	</npc>
 	<npc id="25879" level="88" type="L2RaidBoss" name="Queen of Darkness" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3666,6 +3823,55 @@
 			<radius normal="24" />
 			<height normal="80" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
+				<item id="17308" min="1" max="1" chance="4.27" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.357" /> <!-- Immortal Shoes - Robe -->
+				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
+				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
+				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
+				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
+				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46474" min="1" max="1" chance="1.173" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46489" min="1" max="1" chance="1.077" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
+				<item id="46504" min="1" max="1" chance="1.065" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
+				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
+				<item id="46476" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46475" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 2 -->
+				<item id="46491" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46461" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46444" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 1 -->
+				<item id="46460" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 2 -->
+				<item id="46459" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 1 -->
+				<item id="46445" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 2 -->
+				<item id="46446" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46492" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<!-- FIXME: Also drops herbs. -->
+				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
+				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
+				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
+				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
+				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
+				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
+				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
+				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
+				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+			</drop>
+			<lucky>
+				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
+			</lucky>
+		</dropLists>
 	</npc>
 	<npc id="25880" level="97" type="L2RaidBoss" name="Georgios" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml
index 8661da92ff..608fd02ae6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23100-23199.xml
@@ -1252,69 +1252,47 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="23126" level="103" type="L2Monster" name="Embryo Elite Escort">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23126" level="104" type="L2Monster" name="Embryo Elite Escort">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1683" level="1" />
 			<skill name="Skill02_ID" id="1637" level="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.877" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.62" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23127" level="103" type="L2Monster" name="Embryo Elite Chaser">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23127" level="104" type="L2Monster" name="Embryo Elite Chaser">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1692" level="1" />
@@ -1323,59 +1301,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="48" />
 				<run ground="180" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3168" max="7389" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.13" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23128" level="103" type="L2Monster" name="Embryo Elite Warrior">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23128" level="104" type="L2Monster" name="Embryo Elite Warrior">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1384,59 +1343,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="80" type="POLE" distance="80" width="120" random="10" accuracy="0" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5275" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.4" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23129" level="103" type="L2Monster" name="Embryo Elite Alchemist">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23129" level="104" type="L2Monster" name="Embryo Elite Alchemist">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1698" level="1" />
@@ -1445,32 +1385,32 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="5312" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
@@ -1490,13 +1430,8 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23130" level="103" type="L2Monster" name="Embryo Elite High Priest">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23130" level="104" type="L2Monster" name="Embryo Elite High Priest">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="11" />
@@ -1505,58 +1440,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.562" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.74" /> <!-- Synthetic Braid -->
-				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23131" level="103" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23131" level="104" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1565,55 +1482,36 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
+		<acquire exp="1772430" sp="1772430" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="36" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="4.386" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="58.16" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29.5" />
 		</collision>
+		<skillList>
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5273" level="1" /> <!-- Power Strike -->
+		</skillList>
 	</npc>
-	<npc id="23132" level="103" type="L2Monster" name="Etina Gospel">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23132" level="104" type="L2Monster" name="Etina Gospel">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1652" level="1" />
@@ -1630,54 +1528,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="7161" max="16701" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="3.51" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="25.25" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.391" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23133" level="95" type="L2Monster" name="Etina Priests">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23133" level="104" type="L2Monster" name="Etina Priests">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="12" />
@@ -1694,54 +1574,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.585" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.34" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="4002" level="1" /> <!-- Blood Siphon -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23134" level="103" type="L2Monster" name="Etina Protectors">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23134" level="104" type="L2Monster" name="Etina Protectors">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1758,56 +1620,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="30425" min="1" max="1" chance="0.750000000000001" /> <!-- Recipe: Blessed Spiritshot (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.45" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="31.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23135" level="103" type="L2Monster" name="Etina Punishers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23135" level="104" type="L2Monster" name="Etina Punishers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1824,51 +1666,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3031" max="7069" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.54" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23136" level="103" type="L2Monster" name="Etina Commination">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23136" level="104" type="L2Monster" name="Etina Commination">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1697" level="1" />
@@ -1885,54 +1712,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5373" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3233" max="7540" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.6" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="32" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="5373" level="1" /> <!-- Blaze -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23137" level="103" type="L2Monster" name="Etina Darkmongers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23137" level="104" type="L2Monster" name="Etina Darkmongers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -1949,55 +1758,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="19" /> <!-- Misc. -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.02" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23138" level="103" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23138" level="104" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -2006,55 +1796,36 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="28.53" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.79" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="34" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23139" level="102" type="L2Monster" name="Embryo Researcher">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23139" level="103" type="L2Monster" name="Embryo Researcher">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1653" level="1" />
@@ -2063,60 +1834,41 @@
 		</parameters>
 		<race>DARK_ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="10278" lhand="10278" /> <!-- Monster Only (Behamah Dual) / Monster Only (Behamah Dual) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="29" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="33" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="16" /> <!-- Dark Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5328" level="1" /> <!-- Unholy Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2651" max="6183" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.64" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="33" />
-		</collision>
 	</npc>
-	<npc id="23140" level="102" type="L2Monster" name="Embryo Watchman">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23140" level="103" type="L2Monster" name="Embryo Watchman">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1654" level="1" />
@@ -2125,59 +1877,40 @@
 		</parameters>
 		<race>ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="15" /> <!-- Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2630" max="6135" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.343" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.32" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23141" level="102" type="L2Monster" name="Embryo Fighter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23141" level="103" type="L2Monster" name="Embryo Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -2186,59 +1919,41 @@
 		</parameters>
 		<race>ORC</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="10004" /> <!-- Dynasty Dualsword -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="10004" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="17" /> <!-- Orcs -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2675" max="6238" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.17" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="36" />
-		</collision>
 	</npc>
-	<npc id="23142" level="102" type="L2Monster" name="Embryo Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23142" level="103" type="L2Monster" name="Embryo Guard">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1682" level="1" />
@@ -2247,56 +1962,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="10" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2641" max="6159" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.9" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="10" />
-			<height normal="29" />
-		</collision>
 	</npc>
 	<npc id="23143" level="99" type="L2Monster" name="Octavis' Gladiator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml
index 6986cccb04..e6800e7e28 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25800-25899.xml
@@ -3399,8 +3399,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25857" level="103" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25857" level="104" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16982" level="1" /> <!-- Devil Horns of Shield -->
@@ -3409,50 +3408,36 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="38462527312" sp="38462505" />
+		<acquire exp="4060653" sp="4060653" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1699.83051425557" magical="966.370712187984" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="45" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16982" level="1" /> <!-- Devil Horns of Shield -->
 			<skill id="16981" level="1" /> <!-- Fallen Execution -->
 			<skill id="14194" level="1" /> <!-- Range Stun -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17413" min="1" max="1" chance="0.3" /> <!-- Seraph Necklace -->
-				<item id="17414" min="1" max="1" chance="0.3" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="24" />
-			<height normal="45" />
-		</collision>
 	</npc>
-	<npc id="25858" level="103" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25858" level="104" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16983" level="1" /> <!-- Embryo's Blessing -->
@@ -3462,47 +3447,33 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="51283369715" sp="51283269" />
-		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="4060653" sp="4060653" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="28094.3792762502" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1189.8813599789" magical="1159.64485462558" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" randomWalk="false" />
+		<status attackable="true" randomWalk="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="39" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16983" level="1" /> <!-- Embryo's Blessing -->
 			<skill id="23707" level="1" /> <!-- Chaos Fire -->
 			<skill id="16984" level="1" /> <!-- Blind Spark -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17415" min="1" max="1" chance="0.749999999999996" /> <!-- Seraph Ring -->
-				<item id="17414" min="1" max="1" chance="0.300000000000004" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="18" />
-			<height normal="39" />
-		</collision>
 	</npc>
 	<npc id="25865" level="93" type="L2Monster" name="Apherus Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -4075,21 +4046,21 @@
 		<ai clanHelpRange="300" aggroRange="300" />
 		<dropLists>
 			<drop>
-				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
-				<item id="17308" min="1" max="1" chance="4.27" /> <!-- Immortal Boots - Heavy Armor -->
-				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
-				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
-				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
-				<item id="17319" min="1" max="1" chance="1.357" /> <!-- Immortal Shoes - Robe -->
+				<item id="17308" min="1" max="1" chance="4.273" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17318" min="1" max="1" chance="4.227" /> <!-- Immortal Gloves - Robe -->
+				<item id="17310" min="1" max="1" chance="2.848" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17304" min="1" max="1" chance="2.78" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17313" min="1" max="1" chance="2.15" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.366" /> <!-- Immortal Shoes - Robe -->
 				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
 				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
 				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
 				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
-				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="46474" min="1" max="1" chance="1.173" /> <!-- Leona's Soul Crystal - Stage 1 -->
-				<item id="46489" min="1" max="1" chance="1.077" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
-				<item id="46504" min="1" max="1" chance="1.065" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="17527" min="1" max="1" chance="30.33" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.327" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46504" min="1" max="1" chance="1.171" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46474" min="1" max="1" chance="1.17" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46489" min="1" max="1" chance="1.043" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
 				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
 				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
@@ -4107,110 +4078,89 @@
 				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
 				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
 			</drop>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25876" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25876" level="105" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="14515" level="1" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="881767.0" hpRegen="8.5" mp="33087.0" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
-			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14516" level="1" /> <!-- Darkness Scream -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Amaranthine Buster Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shaper Fragment -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Amaranthine Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Amaranthine Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Amaranthine Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Amaranthine Fighter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Amaranthine Caster Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Amaranthine Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Amaranthine Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Amaranthine Avenger Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shooter Fragment -->
+				<item id="17527" min="1" max="1" chance="59.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36586" min="1" max="1" chance="50.13" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="49.94" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="39.97" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35341" min="1" max="1" chance="1.951" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.94" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35353" min="1" max="1" chance="1.936" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.927" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.92" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.916" /> <!-- Eternal Shield Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.909" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.908" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.902" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.876" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.87" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.849" /> <!-- Eternal Boot Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.837" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.827" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.827" /> <!-- Eternal Glove Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.825" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
 				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
@@ -4226,62 +4176,48 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
 				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shaper (60%) -->
-				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Avenger (60%) -->
-				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Stormer (60%) -->
-				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Thrower (60%) -->
-				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shooter (60%) -->
-				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Buster (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25877" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25877" level="105" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill02_ID" id="14519" level="1" />
@@ -4289,91 +4225,85 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="2081767" hpRegen="8.5" mp="33087" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14520" level="1" /> <!-- Ice Box of Hell -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Amaranthine Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Amaranthine Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shaper Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Amaranthine Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Amaranthine Retributer Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Amaranthine Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Amaranthine Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Amaranthine Buster Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shooter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Amaranthine Caster Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Amaranthine Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="17527" min="1" max="1" chance="58.9" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="51.16" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="36586" min="1" max="1" chance="49.42" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="40.74" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35353" min="1" max="1" chance="1.961" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.956" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.949" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.937" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.925" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.915" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.907" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.906" /> <!-- Eternal Glove Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.903" /> <!-- Eternal Shield Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.883" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35341" min="1" max="1" chance="1.875" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.873" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.867" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.862" /> <!-- Eternal Boot Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.856" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.832" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
+				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
+				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
+				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
+				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
+				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
 				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
 				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
 				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
 				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
@@ -4384,58 +4314,45 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
 				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shaper (60%) -->
-				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Avenger (60%) -->
-				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Stormer (60%) -->
-				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Thrower (60%) -->
-				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shooter (60%) -->
-				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Buster (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="25878" level="85" type="L2Monster" name="Arbitor of Darkness" title="Raid Fighter">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26200-26299.xml
index fffef604bf..419eb09cef 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26200-26299.xml
@@ -991,20 +991,20 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 		</skillList>
 	</npc>
-	<npc id="26219" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26219" level="102" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15588090" sp="15588090" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="6546867" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="9834759.80235" hpRegen="419.6050136" mp="12641940.99" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1012,131 +1012,36 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="21" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Amaranthine Buster Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shaper Fragment -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Amaranthine Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Amaranthine Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Amaranthine Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Amaranthine Fighter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Amaranthine Caster Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Amaranthine Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Amaranthine Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Amaranthine Avenger Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shooter Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shaper (60%) -->
-				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Avenger (60%) -->
-				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Stormer (60%) -->
-				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Thrower (60%) -->
-				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shooter (60%) -->
-				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="17436" min="1" max="1" chance="100" /> <!-- Eternal Leather Helmet - Light Armor -->
+				<item id="17437" min="1" max="1" chance="100" /> <!-- Eternal Leather Armor - Light Armor -->
+				<item id="17438" min="1" max="1" chance="100" /> <!-- Eternal Leather Leggings - Light Armor -->
+				<item id="17439" min="1" max="1" chance="100" /> <!-- Eternal Leather Gloves - Light Armor -->
+				<item id="17440" min="1" max="1" chance="100" /> <!-- Eternal Leather Boots - Light Armor -->
+				<item id="19448" min="1" max="1" chance="3.006" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="2.066" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="26220" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26220" level="102" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="18338931" sp="18338931" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="7702197" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="11570306.651865" hpRegen="419.6050136" mp="14872873.041" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1144,115 +1049,45 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="22" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Amaranthine Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Amaranthine Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shaper Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Amaranthine Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Amaranthine Retributer Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Amaranthine Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Amaranthine Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Amaranthine Buster Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Amaranthine Shooter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Amaranthine Caster Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Amaranthine Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shaper (60%) -->
-				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Avenger (60%) -->
-				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Stormer (60%) -->
-				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Thrower (60%) -->
-				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Shooter (60%) -->
-				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Amaranthine Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="17527" min="1" max="1" chance="59.36" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="41.71" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="19448" min="1" max="1" chance="2.978" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="1.958" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<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="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (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="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
+				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
+				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
+				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
+				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="26221" level="102" type="L2RaidBoss" name="Whitera" title="Guardian">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml
index 8661da92ff..608fd02ae6 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/23100-23199.xml
@@ -1252,69 +1252,47 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="23126" level="103" type="L2Monster" name="Embryo Elite Escort">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23126" level="104" type="L2Monster" name="Embryo Elite Escort">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1683" level="1" />
 			<skill name="Skill02_ID" id="1637" level="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.877" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.62" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23127" level="103" type="L2Monster" name="Embryo Elite Chaser">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23127" level="104" type="L2Monster" name="Embryo Elite Chaser">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1692" level="1" />
@@ -1323,59 +1301,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="48" />
 				<run ground="180" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3168" max="7389" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.13" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23128" level="103" type="L2Monster" name="Embryo Elite Warrior">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23128" level="104" type="L2Monster" name="Embryo Elite Warrior">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1384,59 +1343,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="80" type="POLE" distance="80" width="120" random="10" accuracy="0" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5275" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.4" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23129" level="103" type="L2Monster" name="Embryo Elite Alchemist">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23129" level="104" type="L2Monster" name="Embryo Elite Alchemist">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1698" level="1" />
@@ -1445,32 +1385,32 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="5312" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
@@ -1490,13 +1430,8 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23130" level="103" type="L2Monster" name="Embryo Elite High Priest">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23130" level="104" type="L2Monster" name="Embryo Elite High Priest">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="11" />
@@ -1505,58 +1440,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.562" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.74" /> <!-- Synthetic Braid -->
-				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23131" level="103" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23131" level="104" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1565,55 +1482,36 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
+		<acquire exp="1772430" sp="1772430" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="36" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="4.386" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="58.16" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29.5" />
 		</collision>
+		<skillList>
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5273" level="1" /> <!-- Power Strike -->
+		</skillList>
 	</npc>
-	<npc id="23132" level="103" type="L2Monster" name="Etina Gospel">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23132" level="104" type="L2Monster" name="Etina Gospel">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1652" level="1" />
@@ -1630,54 +1528,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="7161" max="16701" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="3.51" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="25.25" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.391" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23133" level="95" type="L2Monster" name="Etina Priests">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23133" level="104" type="L2Monster" name="Etina Priests">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="12" />
@@ -1694,54 +1574,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.585" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.34" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="4002" level="1" /> <!-- Blood Siphon -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23134" level="103" type="L2Monster" name="Etina Protectors">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23134" level="104" type="L2Monster" name="Etina Protectors">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1758,56 +1620,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="30425" min="1" max="1" chance="0.750000000000001" /> <!-- Recipe: Blessed Spiritshot (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.45" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="31.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23135" level="103" type="L2Monster" name="Etina Punishers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23135" level="104" type="L2Monster" name="Etina Punishers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1824,51 +1666,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3031" max="7069" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.54" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23136" level="103" type="L2Monster" name="Etina Commination">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23136" level="104" type="L2Monster" name="Etina Commination">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1697" level="1" />
@@ -1885,54 +1712,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5373" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3233" max="7540" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.6" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="32" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="5373" level="1" /> <!-- Blaze -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23137" level="103" type="L2Monster" name="Etina Darkmongers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23137" level="104" type="L2Monster" name="Etina Darkmongers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -1949,55 +1758,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="19" /> <!-- Misc. -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.02" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23138" level="103" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23138" level="104" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -2006,55 +1796,36 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="28.53" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.79" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="34" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23139" level="102" type="L2Monster" name="Embryo Researcher">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23139" level="103" type="L2Monster" name="Embryo Researcher">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1653" level="1" />
@@ -2063,60 +1834,41 @@
 		</parameters>
 		<race>DARK_ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="10278" lhand="10278" /> <!-- Monster Only (Behamah Dual) / Monster Only (Behamah Dual) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="29" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="33" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="16" /> <!-- Dark Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5328" level="1" /> <!-- Unholy Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2651" max="6183" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.64" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="33" />
-		</collision>
 	</npc>
-	<npc id="23140" level="102" type="L2Monster" name="Embryo Watchman">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23140" level="103" type="L2Monster" name="Embryo Watchman">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1654" level="1" />
@@ -2125,59 +1877,40 @@
 		</parameters>
 		<race>ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="15" /> <!-- Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2630" max="6135" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.343" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.32" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23141" level="102" type="L2Monster" name="Embryo Fighter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23141" level="103" type="L2Monster" name="Embryo Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -2186,59 +1919,41 @@
 		</parameters>
 		<race>ORC</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="10004" /> <!-- Dynasty Dualsword -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="10004" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="17" /> <!-- Orcs -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2675" max="6238" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.17" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="36" />
-		</collision>
 	</npc>
-	<npc id="23142" level="102" type="L2Monster" name="Embryo Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23142" level="103" type="L2Monster" name="Embryo Guard">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1682" level="1" />
@@ -2247,56 +1962,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="10" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2641" max="6159" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.9" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="10" />
-			<height normal="29" />
-		</collision>
 	</npc>
 	<npc id="23143" level="99" type="L2Monster" name="Octavis' Gladiator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/25800-25899.xml
index 1107de80bd..a1a6589179 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/25800-25899.xml
@@ -3395,12 +3395,11 @@
 				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
 			</drop>
 			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
+				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Bag - Stage 1 -->
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25857" level="103" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25857" level="104" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16982" level="1" /> <!-- Devil Horns of Shield -->
@@ -3409,50 +3408,36 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="38462527312" sp="38462505" />
+		<acquire exp="4060653" sp="4060653" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1699.83051425557" magical="966.370712187984" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="45" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16982" level="1" /> <!-- Devil Horns of Shield -->
 			<skill id="16981" level="1" /> <!-- Fallen Execution -->
 			<skill id="14194" level="1" /> <!-- Range Stun -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17413" min="1" max="1" chance="0.3" /> <!-- Seraph Necklace -->
-				<item id="17414" min="1" max="1" chance="0.3" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="24" />
-			<height normal="45" />
-		</collision>
 	</npc>
-	<npc id="25858" level="103" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25858" level="104" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16983" level="1" /> <!-- Embryo's Blessing -->
@@ -3462,47 +3447,33 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="51283369715" sp="51283269" />
-		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="4060653" sp="4060653" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="28094.3792762502" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1189.8813599789" magical="1159.64485462558" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" randomWalk="false" />
+		<status attackable="true" randomWalk="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="39" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16983" level="1" /> <!-- Embryo's Blessing -->
 			<skill id="23707" level="1" /> <!-- Chaos Fire -->
 			<skill id="16984" level="1" /> <!-- Blind Spark -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17415" min="1" max="1" chance="0.749999999999996" /> <!-- Seraph Ring -->
-				<item id="17414" min="1" max="1" chance="0.300000000000004" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="18" />
-			<height normal="39" />
-		</collision>
 	</npc>
 	<npc id="25865" level="93" type="L2Monster" name="Apherus Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -4075,21 +4046,21 @@
 		<ai clanHelpRange="300" aggroRange="300" />
 		<dropLists>
 			<drop>
-				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
-				<item id="17308" min="1" max="1" chance="4.27" /> <!-- Immortal Boots - Heavy Armor -->
-				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
-				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
-				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
-				<item id="17319" min="1" max="1" chance="1.357" /> <!-- Immortal Shoes - Robe -->
+				<item id="17308" min="1" max="1" chance="4.273" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17318" min="1" max="1" chance="4.227" /> <!-- Immortal Gloves - Robe -->
+				<item id="17310" min="1" max="1" chance="2.848" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17304" min="1" max="1" chance="2.78" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17313" min="1" max="1" chance="2.15" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.366" /> <!-- Immortal Shoes - Robe -->
 				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
 				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
 				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
 				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
-				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="46474" min="1" max="1" chance="1.173" /> <!-- Leona's Soul Crystal - Stage 1 -->
-				<item id="46489" min="1" max="1" chance="1.077" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
-				<item id="46504" min="1" max="1" chance="1.065" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="17527" min="1" max="1" chance="30.33" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.327" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46504" min="1" max="1" chance="1.171" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46474" min="1" max="1" chance="1.17" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46489" min="1" max="1" chance="1.043" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
 				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
 				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
@@ -4107,110 +4078,89 @@
 				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
 				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
 			</drop>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25876" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25876" level="105" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="14515" level="1" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="881767.0" hpRegen="8.5" mp="33087.0" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
-			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14516" level="1" /> <!-- Darkness Scream -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="17527" min="1" max="1" chance="59.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36586" min="1" max="1" chance="50.13" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="49.94" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="39.97" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35341" min="1" max="1" chance="1.951" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.94" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35353" min="1" max="1" chance="1.936" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.927" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.92" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.916" /> <!-- Eternal Shield Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.909" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.908" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.902" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.876" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.87" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.849" /> <!-- Eternal Boot Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.837" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.827" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.827" /> <!-- Eternal Glove Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.825" /> <!-- Eternal Leather Glove Ingredient -->
 				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
 				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
 				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
 				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
 				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
 				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
@@ -4226,62 +4176,48 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
 				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25877" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25877" level="105" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill02_ID" id="14519" level="1" />
@@ -4289,91 +4225,85 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="2081767" hpRegen="8.5" mp="33087" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14520" level="1" /> <!-- Ice Box of Hell -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="17527" min="1" max="1" chance="58.9" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="51.16" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="36586" min="1" max="1" chance="49.42" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="40.74" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35353" min="1" max="1" chance="1.961" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.956" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.949" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.937" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.925" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.915" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.907" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.906" /> <!-- Eternal Glove Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.903" /> <!-- Eternal Shield Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.883" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35341" min="1" max="1" chance="1.875" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.873" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.867" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.862" /> <!-- Eternal Boot Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.856" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.832" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
 				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
 				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
 				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
 				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
 				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
 				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
 				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
 				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
@@ -4384,58 +4314,45 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
 				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="25878" level="85" type="L2Monster" name="Arbitor of Darkness" title="Raid Fighter">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26200-26299.xml
index cd6d977ac9..786544d9e7 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26200-26299.xml
@@ -991,20 +991,20 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 		</skillList>
 	</npc>
-	<npc id="26219" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26219" level="102" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15588090" sp="15588090" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="6546867" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="9834759.80235" hpRegen="419.6050136" mp="12641940.99" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1012,131 +1012,36 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="21" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
-				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
-				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
-				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
-				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
-				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="17436" min="1" max="1" chance="100" /> <!-- Eternal Leather Helmet - Light Armor -->
+				<item id="17437" min="1" max="1" chance="100" /> <!-- Eternal Leather Armor - Light Armor -->
+				<item id="17438" min="1" max="1" chance="100" /> <!-- Eternal Leather Leggings - Light Armor -->
+				<item id="17439" min="1" max="1" chance="100" /> <!-- Eternal Leather Gloves - Light Armor -->
+				<item id="17440" min="1" max="1" chance="100" /> <!-- Eternal Leather Boots - Light Armor -->
+				<item id="19448" min="1" max="1" chance="3.006" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="2.066" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="26220" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26220" level="102" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="18338931" sp="18338931" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="7702197" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="11570306.651865" hpRegen="419.6050136" mp="14872873.041" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1144,115 +1049,45 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="22" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="17527" min="1" max="1" chance="59.36" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="41.71" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="19448" min="1" max="1" chance="2.978" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="1.958" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<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="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (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="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
 				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
 				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="26221" level="102" type="L2RaidBoss" name="Whitra" title="Guardian">
@@ -1920,7 +1755,6 @@
 		</collision>
 	</npc>
 	<npc id="26236" level="104" type="L2RaidBoss" name="Camille" title="Final Disciple">
-		<!-- Source: www.l2wiki.com -->
 		<race>HUMANOID</race>
 		<acquire exp="304278653952" sp="608557372" raidPoints="21" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
@@ -3783,6 +3617,7 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="1" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
@@ -3876,6 +3711,7 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="2" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
@@ -3969,6 +3805,7 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="3" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
@@ -4062,6 +3899,7 @@
 			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="4" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml
index 685cdb9409..85b925bfe6 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/23100-23199.xml
@@ -1252,69 +1252,47 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="23126" level="103" type="L2Monster" name="Embryo Elite Escort">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23126" level="104" type="L2Monster" name="Embryo Elite Escort">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1683" level="1" />
 			<skill name="Skill02_ID" id="1637" level="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.877" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.62" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23127" level="103" type="L2Monster" name="Embryo Elite Chaser">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23127" level="104" type="L2Monster" name="Embryo Elite Chaser">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1692" level="1" />
@@ -1323,59 +1301,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="48" />
 				<run ground="180" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3168" max="7389" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.13" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23128" level="103" type="L2Monster" name="Embryo Elite Warrior">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23128" level="104" type="L2Monster" name="Embryo Elite Warrior">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1384,59 +1343,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="80" type="POLE" distance="80" width="120" random="10" accuracy="0" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5275" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.4" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23129" level="103" type="L2Monster" name="Embryo Elite Alchemist">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23129" level="104" type="L2Monster" name="Embryo Elite Alchemist">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1698" level="1" />
@@ -1445,32 +1385,32 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="5312" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
@@ -1487,16 +1427,11 @@
 				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
 			</spoil>
 			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
+				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23130" level="103" type="L2Monster" name="Embryo Elite High Priest">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23130" level="104" type="L2Monster" name="Embryo Elite High Priest">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="11" />
@@ -1505,58 +1440,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.562" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.74" /> <!-- Synthetic Braid -->
-				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23131" level="103" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23131" level="104" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1565,55 +1482,36 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
+		<acquire exp="1772430" sp="1772430" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="36" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="4.386" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="58.16" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29.5" />
 		</collision>
+		<skillList>
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5273" level="1" /> <!-- Power Strike -->
+		</skillList>
 	</npc>
-	<npc id="23132" level="103" type="L2Monster" name="Etina Gospel">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23132" level="104" type="L2Monster" name="Etina Gospel">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1652" level="1" />
@@ -1630,54 +1528,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="7161" max="16701" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="3.51" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="25.25" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.391" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23133" level="95" type="L2Monster" name="Etina Priests">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23133" level="104" type="L2Monster" name="Etina Priests">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="12" />
@@ -1694,54 +1574,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.585" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.34" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="4002" level="1" /> <!-- Blood Siphon -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23134" level="103" type="L2Monster" name="Etina Protectors">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23134" level="104" type="L2Monster" name="Etina Protectors">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1758,56 +1620,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="30425" min="1" max="1" chance="0.750000000000001" /> <!-- Recipe: Blessed Spiritshot (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.45" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="31.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23135" level="103" type="L2Monster" name="Etina Punishers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23135" level="104" type="L2Monster" name="Etina Punishers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1824,51 +1666,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3031" max="7069" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.54" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23136" level="103" type="L2Monster" name="Etina Commination">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23136" level="104" type="L2Monster" name="Etina Commination">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1697" level="1" />
@@ -1885,54 +1712,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5373" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3233" max="7540" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.6" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="32" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="5373" level="1" /> <!-- Blaze -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23137" level="103" type="L2Monster" name="Etina Darkmongers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23137" level="104" type="L2Monster" name="Etina Darkmongers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -1949,55 +1758,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="19" /> <!-- Misc. -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.02" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23138" level="103" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23138" level="104" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -2006,55 +1796,36 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="28.53" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.79" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="34" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23139" level="102" type="L2Monster" name="Embryo Researcher">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23139" level="103" type="L2Monster" name="Embryo Researcher">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1653" level="1" />
@@ -2063,60 +1834,41 @@
 		</parameters>
 		<race>DARK_ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="10278" lhand="10278" /> <!-- Monster Only (Behamah Dual) / Monster Only (Behamah Dual) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="29" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="33" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="16" /> <!-- Dark Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5328" level="1" /> <!-- Unholy Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2651" max="6183" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.64" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="33" />
-		</collision>
 	</npc>
-	<npc id="23140" level="102" type="L2Monster" name="Embryo Watchman">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23140" level="103" type="L2Monster" name="Embryo Watchman">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1654" level="1" />
@@ -2125,59 +1877,40 @@
 		</parameters>
 		<race>ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="15" /> <!-- Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2630" max="6135" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.343" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.32" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23141" level="102" type="L2Monster" name="Embryo Fighter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23141" level="103" type="L2Monster" name="Embryo Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -2186,59 +1919,41 @@
 		</parameters>
 		<race>ORC</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="10004" /> <!-- Dynasty Dualsword -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="10004" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="17" /> <!-- Orcs -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2675" max="6238" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.17" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="36" />
-		</collision>
 	</npc>
-	<npc id="23142" level="102" type="L2Monster" name="Embryo Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23142" level="103" type="L2Monster" name="Embryo Guard">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1682" level="1" />
@@ -2247,56 +1962,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="10" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2641" max="6159" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.9" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="10" />
-			<height normal="29" />
-		</collision>
 	</npc>
 	<npc id="23143" level="99" type="L2Monster" name="Octavis' Gladiator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/25800-25899.xml
index 3f8397eebc..3c4be14715 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/25800-25899.xml
@@ -3399,8 +3399,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25857" level="103" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25857" level="104" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16982" level="1" /> <!-- Devil Horns of Shield -->
@@ -3409,50 +3408,36 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="38462527312" sp="38462505" />
+		<acquire exp="4060653" sp="4060653" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1699.83051425557" magical="966.370712187984" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="45" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16982" level="1" /> <!-- Devil Horns of Shield -->
 			<skill id="16981" level="1" /> <!-- Fallen Execution -->
 			<skill id="14194" level="1" /> <!-- Range Stun -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17413" min="1" max="1" chance="0.3" /> <!-- Seraph Necklace -->
-				<item id="17414" min="1" max="1" chance="0.3" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="24" />
-			<height normal="45" />
-		</collision>
 	</npc>
-	<npc id="25858" level="103" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25858" level="104" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16983" level="1" /> <!-- Embryo's Blessing -->
@@ -3462,47 +3447,33 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="51283369715" sp="51283269" />
-		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="4060653" sp="4060653" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="28094.3792762502" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1189.8813599789" magical="1159.64485462558" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" randomWalk="false" />
+		<status attackable="true" randomWalk="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="39" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16983" level="1" /> <!-- Embryo's Blessing -->
 			<skill id="23707" level="1" /> <!-- Chaos Fire -->
 			<skill id="16984" level="1" /> <!-- Blind Spark -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17415" min="1" max="1" chance="0.749999999999996" /> <!-- Seraph Ring -->
-				<item id="17414" min="1" max="1" chance="0.300000000000004" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="18" />
-			<height normal="39" />
-		</collision>
 	</npc>
 	<npc id="25865" level="93" type="L2Monster" name="Apherus Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -4075,21 +4046,21 @@
 		<ai clanHelpRange="300" aggroRange="300" />
 		<dropLists>
 			<drop>
-				<item id="17318" min="1" max="1" chance="4.284" /> <!-- Immortal Gloves - Robe -->
-				<item id="17308" min="1" max="1" chance="4.27" /> <!-- Immortal Boots - Heavy Armor -->
-				<item id="17304" min="1" max="1" chance="2.865" /> <!-- Immortal Helmet - Heavy Armor -->
-				<item id="17310" min="1" max="1" chance="2.854" /> <!-- Immortal Leather Helmet - Light Armor -->
-				<item id="17313" min="1" max="1" chance="2.088" /> <!-- Immortal Leather Gloves - Light Armor -->
-				<item id="17319" min="1" max="1" chance="1.357" /> <!-- Immortal Shoes - Robe -->
+				<item id="17308" min="1" max="1" chance="4.273" /> <!-- Immortal Boots - Heavy Armor -->
+				<item id="17318" min="1" max="1" chance="4.227" /> <!-- Immortal Gloves - Robe -->
+				<item id="17310" min="1" max="1" chance="2.848" /> <!-- Immortal Leather Helmet - Light Armor -->
+				<item id="17304" min="1" max="1" chance="2.78" /> <!-- Immortal Helmet - Heavy Armor -->
+				<item id="17313" min="1" max="1" chance="2.15" /> <!-- Immortal Leather Gloves - Light Armor -->
+				<item id="17319" min="1" max="1" chance="1.366" /> <!-- Immortal Shoes - Robe -->
 				<item id="17300" min="1" max="1" chance="0.3" /> <!-- Requiem Retributer -->
 				<item id="17296" min="1" max="1" chance="0.3" /> <!-- Requiem Thrower -->
 				<item id="17291" min="1" max="1" chance="0.3" /> <!-- Requiem Cutter -->
 				<item id="17290" min="1" max="1" chance="0.3" /> <!-- Requiem Shaper -->
-				<item id="17527" min="1" max="1" chance="28.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="2.314" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="46474" min="1" max="1" chance="1.173" /> <!-- Leona's Soul Crystal - Stage 1 -->
-				<item id="46489" min="1" max="1" chance="1.077" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
-				<item id="46504" min="1" max="1" chance="1.065" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="17527" min="1" max="1" chance="30.33" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="2.327" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="46504" min="1" max="1" chance="1.171" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46474" min="1" max="1" chance="1.17" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46489" min="1" max="1" chance="1.043" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
 				<item id="46505" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 2 -->
 				<item id="46506" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="46490" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
@@ -4107,110 +4078,89 @@
 				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46477" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 4 -->
 				<item id="46507" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
 			</drop>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25876" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25876" level="105" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="14515" level="1" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="881767.0" hpRegen="8.5" mp="33087.0" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
-			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14516" level="1" /> <!-- Darkness Scream -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="17527" min="1" max="1" chance="59.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36586" min="1" max="1" chance="50.13" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="49.94" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="39.97" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35341" min="1" max="1" chance="1.951" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.94" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35353" min="1" max="1" chance="1.936" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.927" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.92" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.916" /> <!-- Eternal Shield Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.909" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.908" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.902" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.876" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.87" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.849" /> <!-- Eternal Boot Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.837" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.827" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.827" /> <!-- Eternal Glove Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.825" /> <!-- Eternal Leather Glove Ingredient -->
 				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
 				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
 				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
 				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
 				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
 				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
@@ -4226,62 +4176,48 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
 				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25877" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25877" level="105" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill02_ID" id="14519" level="1" />
@@ -4289,91 +4225,85 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="2081767" hpRegen="8.5" mp="33087" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14520" level="1" /> <!-- Ice Box of Hell -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="17527" min="1" max="1" chance="58.9" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="51.16" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="36586" min="1" max="1" chance="49.42" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="40.74" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="35353" min="1" max="1" chance="1.961" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.956" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.949" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.937" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.925" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.915" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.907" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.906" /> <!-- Eternal Glove Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.903" /> <!-- Eternal Shield Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.883" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35341" min="1" max="1" chance="1.875" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.873" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.867" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.862" /> <!-- Eternal Boot Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.856" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.832" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
 				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
 				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
 				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
 				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
 				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
 				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
 				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
 				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
@@ -4384,58 +4314,45 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
 				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="25878" level="85" type="L2Monster" name="Arbitor of Darkness" title="Raid Fighter">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26200-26299.xml
index 25d451f2f7..a09a5a9736 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26200-26299.xml
@@ -991,20 +991,20 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 		</skillList>
 	</npc>
-	<npc id="26219" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26219" level="102" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15588090" sp="15588090" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="6546867" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="9834759.80235" hpRegen="419.6050136" mp="12641940.99" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1012,131 +1012,36 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="21" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
-				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
-				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
-				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
-				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
-				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="17436" min="1" max="1" chance="100" /> <!-- Eternal Leather Helmet - Light Armor -->
+				<item id="17437" min="1" max="1" chance="100" /> <!-- Eternal Leather Armor - Light Armor -->
+				<item id="17438" min="1" max="1" chance="100" /> <!-- Eternal Leather Leggings - Light Armor -->
+				<item id="17439" min="1" max="1" chance="100" /> <!-- Eternal Leather Gloves - Light Armor -->
+				<item id="17440" min="1" max="1" chance="100" /> <!-- Eternal Leather Boots - Light Armor -->
+				<item id="19448" min="1" max="1" chance="3.006" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="2.066" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="26220" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26220" level="102" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="18338931" sp="18338931" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="7702197" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="11570306.651865" hpRegen="419.6050136" mp="14872873.041" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1144,115 +1049,45 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="22" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="17527" min="1" max="1" chance="59.36" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="41.71" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="19448" min="1" max="1" chance="2.978" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="1.958" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<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="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (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="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
 				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
 				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Bag - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="26221" level="102" type="L2RaidBoss" name="Whitra" title="Guardian">
@@ -1920,7 +1755,6 @@
 		</collision>
 	</npc>
 	<npc id="26236" level="104" type="L2RaidBoss" name="Camille" title="Final Disciple">
-		<!-- Source: www.l2wiki.com -->
 		<race>HUMANOID</race>
 		<acquire exp="304278653952" sp="608557372" raidPoints="21" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
@@ -3783,6 +3617,7 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="1" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
@@ -3876,6 +3711,7 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="2" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
@@ -3969,6 +3805,7 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="3" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
@@ -4062,6 +3899,7 @@
 			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="32259" level="4" /> <!-- Raid Boss (Lv. 105) -->
 			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml
index cf46ba9ffb..16e61e0161 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/23100-23199.xml
@@ -1252,69 +1252,47 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="23126" level="103" type="L2Monster" name="Embryo Elite Escort">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23126" level="104" type="L2Monster" name="Embryo Elite Escort">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1683" level="1" />
 			<skill name="Skill02_ID" id="1637" level="1" />
 			<param name="Attack_BoostValue" value="144" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.877" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.62" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23127" level="103" type="L2Monster" name="Embryo Elite Chaser">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23127" level="104" type="L2Monster" name="Embryo Elite Chaser">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1692" level="1" />
@@ -1323,59 +1301,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="48" />
 				<run ground="180" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3168" max="7389" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.13" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23128" level="103" type="L2Monster" name="Embryo Elite Warrior">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23128" level="104" type="L2Monster" name="Embryo Elite Warrior">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1384,59 +1343,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="80" type="POLE" distance="80" width="120" random="10" accuracy="0" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5275" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.4" /> <!-- Synthetic Braid -->
-				<item id="17527" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23129" level="103" type="L2Monster" name="Embryo Elite Alchemist">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23129" level="104" type="L2Monster" name="Embryo Elite Alchemist">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1698" level="1" />
@@ -1445,32 +1385,32 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="5312" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
@@ -1490,13 +1430,8 @@
 				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky>
 		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23130" level="103" type="L2Monster" name="Embryo Elite High Priest">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23130" level="104" type="L2Monster" name="Embryo Elite High Priest">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="11" />
@@ -1505,58 +1440,40 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="32" />
 				<run ground="136" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="21" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_HIGH</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.562" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.74" /> <!-- Synthetic Braid -->
-				<item id="17526" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="21" />
-		</collision>
 	</npc>
-	<npc id="23131" level="103" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23131" level="104" type="L2Monster" name="Embryo Executor Captain" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1565,55 +1482,36 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
+		<acquire exp="1772430" sp="1772430" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="36" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="4.386" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="58.16" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="29.5" />
 		</collision>
+		<skillList>
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5273" level="1" /> <!-- Power Strike -->
+		</skillList>
 	</npc>
-	<npc id="23132" level="103" type="L2Monster" name="Etina Gospel">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23132" level="104" type="L2Monster" name="Etina Gospel">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1652" level="1" />
@@ -1630,54 +1528,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="7161" max="16701" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="3.51" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="25.25" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.391" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5336" level="1" /> <!-- Spinning Slasher -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23133" level="95" type="L2Monster" name="Etina Priests">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23133" level="104" type="L2Monster" name="Etina Priests">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4002" level="12" />
@@ -1694,54 +1574,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2506588" sp="601" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="60" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4002" level="1" /> <!-- Blood Siphon -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3141" max="7325" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.585" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.34" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="30" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="4002" level="1" /> <!-- Blood Siphon -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23134" level="103" type="L2Monster" name="Etina Protectors">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23134" level="104" type="L2Monster" name="Etina Protectors">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="5483" level="1" />
@@ -1758,56 +1620,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3685" max="8595" chance="70" /> <!-- Adena -->
-				<item id="30425" min="1" max="1" chance="0.750000000000001" /> <!-- Recipe: Blessed Spiritshot (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="12.45" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="31.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23135" level="103" type="L2Monster" name="Etina Punishers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23135" level="104" type="L2Monster" name="Etina Punishers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -1824,51 +1666,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="15" /> <!-- Strong P. Atk. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5334" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3031" max="7069" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.54" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="5334" level="1" /> <!-- Power Strike -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23136" level="103" type="L2Monster" name="Etina Commination">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23136" level="104" type="L2Monster" name="Etina Commination">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1697" level="1" />
@@ -1885,54 +1712,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="5373" level="1" /> <!-- Blaze -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3233" max="7540" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="10.6" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="12" />
 			<height normal="32" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
+			<skill id="5373" level="1" /> <!-- Blaze -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23137" level="103" type="L2Monster" name="Etina Darkmongers">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23137" level="104" type="L2Monster" name="Etina Darkmongers">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -1949,55 +1758,36 @@
 		</parameters>
 		<race>DIVINE</race>
 		<sex>MALE</sex>
-		<acquire exp="877685222" sp="877682" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
-			<skill id="4416" level="19" /> <!-- Misc. -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="3195" max="7453" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="11.02" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="0.75" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="15" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="8" /> <!-- Angels -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23138" level="103" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23138" level="104" type="L2Monster" name="Etina Bladesmen" title="Watchman of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6093" level="1" />
@@ -2006,55 +1796,36 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<acquire exp="1755370444" sp="1755365" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1024526" hpRegen="8.5" mp="25074" mpRegen="30" />
+		<acquire exp="1772430" sp="1772430" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1118252.67345" hpRegen="9.5" mp="1437440.73" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="78039.9424340284" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="485.665861215878" magical="276.105917767995" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
-		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="6093" level="1" /> <!-- Panther Hide -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-		</skillList>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<dropLists>
-			<drop>
-				<item id="57" min="8642" max="20156" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="28.53" /> <!-- Synthetic Braid -->
-				<item id="19440" min="1" max="1" chance="1.79" /> <!-- Gemstone (R-grade) -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="34" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
+			<skill id="6093" level="1" /> <!-- Panther Hide -->
+		</skillList>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
 	</npc>
-	<npc id="23139" level="102" type="L2Monster" name="Embryo Researcher">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23139" level="103" type="L2Monster" name="Embryo Researcher">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1653" level="1" />
@@ -2063,60 +1834,41 @@
 		</parameters>
 		<race>DARK_ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="10278" lhand="10278" /> <!-- Monster Only (Behamah Dual) / Monster Only (Behamah Dual) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="29" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="33" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="16" /> <!-- Dark Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5328" level="1" /> <!-- Unholy Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2651" max="6183" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="0.750000000000001" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="0.0750000000000001" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.64" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="33" />
-		</collision>
 	</npc>
-	<npc id="23140" level="102" type="L2Monster" name="Embryo Watchman">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23140" level="103" type="L2Monster" name="Embryo Watchman">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1654" level="1" />
@@ -2125,59 +1877,40 @@
 		</parameters>
 		<race>ELF</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="15302" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="8" attackSpeed="253" range="1100" type="BOW" distance="10" width="0" random="5" accuracy="0" />
-			<defence physical="310.826151178162" magical="176.707787371517" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="13" /> <!-- Slightly Strong M. Def. -->
 			<skill id="4416" level="15" /> <!-- Elves -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
-			<skill id="4415" level="9" /> <!-- Bows -->
+			<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 -->
 			<skill id="5298" level="1" /> <!-- Power Shot -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2630" max="6135" chance="70" /> <!-- Adena -->
-				<item id="17527" min="1" max="1" chance="1.343" /> <!-- Scroll: Enchant Armor (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.32" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="12" />
-			<height normal="29" />
-		</collision>
 	</npc>
-	<npc id="23141" level="102" type="L2Monster" name="Embryo Fighter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23141" level="103" type="L2Monster" name="Embryo Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1687" level="1" />
@@ -2186,59 +1919,41 @@
 		</parameters>
 		<race>ORC</race>
 		<sex>MALE</sex>
-		<acquire exp="717258314" sp="717251" />
-		<equipment rhand="10004" /> <!-- Dynasty Dualsword -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<equipment rhand="10004" /> 
+		<acquire exp="1636594" sp="1636594" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="4605.4148464766" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="310.826151178162" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="17" /> <!-- Orcs -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2675" max="6238" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="18.17" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="15" />
-			<height normal="36" />
-		</collision>
 	</npc>
-	<npc id="23142" level="102" type="L2Monster" name="Embryo Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="23142" level="103" type="L2Monster" name="Embryo Guard">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="1682" level="1" />
@@ -2247,56 +1962,39 @@
 		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
-		<acquire exp="717258314" sp="717251" />
+		<acquire exp="1636594" sp="1636594" />
 		<equipment rhand="13979" lhand="13980" /> <!-- Monster Only (Dragontroop Commando) / Monster Only (Dragontroop Defender) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="946008" hpRegen="8.5" mp="24690" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="1032551.70351" hpRegen="9.5" mp="1327277.734" mpRegen="3.3" />
+			<attack physical="49070" magical="38776" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4489" magical="2606" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
 			</speed>
-			<attack physical="13006.6570723381" magical="2302.7074232383" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="388.532688972703" magical="220.884734214396" />
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="200" dark="250" />
 				<attack type="DARK" value="330" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="10" />
+			<height normal="29" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
-			<skill id="4411" level="12" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
-			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 			<skill id="4416" level="14" /> <!-- Humans -->
-			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<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 -->
+			<skill id="4435" level="5" /> <!-- High Stun Attack Resistance -->
 			<skill id="5273" level="1" /> <!-- Power Strike -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 		<ai aggroRange="300" isAggressive="true" clanHelpRange="300">
 			<clanList>
 				<clan>EMBRYO_LOW</clan>
 			</clanList>
 		</ai>
-		<dropLists>
-			<drop>
-				<item id="57" min="2641" max="6159" chance="70" /> <!-- Adena -->
-				<item id="17526" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-			</drop>
-			<spoil>
-				<item id="36533" min="1" max="1" chance="17.9" /> <!-- Synthetic Braid -->
-			</spoil>
-			<lucky>
-				<item id="39629" min="1" max="1" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="10" />
-			<height normal="29" />
-		</collision>
 	</npc>
 	<npc id="23143" level="99" type="L2Monster" name="Octavis' Gladiator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/25800-25899.xml
index 6c9dd86007..ac3ba89b60 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/25800-25899.xml
@@ -3399,8 +3399,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25857" level="103" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25857" level="104" type="L2Monster" name="Corrupted Captain" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16982" level="1" /> <!-- Devil Horns of Shield -->
@@ -3409,50 +3408,36 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="38462527312" sp="38462505" />
+		<acquire exp="4060653" sp="4060653" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="13816.2445394298" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1699.83051425557" magical="966.370712187984" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="45" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16982" level="1" /> <!-- Devil Horns of Shield -->
 			<skill id="16981" level="1" /> <!-- Fallen Execution -->
 			<skill id="14194" level="1" /> <!-- Range Stun -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17413" min="1" max="1" chance="0.3" /> <!-- Seraph Necklace -->
-				<item id="17414" min="1" max="1" chance="0.3" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="24" />
-			<height normal="45" />
-		</collision>
 	</npc>
-	<npc id="25858" level="103" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25858" level="104" type="L2Monster" name="Corrupted High Priest" title="Guardian of the Altar">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16983" level="1" /> <!-- Embryo's Blessing -->
@@ -3462,47 +3447,33 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="51283369715" sp="51283269" />
-		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1705440" hpRegen="8.5" mp="33087" mpRegen="30" />
+		<acquire exp="4060653" sp="4060653" />
+		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
+			<vitals hp="2561926.887495" hpRegen="9.5" mp="3293189.583" mpRegen="3.3" />
+			<attack physical="52427" magical="42381" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4845" magical="2813" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
 			</speed>
-			<attack physical="93647.9309208341" magical="28094.3792762502" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="1189.8813599789" magical="1159.64485462558" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" undying="false" randomWalk="false" />
+		<status attackable="true" randomWalk="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="39" />
+		</collision>
 		<skillList>
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="3" /> <!-- Blood Siphon Resistance -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
 			<skill id="16983" level="1" /> <!-- Embryo's Blessing -->
 			<skill id="23707" level="1" /> <!-- Chaos Fire -->
 			<skill id="16984" level="1" /> <!-- Blind Spark -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300" />
-		<dropLists>
-			<drop>
-				<item id="17415" min="1" max="1" chance="0.749999999999996" /> <!-- Seraph Ring -->
-				<item id="17414" min="1" max="1" chance="0.300000000000004" /> <!-- Seraph Earring -->
-			</drop>
-			<lucky>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
-		</dropLists>
-		<collision>
-			<radius normal="18" />
-			<height normal="39" />
-		</collision>
 	</npc>
 	<npc id="25865" level="93" type="L2Monster" name="Apherus Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -3980,94 +3951,87 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25876" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25876" level="105" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="14515" level="1" />
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="881767.0" hpRegen="8.5" mp="33087.0" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
-			<skill id="14713" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="14516" level="1" /> <!-- Darkness Scream -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="17527" min="1" max="1" chance="59.75" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36586" min="1" max="1" chance="50.13" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="49.94" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="39.97" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="48568" min="1" max="3" chance="20.81" /> <!-- Guard Agathion Fragment -->
+				<item id="35341" min="1" max="1" chance="1.951" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.94" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35353" min="1" max="1" chance="1.936" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.927" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.92" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.916" /> <!-- Eternal Shield Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.909" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.908" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.902" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.876" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.87" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.849" /> <!-- Eternal Boot Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.837" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.827" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.827" /> <!-- Eternal Glove Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.825" /> <!-- Eternal Leather Glove Ingredient -->
 				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
 				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
 				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
+				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
 				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
 				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
 				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
@@ -4083,62 +4047,48 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
 				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25877" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25877" level="105" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill02_ID" id="14519" level="1" />
@@ -4146,91 +4096,86 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="169922991147" sp="169922929" raidPoints="7" />
+		<acquire exp="4956687" sp="4956687" raidPoints="7" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="2081767" hpRegen="8.5" mp="33087" mpRegen="30" />
+			<vitals hp="3127248.178605" hpRegen="444.7141361" mp="4019873.157" mpRegen="3.3" />
+			<attack physical="301079.7437" magical="215919.4101" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="34907.01512" magical="17038.26718" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="67541.1129695656" magical="7933.39078546243" critical="4" attackSpeed="253" range="40" type="SWORD" distance="80" width="120" random="10" accuracy="5" />
-			<defence physical="3607.74748074426" magical="2081.35112045963" />
 			<attribute>
 				<defence fire="350" water="350" wind="350" earth="350" holy="300" dark="350" />
 				<attack type="DARK" value="430" />
 			</attribute>
-			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" isDeathPenalty="true" />
+		<status attackable="true" isDeathPenalty="true" />
+		<collision>
+			<radius normal="24" />
+			<height normal="60" />
+		</collision>
 		<skillList>
 			<skill id="14712" level="1" /> <!-- Raid Boss (Lv. 96) -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5467" level="1" /> <!-- Strong against the dark elemental. -->
-			<skill id="4435" level="5" /> <!-- Greater Stun Resistance -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
 			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
 			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
 			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="14520" level="1" /> <!-- Ice Box of Hell -->
 			<skill id="14519" level="1" /> <!-- Fire Pit of Hell -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
-			<skill id="14620" level="1" /> <!-- Aerial Yoke Resistance 1 -->
-			<skill id="14622" level="1" /> <!-- Banishment Resistance -->
-			<skill id="14623" level="1" /> <!-- Mutation Resistance -->
-			<skill id="14617" level="1" /> <!-- Knock Down Resistance -->
-			<skill id="14619" level="1" /> <!-- Disarm Resistance -->
 		</skillList>
 		<ai clanHelpRange="300" aggroRange="300">
 			<clanList>
 				<clan>EMBRYO_BOSS</clan>
 			</clanList>
 		</ai>
-		<collision>
-			<radius normal="24" />
-			<height normal="60" />
-		</collision>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="17527" min="1" max="1" chance="58.9" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="36574" min="1" max="1" chance="51.16" /> <!-- Scroll: Modify Weapon (R-grade) -->
+				<item id="36586" min="1" max="1" chance="49.42" /> <!-- Scroll: Modify Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="40.74" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="48568" min="1" max="3" chance="20.85" /> <!-- Guard Agathion Fragment -->
+				<item id="35353" min="1" max="1" chance="1.961" /> <!-- Eternal Shoe Ingredient -->
+				<item id="35349" min="1" max="1" chance="1.956" /> <!-- Eternal Circlet Ingredient -->
+				<item id="35348" min="1" max="1" chance="1.949" /> <!-- Eternal Leather Boot Ingredient -->
+				<item id="35344" min="1" max="1" chance="1.937" /> <!-- Eternal Leather Helmet Ingredient -->
+				<item id="35346" min="1" max="1" chance="1.925" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
+				<item id="35347" min="1" max="1" chance="1.915" /> <!-- Eternal Leather Glove Ingredient -->
+				<item id="35354" min="1" max="1" chance="1.907" /> <!-- Eternal Sigil Ingredient -->
+				<item id="35352" min="1" max="1" chance="1.906" /> <!-- Eternal Glove Ingredient -->
+				<item id="35343" min="1" max="1" chance="1.903" /> <!-- Eternal Shield Ingredient -->
+				<item id="35350" min="1" max="1" chance="1.883" /> <!-- Eternal Tunic Ingredient -->
+				<item id="35341" min="1" max="1" chance="1.875" /> <!-- Eternal Gauntlet Ingredient -->
+				<item id="35339" min="1" max="1" chance="1.873" /> <!-- Eternal Breastplate Ingredient -->
+				<item id="35345" min="1" max="1" chance="1.867" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="35342" min="1" max="1" chance="1.862" /> <!-- Eternal Boot Ingredient -->
+				<item id="35340" min="1" max="1" chance="1.856" /> <!-- Eternal Gaiter Ingredient -->
+				<item id="35351" min="1" max="1" chance="1.832" /> <!-- Eternal Stocking Ingredient -->
+				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
 				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
 				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
 				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
 				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
+				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
+				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
 				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
 				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
 				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
 				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
 				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
 				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
 				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
 				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
@@ -4241,58 +4186,45 @@
 				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
 				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
 				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
+				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
 				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
+				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
+				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
 				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
 				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
 				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
 				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
 				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
 				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
 				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
 				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
 				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
 				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
 				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
 				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
 				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
+				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
 				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
 				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
 				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
 				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="25878" level="85" type="L2Monster" name="Arbitor of Darkness" title="Raid Fighter">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26200-26299.xml
index 1a447eeaae..67e3c26954 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26200-26299.xml
@@ -991,20 +991,20 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 		</skillList>
 	</npc>
-	<npc id="26219" level="104" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26219" level="102" type="L2RaidBoss" name="Maliss" title="Grand Priest of Blood">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15588090" sp="15588090" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="6546867" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="9834759.80235" hpRegen="419.6050136" mp="12641940.99" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1012,131 +1012,36 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="21" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="59.55" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="49.14" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.95" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="40.44" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.952" /> <!-- Eternal Glove Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.949" /> <!-- Eternal Boot Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.945" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.943" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.925" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.897" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.896" /> <!-- Eternal Shield Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.888" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.887" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.883" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.865" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.861" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.852" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.844" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.84" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.84" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
-				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
-				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
-				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
-				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
-				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
-				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
-				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="17436" min="1" max="1" chance="100" /> <!-- Eternal Leather Helmet - Light Armor -->
+				<item id="17437" min="1" max="1" chance="100" /> <!-- Eternal Leather Armor - Light Armor -->
+				<item id="17438" min="1" max="1" chance="100" /> <!-- Eternal Leather Leggings - Light Armor -->
+				<item id="17439" min="1" max="1" chance="100" /> <!-- Eternal Leather Gloves - Light Armor -->
+				<item id="17440" min="1" max="1" chance="100" /> <!-- Eternal Leather Boots - Light Armor -->
+				<item id="19448" min="1" max="1" chance="3.006" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="2.066" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="26220" level="104" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26220" level="102" type="L2RaidBoss" name="Isadora" title="Great Magus of Greed">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="18338931" sp="18338931" raidPoints="7" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="7702197" hpRegen="10.5" mp="49380" mpRegen="3.6" />
+			<vitals hp="11570306.651865" hpRegen="419.6050136" mp="14872873.041" mpRegen="3.3" />
+			<attack physical="284080.4007" magical="203728.3272" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="32936.12091" magical="16076.26507" />
 			<speed>
 				<walk ground="30" />
 				<run ground="300" />
 			</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="24" />
 			<height normal="60" />
@@ -1144,115 +1049,45 @@
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5467" level="1" /> <!-- Dark Attack -->
-			<skill id="14620" level="4" /> <!-- Aerial Yoke Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
-			<skill id="4438" level="5" /> <!-- Greater Sleep Resistance -->
-			<skill id="4440" level="5" /> <!-- Greater Paralysis Resistance -->
-			<skill id="4441" level="5" /> <!-- Greater Mental Attack Resistance -->
-			<skill id="14804" level="10" /> <!-- Damage Reflect Attack Resistance -->
-			<skill id="4439" level="5" /> <!-- Greater Hold Resistance -->
+			<skill id="16758" level="1" /> <!-- Embryo -->
+			<skill id="16893" level="22" /> <!-- Messiah Outer Castle Elite Monster -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
 		</skillList>
 		<dropLists>
 			<drop>
-				<item id="17527" min="1" max="1" chance="61.17" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36574" min="1" max="1" chance="50.91" /> <!-- Scroll: Modify Weapon (R-grade) -->
-				<item id="36586" min="1" max="1" chance="48.8" /> <!-- Scroll: Modify Armor (R-grade) -->
-				<item id="17526" min="1" max="1" chance="39.83" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<item id="35352" min="1" max="1" chance="1.945" /> <!-- Eternal Glove Ingredient -->
-				<item id="35346" min="1" max="1" chance="1.944" /> <!-- Eternal Leather Legging Ingredient -->
-				<item id="35344" min="1" max="1" chance="1.921" /> <!-- Eternal Leather Helmet Ingredient -->
-				<item id="35342" min="1" max="1" chance="1.92" /> <!-- Eternal Boot Ingredient -->
-				<item id="35345" min="1" max="1" chance="1.906" /> <!-- Eternal Leather Armor Ingredient -->
-				<item id="35348" min="1" max="1" chance="1.901" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="35339" min="1" max="1" chance="1.896" /> <!-- Eternal Breastplate Ingredient -->
-				<item id="35351" min="1" max="1" chance="1.895" /> <!-- Eternal Stocking Ingredient -->
-				<item id="35338" min="1" max="1" chance="1.894" /> <!-- Eternal Helmet Ingredient -->
-				<item id="35343" min="1" max="1" chance="1.889" /> <!-- Eternal Shield Ingredient -->
-				<item id="35353" min="1" max="1" chance="1.884" /> <!-- Eternal Shoe Ingredient -->
-				<item id="35349" min="1" max="1" chance="1.875" /> <!-- Eternal Circlet Ingredient -->
-				<item id="35340" min="1" max="1" chance="1.867" /> <!-- Eternal Gaiter Ingredient -->
-				<item id="35347" min="1" max="1" chance="1.864" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="35350" min="1" max="1" chance="1.858" /> <!-- Eternal Tunic Ingredient -->
-				<item id="35354" min="1" max="1" chance="1.854" /> <!-- Eternal Sigil Ingredient -->
-				<item id="35341" min="1" max="1" chance="1.825" /> <!-- Eternal Gauntlet Ingredient -->
-				<item id="35328" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Fragment -->
-				<item id="35329" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Fragment -->
-				<item id="35327" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Fragment -->
-				<item id="35331" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Fragment -->
-				<item id="35337" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Fragment -->
-				<item id="35332" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Fragment -->
-				<item id="35333" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Fragment -->
-				<item id="35335" min="1" max="1" chance="0.75" /> <!-- Helios Buster Fragment -->
-				<item id="35334" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Fragment -->
-				<item id="35336" min="1" max="1" chance="0.75" /> <!-- Helios Caster Fragment -->
-				<item id="35330" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Fragment -->
-				<item id="35473" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Circlet (60%) -->
-				<item id="35472" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<item id="35471" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<item id="35470" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
-				<item id="35469" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<item id="35474" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Tunic (60%) -->
-				<item id="35475" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Stockings (60%) -->
-				<item id="35476" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gloves (60%) -->
-				<item id="35477" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<item id="35478" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Sigil (60%) -->
-				<item id="46476" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 3 -->
-				<item id="46491" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
-				<item id="46506" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 3 -->
-				<item id="35468" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
-				<item id="35467" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Shield (60%) -->
-				<item id="35466" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Boots (60%) -->
-				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="17527" min="1" max="1" chance="59.36" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17526" min="1" max="1" chance="41.71" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="19448" min="1" max="1" chance="2.978" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="19447" min="1" max="1" chance="1.958" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="35470" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
+				<item id="35469" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Armor (60%) -->
+				<item id="35468" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Helmet (60%) -->
+				<item id="35467" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Shield (60%) -->
+				<item id="35466" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Boots (60%) -->
+				<item id="35471" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
+				<item id="35472" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Leather Boots (60%) -->
+				<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="35465" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Gauntlets (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="35478" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Sigil (60%) -->
+				<item id="35462" min="1" max="1" chance="0.75" /> <!-- Recipe: Eternal Helmet (60%) -->
+				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
 				<item id="35451" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shaper (60%) -->
+				<item id="35452" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Cutter (60%) -->
+				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
 				<item id="35454" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Avenger (60%) -->
 				<item id="35455" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Fighter (60%) -->
-				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35457" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Thrower (60%) -->
 				<item id="35458" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Shooter (60%) -->
 				<item id="35459" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Buster (60%) -->
-				<item id="35465" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gauntlets (60%) -->
-				<item id="35464" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Gaiters (60%) -->
-				<item id="35463" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Breastplate (60%) -->
-				<item id="35462" min="1" max="1" chance="0.3" /> <!-- Recipe: Eternal Helmet (60%) -->
 				<item id="35460" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Caster (60%) -->
-				<item id="35453" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Slasher (60%) -->
-				<item id="35461" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Retributer (60%) -->
-				<item id="46493" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
-				<item id="46507" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 4 -->
-				<item id="46508" min="1" max="1" chance="0.075" /> <!-- Lionel's Soul Crystal - Stage 5 -->
-				<item id="46478" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 5 -->
-				<item id="46477" min="1" max="1" chance="0.075" /> <!-- Leona's Soul Crystal - Stage 4 -->
-				<item id="46492" min="1" max="1" chance="0.075" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
-				<item id="46446" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 3 -->
-				<item id="46447" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 4 -->
-				<item id="46462" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
-				<item id="46461" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
-				<item id="46448" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 5 -->
-				<item id="46495" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 7 -->
-				<item id="46494" min="1" max="1" chance="0.03" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
-				<item id="46509" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 6 -->
-				<item id="46510" min="1" max="1" chance="0.03" /> <!-- Lionel's Soul Crystal - Stage 7 -->
-				<item id="46480" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 7 -->
-				<item id="46479" min="1" max="1" chance="0.03" /> <!-- Leona's Soul Crystal - Stage 6 -->
-				<item id="46463" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
-				<item id="46464" min="1" max="1" chance="0.03" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
-				<item id="46449" min="1" max="1" chance="0.03" /> <!-- Kain's Soul Crystal - Stage 6 -->
-				<item id="46465" min="1" max="1" chance="0.0075" /> <!-- Mermoden's Soul Crystal - Stage 7 -->
-				<item id="46450" min="1" max="1" chance="0.0075" /> <!-- Kain's Soul Crystal - Stage 7 -->
-				<!-- FIXME: Also drops herbs. -->
-				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
-				<item id="8601" min="1" max="1" chance="8" /> <!-- Major Herb of Life -->
-				<item id="8602" min="1" max="1" chance="2" /> <!-- Superior Herb of Life -->
-				<item id="8603" min="1" max="1" chance="19.8" /> <!-- Herb of Mana -->
-				<item id="8604" min="1" max="1" chance="9.9" /> <!-- Major Herb of Mana -->
-				<item id="8605" min="1" max="1" chance="3.3" /> <!-- Superior Herb of Mana -->
-				<item id="34849" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Power -->
-				<item id="34850" min="1" max="1" chance="0.7" /> <!-- Mysterious Herb of Magic -->
-				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
+				<item id="35456" min="1" max="1" chance="0.3" /> <!-- Recipe: Helios Stormer (60%) -->
 			</drop>
-			<lucky>
-				<item id="39629" min="3" max="3" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky>
 		</dropLists>
 	</npc>
 	<npc id="26221" level="102" type="L2RaidBoss" name="Whitra" title="Guardian">