From b4442e45998eca74e56099f873f72e0beb85d35c Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 23 Oct 2019 13:09:04 +0000
Subject: [PATCH] Prelude related NPC and skill changes. Contributed by
 gamelike85.

---
 .../dist/game/data/stats/npcs/23400-23499.xml | 307 ++++----
 .../dist/game/data/stats/npcs/23500-23599.xml | 174 ++---
 .../dist/game/data/stats/npcs/26400-26499.xml | 671 +++++++++++++++---
 .../game/data/stats/skills/01900-01999.xml    |  76 +-
 .../game/data/stats/skills/30600-30699.xml    |  16 +-
 5 files changed, 803 insertions(+), 441 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23400-23499.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23400-23499.xml
index b853bb3096..8836f0f0e4 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23400-23499.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23400-23499.xml
@@ -3381,15 +3381,15 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
-		<acquire exp="20387947" sp="18343" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="206434.12617" hpRegen="8.5" mp="2874.995" mpRegen="3" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
 			</speed>
-			<attack physical="45027.439862948" magical="7933.4451512287" critical="4" attackSpeed="253" range="40" />
-			<defence physical="515.75551332479" magical="297.55916768147" />
 			<attribute>
 				<defence fire="250" water="250" wind="200" earth="250" holy="250" dark="250" />
 				<attack type="EARTH" value="330" />
@@ -3400,10 +3400,6 @@
 			<skill id="32862" level="1" />
 			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4410" level="17" /> <!-- Very Strong P. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4379" level="5" /> <!-- Spear Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="34" />
@@ -3411,43 +3407,35 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1203" max="2808" chance="20" /> <!-- Adena -->
-				<item id="36538" min="1" max="1" chance="0.3" /> <!-- Durable Leather Braid -->
-				<item id="35347" min="1" max="1" chance="0.075" /> <!-- Eternal Leather Glove Ingredient -->
-				<item id="36539" min="1" max="1" chance="0.03" /> <!-- Quality Leather Braid -->
-				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<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="57" min="819" max="1909" chance="70" /> <!-- Adena -->
+				<item id="36548" min="1" max="1" chance="0.075" /> <!-- Weapon Fragment (Mid-grade) -->
+				<item id="35327" min="1" max="1" chance="0.03" /> <!-- Helios Shaper Fragment -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="36554" min="1" max="1" chance="0.003" /> <!-- Armor Fragment (High-grade) -->
+				<item id="35451" min="1" max="1" chance="0.0009" /> <!-- Recipe: Helios Shaper (60%) -->
 			</drop>
 			<spoil>
-				<item id="36518" min="1" max="1" chance="7.194" /> <!-- Durable Leather -->
-				<item id="36519" min="1" max="1" chance="0.75" /> <!-- Quality Leather -->
+				<item id="36563" min="1" max="1" chance="0.3" /> <!-- Synthetic Cokes -->
+				<item id="36564" min="1" max="1" chance="0.03" /> <!-- Greater Synthetic Cokes -->
 			</spoil>
 		</dropLists>
 	</npc>
 	<npc id="23488" level="98" type="Monster" name="Magma Apophis">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
-		<acquire exp="37861753" sp="33998" />
+		<acquire exp="124943719" sp="112367" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="206434.12617" hpRegen="8.5" mp="2874.995" mpRegen="3" />
-			<speed>
-				<walk ground="25" />
-				<run ground="170" />
-			</speed>
-			<attack physical="45027.550797101" magical="7933.4451512287" critical="4" attackSpeed="253" range="40" />
-			<defence physical="515.49473544358" magical="297.50874247089" />
+			<attack physical="6326.484931" magical="1133.341541" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="515.3924972" magical="297.3358744" />
 			<attribute>
 				<defence fire="250" water="250" wind="200" earth="250" holy="250" dark="250" />
 				<attack type="EARTH" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="25" />
+				<run ground="170" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -3468,7 +3456,7 @@
 				<item id="36538" min="1" max="1" chance="0.3" /> <!-- Durable Leather Braid -->
 				<item id="35345" min="1" max="1" chance="0.03" /> <!-- Eternal Leather Armor Ingredient -->
 				<item id="36539" min="1" max="1" chance="0.03" /> <!-- Quality Leather Braid -->
-				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
 				<item id="35460" min="1" max="1" chance="0.0009" /> <!-- Recipe: Helios Caster (60%) -->
 				<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 -->
@@ -3481,7 +3469,7 @@
 				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
 			</drop>
 			<spoil>
-				<item id="36543" min="1" max="1" chance="2.623" /> <!-- Adamantite Wire -->
+				<item id="36543" min="1" max="1" chance="2.63" /> <!-- Adamantite Wire -->
 				<item id="36544" min="1" max="1" chance="0.3" /> <!-- Orichalcum Wire -->
 			</spoil>
 		</dropLists>
@@ -3554,28 +3542,25 @@
 		</parameters>
 		<race>DRAGON</race>
 		<sex>FEMALE</sex>
-		<acquire exp="18422873" sp="16518" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="206434.12617" hpRegen="8.5" mp="2874.995" mpRegen="3" />
-			<speed>
-				<walk ground="60" />
-				<run ground="70" />
-			</speed>
-			<attack physical="45027.442645077" magical="7933.4451512287" critical="4" attackSpeed="253" range="40" />
-			<defence physical="515.50802139037" magical="297.55916768147" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="250" wind="200" earth="250" holy="250" dark="250" />
 				<attack type="EARTH" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="60" />
+				<run ground="70" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="18217" level="1" />
 			<skill id="32862" level="1" />
 			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4410" level="16" /> <!-- Very Strong P. Atk. -->
-			<skill id="4379" level="4" /> <!-- Spear Resistance -->
-			<skill id="16547" level="8" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="38" />
@@ -3583,24 +3568,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1203" max="2808" chance="20" /> <!-- Adena -->
-				<item id="36543" min="1" max="1" chance="0.75" /> <!-- Adamantite Wire -->
-				<item id="17527" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36544" min="1" max="1" chance="0.075" /> <!-- Orichalcum Wire -->
-				<item id="35471" min="1" max="1" chance="0.003" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<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="57" min="819" max="1909" chance="70" /> <!-- Adena -->
+				<item id="36518" min="1" max="1" chance="1.11" /> <!-- Durable Leather -->
+				<item id="36519" min="1" max="1" chance="0.3" /> <!-- Quality Leather -->
+				<item id="35345" min="1" max="1" chance="0.03" /> <!-- Eternal Leather Armor Ingredient -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="35469" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Leather Armor (60%) -->
 			</drop>
 			<spoil>
-				<item id="36518" min="1" max="1" chance="7.276" /> <!-- Durable Leather -->
-				<item id="36539" min="1" max="1" chance="0.3" /> <!-- Quality Leather Braid -->
+				<item id="36523" min="1" max="1" chance="3.185" /> <!-- Adamantite -->
+				<item id="36524" min="1" max="1" chance="0.3" /> <!-- Orichalcum -->
 			</spoil>
 		</dropLists>
 	</npc>
@@ -3611,27 +3588,24 @@
 		</parameters>
 		<race>BEAST</race>
 		<sex>FEMALE</sex>
-		<acquire exp="18422873" sp="16518" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="206434.12617" hpRegen="8.5" mp="2874.995" mpRegen="3" />
-			<speed>
-				<walk ground="50" />
-				<run ground="70" />
-			</speed>
-			<attack physical="45027.442645077" magical="7933.4451512287" critical="4" attackSpeed="253" range="40" />
-			<defence physical="515.50802139037" magical="297.55916768147" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="250" wind="200" earth="250" holy="250" dark="250" />
 				<attack type="EARTH" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="50" />
+				<run ground="70" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="32862" level="1" />
-			<skill id="4416" level="3" /> <!-- Beast -->
+			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4410" level="16" /> <!-- Very Strong P. Atk. -->
-			<skill id="4379" level="4" /> <!-- Spear Resistance -->
-			<skill id="16547" level="8" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="26" />
@@ -3639,24 +3613,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1203" max="2808" chance="20" /> <!-- Adena -->
-				<item id="36543" min="1" max="1" chance="0.75" /> <!-- Adamantite Wire -->
-				<item id="17527" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="36544" min="1" max="1" chance="0.075" /> <!-- Orichalcum Wire -->
-				<item id="35472" min="1" max="1" chance="0.003" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<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="57" min="819" max="1909" chance="70" /> <!-- Adena -->
+				<item id="36518" min="1" max="1" chance="1.118" /> <!-- Durable Leather -->
+				<item id="36519" min="1" max="1" chance="0.3" /> <!-- Quality Leather -->
+				<item id="35346" min="1" max="1" chance="0.03" /> <!-- Eternal Leather Legging Ingredient -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="35470" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Leather Leggings (60%) -->
 			</drop>
 			<spoil>
-				<item id="36518" min="1" max="1" chance="7.148" /> <!-- Durable Leather -->
-				<item id="36539" min="1" max="1" chance="0.3" /> <!-- Quality Leather Braid -->
+				<item id="36523" min="1" max="1" chance="3.163" /> <!-- Adamantite -->
+				<item id="36524" min="1" max="1" chance="0.3" /> <!-- Orichalcum -->
 			</spoil>
 		</dropLists>
 	</npc>
@@ -3767,15 +3733,15 @@
 		</parameters>
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
-		<acquire exp="20807523" sp="18719" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<speed>
 				<walk ground="39" />
 				<run ground="170" />
 			</speed>
-			<attack physical="47220.35912147" magical="8305.0410766139" critical="4" attackSpeed="253" range="40" />
-			<defence physical="525.76050641815" magical="305.10497858296" />
 			<attribute>
 				<defence fire="250" water="200" wind="250" earth="250" holy="250" dark="250" />
 				<attack type="FIRE" value="330" />
@@ -3785,10 +3751,6 @@
 			<skill id="32862" level="1" />
 			<skill id="4416" level="7" /> <!-- Spirits -->
 			<skill id="5462" level="1" /> <!-- Fire Attack -->
-			<skill id="4410" level="17" /> <!-- Very Strong P. Atk. -->
-			<skill id="4412" level="13" /> <!-- Slightly Strong P. Def. -->
-			<skill id="4379" level="5" /> <!-- Spear Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="20" />
@@ -3796,24 +3758,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1239" max="2893" chance="20" /> <!-- Adena -->
-				<item id="36538" min="1" max="1" chance="0.3" /> <!-- Durable Leather Braid -->
-				<item id="35348" min="1" max="1" chance="0.075" /> <!-- Eternal Leather Boot Ingredient -->
-				<item id="36539" min="1" max="1" chance="0.03" /> <!-- Quality Leather Braid -->
-				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<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="57" min="828" max="1929" chance="70" /> <!-- Adena -->
+				<item id="36548" min="1" max="1" chance="0.075" /> <!-- Weapon Fragment (Mid-grade) -->
+				<item id="35333" min="1" max="1" chance="0.03" /> <!-- Helios Thrower Fragment -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="36554" min="1" max="1" chance="0.003" /> <!-- Armor Fragment (High-grade) -->
+				<item id="35457" min="1" max="1" chance="0.0009" /> <!-- Recipe: Helios Thrower (60%) -->
 			</drop>
 			<spoil>
-				<item id="36538" min="1" max="1" chance="1.872" /> <!-- Durable Leather Braid -->
-				<item id="36539" min="1" max="1" chance="0.3" /> <!-- Quality Leather Braid -->
+				<item id="36563" min="1" max="1" chance="0.3" /> <!-- Synthetic Cokes -->
+				<item id="36564" min="1" max="1" chance="0.03" /> <!-- Greater Synthetic Cokes -->
 			</spoil>
 		</dropLists>
 	</npc>
@@ -3824,15 +3778,15 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
-		<acquire exp="19266119" sp="17249" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<speed>
 				<walk ground="80" />
 				<run ground="170" />
 			</speed>
-			<attack physical="47220.557386874" magical="8304.9089563844" critical="4" attackSpeed="253" range="40" />
-			<defence physical="526.06382978723" magical="305.10497858296" />
 			<attribute>
 				<defence fire="250" water="200" wind="250" earth="250" holy="250" dark="250" />
 				<attack type="FIRE" value="330" />
@@ -3842,9 +3796,6 @@
 			<skill id="32872" level="1" />
 			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="5462" level="1" /> <!-- Fire Attack -->
-			<skill id="4411" level="17" /> <!-- Very Strong M. Atk. -->
-			<skill id="4379" level="5" /> <!-- Spear Resistance -->
-			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="20" />
@@ -3852,43 +3803,35 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1239" max="2893" chance="20" /> <!-- Adena -->
-				<item id="36538" min="1" max="1" chance="0.3" /> <!-- Durable Leather Braid -->
-				<item id="35353" min="1" max="1" chance="0.075" /> <!-- Eternal Shoe Ingredient -->
-				<item id="36539" min="1" max="1" chance="0.03" /> <!-- Quality Leather Braid -->
-				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant Weapon (R-grade) -->
-				<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="57" min="828" max="1929" chance="70" /> <!-- Adena -->
+				<item id="35331" min="1" max="1" chance="0.03" /> <!-- Helios Fighter Fragment -->
+				<item id="36553" min="1" max="1" chance="0.03" /> <!-- Armor Fragment (Mid-grade) -->
+				<item id="36549" min="1" max="1" chance="0.0075" /> <!-- Weapon Fragment (High-grade) -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="35455" min="1" max="1" chance="0.0009" /> <!-- Recipe: Helios Fighter (60%) -->
 			</drop>
 			<spoil>
-				<item id="36538" min="1" max="1" chance="1.873" /> <!-- Durable Leather Braid -->
-				<item id="36539" min="1" max="1" chance="0.3" /> <!-- Quality Leather Braid -->
+				<item id="36563" min="1" max="1" chance="0.3" /> <!-- Synthetic Cokes -->
+				<item id="36564" min="1" max="1" chance="0.03" /> <!-- Greater Synthetic Cokes -->
 			</spoil>
 		</dropLists>
 	</npc>
 	<npc id="23496" level="99" type="Monster" name="Magma Ifrit">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="38640638" sp="34695" />
+		<acquire exp="127514049" sp="114672" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="39" />
-				<run ground="170" />
-			</speed>
-			<attack physical="47220.376818161" magical="8305.0410766139" critical="4" attackSpeed="253" range="40" />
-			<defence physical="525.96801903" magical="304.86727805858" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="200" wind="250" earth="250" holy="250" dark="250" />
 				<attack type="FIRE" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="39" />
+				<run ground="170" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -3910,7 +3853,7 @@
 				<item id="35328" min="1" max="1" chance="0.03" /> <!-- Helios Cutter Fragment -->
 				<item id="35345" min="1" max="1" chance="0.03" /> <!-- Eternal Leather Armor Ingredient -->
 				<item id="36539" min="1" max="1" chance="0.03" /> <!-- Quality Leather Braid -->
-				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
 				<item id="35452" min="1" max="1" chance="0.0009" /> <!-- Recipe: Helios Cutter (60%) -->
 				<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 -->
@@ -3923,7 +3866,7 @@
 				<item id="13028" min="1" max="1" chance="0.1" /> <!-- Vitality Replenishing Herb -->
 			</drop>
 			<spoil>
-				<item id="36543" min="1" max="1" chance="2.663" /> <!-- Adamantite Wire -->
+				<item id="36543" min="1" max="1" chance="2.602" /> <!-- Adamantite Wire -->
 				<item id="36544" min="1" max="1" chance="0.3" /> <!-- Orichalcum Wire -->
 			</spoil>
 		</dropLists>
@@ -3931,19 +3874,19 @@
 	<npc id="23497" level="99" type="Monster" name="Blazing Saurus" title="Fire Stigma">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<acquire exp="44585435" sp="40086" />
+		<acquire exp="147131926" sp="132412" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="1" />
-				<run ground="1" />
-			</speed>
-			<attack physical="47220.557386874" magical="8304.8858064068" critical="4" attackSpeed="253" range="40" />
-			<defence physical="525.96801903" magical="304.86727805858" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="200" wind="250" earth="250" holy="250" dark="250" />
 				<attack type="FIRE" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="4416" level="2" /> <!-- Magic Creatures -->
@@ -3965,7 +3908,7 @@
 				<item id="35332" min="1" max="1" chance="0.075" /> <!-- Helios Stormer Fragment -->
 				<item id="36539" min="1" max="1" chance="0.03" /> <!-- Quality Leather Braid -->
 				<item id="36549" min="1" max="1" chance="0.0075" /> <!-- Weapon Fragment (High-grade) -->
-				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
 				<item id="35456" min="1" max="1" chance="0.0009" /> <!-- Recipe: Helios Stormer (60%) -->
 				<item id="35471" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
 				<item id="8600" min="1" max="1" chance="10" /> <!-- Herb of Life -->
@@ -3987,19 +3930,19 @@
 	<npc id="23498" level="99" type="Monster" name="Blazing Wizard" title="Fire Stigma">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
-		<acquire exp="44585435" sp="40086" />
+		<acquire exp="147131926" sp="132412" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="45" />
-				<run ground="170" />
-			</speed>
-			<attack physical="47220.557386874" magical="8304.8858064068" critical="4" attackSpeed="253" range="40" />
-			<defence physical="525.96801903" magical="304.86727805858" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="200" wind="250" earth="250" holy="250" dark="250" />
 				<attack type="FIRE" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="45" />
+				<run ground="170" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
@@ -4019,7 +3962,7 @@
 				<item id="57" min="3099" max="7232" chance="20" /> <!-- Adena -->
 				<item id="36543" min="1" max="1" chance="0.3" /> <!-- Adamantite Wire -->
 				<item id="35335" min="1" max="1" chance="0.075" /> <!-- Helios Buster Fragment -->
-				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant R-grade Armor -->
 				<item id="36544" min="1" max="1" chance="0.03" /> <!-- Orichalcum Wire -->
 				<item id="36554" min="1" max="1" chance="0.0075" /> <!-- Armor Fragment (High-grade) -->
 				<item id="35459" min="1" max="1" chance="0.0009" /> <!-- Recipe: Helios Buster (60%) -->
@@ -4047,27 +3990,24 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
-		<acquire exp="18801846" sp="16857" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="130" />
-				<run ground="70" />
-			</speed>
-			<attack physical="47220.368807127" magical="8305.0410766139" critical="4" attackSpeed="253" range="40" />
-			<defence physical="526.06382978723" magical="305.10497858296" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="250" wind="200" earth="250" holy="250" dark="250" />
 				<attack type="EARTH" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="130" />
+				<run ground="70" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="32827" level="1" />
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4410" level="16" /> <!-- Very Strong P. Atk. -->
-			<skill id="4379" level="4" /> <!-- Spear Resistance -->
-			<skill id="16547" level="8" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="15" />
@@ -4075,25 +4015,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1239" max="2893" chance="20" /> <!-- Adena -->
-				<item id="36543" min="1" max="1" chance="0.3" /> <!-- Adamantite Wire -->
-				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="35336" min="1" max="1" chance="0.03" /> <!-- Helios Caster Fragment -->
-				<item id="36544" min="1" max="1" chance="0.03" /> <!-- Orichalcum Wire -->
-				<item id="35477" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<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="57" min="828" max="1929" chance="70" /> <!-- Adena -->
+				<item id="36528" min="1" max="1" chance="1.193" /> <!-- Metallic Fiber -->
+				<item id="36529" min="1" max="1" chance="0.3" /> <!-- Quality Fiber -->
+				<item id="35349" min="1" max="1" chance="0.03" /> <!-- Eternal Circlet Ingredient -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="35473" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Circlet (60%) -->
 			</drop>
 			<spoil>
-				<item id="36518" min="1" max="1" chance="7.492" /> <!-- Durable Leather -->
-				<item id="36539" min="1" max="1" chance="0.3" /> <!-- Quality Leather Braid -->
+				<item id="36523" min="1" max="1" chance="3.239" /> <!-- Adamantite -->
+				<item id="36524" min="1" max="1" chance="0.3" /> <!-- Orichalcum -->
 			</spoil>
 		</dropLists>
 	</npc>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23500-23599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23500-23599.xml
index e6d0274fd4..9260d89550 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23500-23599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/23500-23599.xml
@@ -7,27 +7,24 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
-		<acquire exp="18801846" sp="16857" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="80" />
-				<run ground="70" />
-			</speed>
-			<attack physical="47220.368807127" magical="8305.0410766139" critical="4" attackSpeed="253" range="40" />
-			<defence physical="526.06382978723" magical="305.10497858296" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="200" wind="250" earth="250" holy="250" dark="250" />
 				<attack type="FIRE" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="80" />
+				<run ground="70" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="32852" level="1" />
 			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="5462" level="1" /> <!-- Fire Attack -->
-			<skill id="4410" level="16" /> <!-- Very Strong P. Atk. -->
-			<skill id="4379" level="4" /> <!-- Spear Resistance -->
-			<skill id="16547" level="8" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="20" />
@@ -35,25 +32,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1239" max="2893" chance="20" /> <!-- Adena -->
-				<item id="36543" min="1" max="1" chance="0.3" /> <!-- Adamantite Wire -->
-				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="35328" min="1" max="1" chance="0.03" /> <!-- Helios Cutter Fragment -->
-				<item id="36544" min="1" max="1" chance="0.03" /> <!-- Orichalcum Wire -->
-				<item id="35469" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Leather Armor (60%) -->
-				<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="57" min="828" max="1929" chance="70" /> <!-- Adena -->
+				<item id="36528" min="1" max="1" chance="1.14" /> <!-- Metallic Fiber -->
+				<item id="36529" min="1" max="1" chance="0.3" /> <!-- Quality Fiber -->
+				<item id="35350" min="1" max="1" chance="0.03" /> <!-- Eternal Tunic Ingredient -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="35474" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Tunic (60%) -->
 			</drop>
 			<spoil>
-				<item id="36543" min="1" max="1" chance="1.382" /> <!-- Adamantite Wire -->
-				<item id="36519" min="1" max="1" chance="0.75" /> <!-- Quality Leather -->
+				<item id="36523" min="1" max="1" chance="3.243" /> <!-- Adamantite -->
+				<item id="36524" min="1" max="1" chance="0.3" /> <!-- Orichalcum -->
 			</spoil>
 		</dropLists>
 	</npc>
@@ -66,29 +54,26 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="17475183" sp="15681" />
 		<equipment rhand="38559" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="31" />
-				<run ground="170" />
-			</speed>
-			<attack physical="47220.557386874" magical="8304.9567060447" critical="4" attackSpeed="253" range="40" />
-			<defence physical="526.06382978723" magical="305.10497858296" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="250" wind="200" earth="250" holy="250" dark="250" />
 				<attack type="EARTH" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="31" />
+				<run ground="170" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="18217" level="5" />
 			<skill id="32854" level="1" />
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4411" level="13" /> <!-- Slightly Strong M. Atk. -->
-			<skill id="4379" level="4" /> <!-- Spear Resistance -->
-			<skill id="16547" level="8" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="23" />
@@ -96,25 +81,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1239" max="2893" chance="20" /> <!-- Adena -->
-				<item id="36543" min="1" max="1" chance="0.3" /> <!-- Adamantite Wire -->
-				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="35332" min="1" max="1" chance="0.03" /> <!-- Helios Stormer Fragment -->
-				<item id="36544" min="1" max="1" chance="0.03" /> <!-- Orichalcum Wire -->
-				<item id="35471" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Leather Gloves (60%) -->
-				<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="57" min="828" max="1929" chance="70" /> <!-- Adena -->
+				<item id="36528" min="1" max="1" chance="1.213" /> <!-- Metallic Fiber -->
+				<item id="36529" min="1" max="1" chance="0.3" /> <!-- Quality Fiber -->
+				<item id="35351" min="1" max="1" chance="0.03" /> <!-- Eternal Stocking Ingredient -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="35475" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Stockings (60%) -->
 			</drop>
 			<spoil>
-				<item id="36538" min="1" max="1" chance="1.887" /> <!-- Durable Leather Braid -->
-				<item id="36544" min="1" max="1" chance="0.3" /> <!-- Orichalcum Wire -->
+				<item id="36523" min="1" max="1" chance="3.24" /> <!-- Adamantite -->
+				<item id="36524" min="1" max="1" chance="0.3" /> <!-- Orichalcum -->
 			</spoil>
 		</dropLists>
 	</npc>
@@ -125,27 +101,24 @@
 		</parameters>
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
-		<acquire exp="18801846" sp="16857" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="39" />
-				<run ground="70" />
-			</speed>
-			<attack physical="47220.368807127" magical="8305.0410766139" critical="4" attackSpeed="253" range="40" />
-			<defence physical="526.06382978723" magical="305.10497858296" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="250" wind="200" earth="250" holy="250" dark="250" />
 				<attack type="EARTH" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="39" />
+				<run ground="70" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="32849" level="1" />
 			<skill id="4416" level="7" /> <!-- Spirits -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
-			<skill id="4410" level="16" /> <!-- Very Strong P. Atk. -->
-			<skill id="4379" level="4" /> <!-- Spear Resistance -->
-			<skill id="16547" level="8" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="20" />
@@ -153,25 +126,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1239" max="2893" chance="20" /> <!-- Adena -->
-				<item id="36543" min="1" max="1" chance="0.3" /> <!-- Adamantite Wire -->
-				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="35335" min="1" max="1" chance="0.03" /> <!-- Helios Buster Fragment -->
-				<item id="36544" min="1" max="1" chance="0.03" /> <!-- Orichalcum Wire -->
-				<item id="35472" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Leather Boots (60%) -->
-				<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="57" min="828" max="1929" chance="70" /> <!-- Adena -->
+				<item id="36533" min="1" max="1" chance="0.3" /> <!-- Synthetic Braid -->
+				<item id="35352" min="1" max="1" chance="0.075" /> <!-- Eternal Glove Ingredient -->
+				<item id="36534" min="1" max="1" chance="0.03" /> <!-- Durable Braid -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
+				<item id="35476" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Gloves (60%) -->
 			</drop>
 			<spoil>
-				<item id="36518" min="1" max="1" chance="7.446" /> <!-- Durable Leather -->
-				<item id="36539" min="1" max="1" chance="0.3" /> <!-- Quality Leather Braid -->
+				<item id="36523" min="1" max="1" chance="3.254" /> <!-- Adamantite -->
+				<item id="36524" min="1" max="1" chance="0.3" /> <!-- Orichalcum -->
 			</spoil>
 		</dropLists>
 	</npc>
@@ -182,27 +146,24 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
-		<acquire exp="18801846" sp="16857" />
+		<acquire exp="225805239" sp="203175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="207482.075985" hpRegen="8.5" mp="2922.844" mpRegen="3" />
-			<speed>
-				<walk ground="70" />
-				<run ground="70" />
-			</speed>
-			<attack physical="47220.557386874" magical="8304.9017930433" critical="4" attackSpeed="253" range="40" />
-			<defence physical="526.06382978723" magical="305.10497858296" />
+			<vitals hp="83637.246975" hpRegen="8.5" mp="2922.844" mpRegen="3" />
+			<attack physical="6745.743697" magical="1186.412163" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="525.7003472" magical="304.7692712" />
 			<attribute>
 				<defence fire="250" water="200" wind="250" earth="250" holy="250" dark="250" />
 				<attack type="FIRE" value="330" />
 			</attribute>
+			<speed>
+				<walk ground="70" />
+				<run ground="70" />
+			</speed>
 		</stats>
 		<skillList>
 			<skill id="32854" level="1" />
 			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="5462" level="1" /> <!-- Fire Attack -->
-			<skill id="4411" level="16" /> <!-- Very Strong M. Atk. -->
-			<skill id="4379" level="4" /> <!-- Spear Resistance -->
-			<skill id="16547" level="8" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 		<collision>
 			<radius normal="17" />
@@ -210,25 +171,16 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="57" min="1239" max="2893" chance="20" /> <!-- Adena -->
-				<item id="36543" min="1" max="1" chance="0.3" /> <!-- Adamantite Wire -->
-				<item id="17527" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Armor (R-grade) -->
-				<item id="35336" min="1" max="1" chance="0.03" /> <!-- Helios Caster Fragment -->
-				<item id="36544" min="1" max="1" chance="0.03" /> <!-- Orichalcum Wire -->
+				<item id="57" min="828" max="1929" chance="70" /> <!-- Adena -->
+				<item id="36533" min="1" max="1" chance="0.3" /> <!-- Synthetic Braid -->
+				<item id="35353" min="1" max="1" chance="0.075" /> <!-- Eternal Shoe Ingredient -->
+				<item id="36534" min="1" max="1" chance="0.03" /> <!-- Durable Braid -->
+				<item id="17526" min="1" max="1" chance="0.003" /> <!-- Scroll: Enchant R-grade Weapon -->
 				<item id="35477" min="1" max="1" chance="0.0009" /> <!-- Recipe: Eternal Shoes (60%) -->
-				<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="36543" min="1" max="1" chance="1.391" /> <!-- Adamantite Wire -->
-				<item id="36519" min="1" max="1" chance="0.75" /> <!-- Quality Leather -->
+				<item id="36523" min="1" max="1" chance="3.211" /> <!-- Adamantite -->
+				<item id="36524" min="1" max="1" chance="0.3" /> <!-- Orichalcum -->
 			</spoil>
 		</dropLists>
 	</npc>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26400-26499.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26400-26499.xml
index f8e9c8880f..8763879d06 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26400-26499.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26400-26499.xml
@@ -605,195 +605,684 @@
 			<height normal="120.75" />
 		</collision>
 	</npc>
-	<npc id="26431" level="85" type="Npc" name="Avenger Alusion" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26431" level="106" type="RaidBoss" name="Avenger Alusion">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="3332257463808" sp="2999031659" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="240004230.66992" hpRegen="453.2459686" mp="86023.581" mpRegen="3.3" />
+			<attack physical="306855.9531" magical="220061.8201" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="35576.70557" magical="17365.14602" />
 			<speed>
 				<walk ground="60" />
 				<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="34" />
 			<height normal="92.2" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="90.52" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="39738" min="1" max="1" chance="50.15" /> <!-- Rune Stone -->
+				<item id="45931" min="3" max="3" chance="50.04" /> <!-- High-grade Spirit Stone -->
+				<item id="48620" min="1" max="1" chance="34.22" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="34.04" /> <!-- R99 Robe Crafting Pack -->
+				<item id="48621" min="1" max="1" chance="32.75" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="46489" min="1" max="1" chance="10.45" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46504" min="1" max="1" chance="10.37" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46474" min="1" max="1" chance="10.28" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.567" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.441" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46475" min="1" max="1" chance="7.265" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46505" min="1" max="1" chance="7.217" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.178" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.553" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.503" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46476" min="1" max="1" chance="3.487" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46506" min="1" max="1" chance="3.47" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.385" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.359" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.347" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="38043" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="38046" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="38049" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="0.75" /> <!-- Helios Buster Crafting Pack -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="38052" min="1" max="1" chance="0.75" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26432" level="85" type="Npc" name="Avenger Graff" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26432" level="106" type="RaidBoss" name="Avenger Graff">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="3332257463808" sp="2999031659" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="240004230.66992" hpRegen="453.2459686" mp="86023.581" mpRegen="3.3" />
+			<attack physical="306855.9531" magical="220061.8201" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="35576.70557" magical="17365.14602" />
 			<speed>
 				<walk ground="60" />
 				<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="34" />
 			<height normal="85.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="91.325" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="45931" min="3" max="3" chance="51.25" /> <!-- High-grade Spirit Stone -->
+				<item id="39738" min="1" max="1" chance="50.73" /> <!-- Rune Stone -->
+				<item id="48621" min="1" max="1" chance="35.52" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="33.65" /> <!-- R99 Robe Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="31.88" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="46474" min="1" max="1" chance="11.16" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46489" min="1" max="1" chance="11.01" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46504" min="1" max="1" chance="10.49" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.535" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.489" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.255" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.174" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.171" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.509" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.432" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46491" min="1" max="1" chance="3.455" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46476" min="1" max="1" chance="3.455" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46506" min="1" max="1" chance="3.426" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.2795" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.2795" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="38046" min="1" max="1" chance="0.75" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="38045" min="1" max="1" chance="0.75" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="0.75" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="0.75" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="0.75" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="0.75" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="38049" min="1" max="1" chance="0.75" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="0.75" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="0.75" /> <!-- Helios Buster Crafting Pack -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="38052" min="1" max="1" chance="0.75" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="0.75" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26433" level="85" type="Npc" name="Demon Venoma" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="8203" lhand="8203" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26433" level="116" type="RaidBoss" name="Demon Venoma">
+		<race>DEMONIC</race>
+		<sex>MALE</sex>
+		<acquire exp="4583834285184" sp="4125450760" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="147352470.80583" hpRegen="543.0227337" mp="98179.66" mpRegen="3.6" />
+			<attack physical="367636.4933" magical="263650.599" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="42623.567" magical="20804.75" />
 			<speed>
 				<walk ground="79" />
 				<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="20" />
 			<height normal="56" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="72.76" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="39738" min="1" max="1" chance="51.04" /> <!-- Rune Stone -->
+				<item id="45931" min="3" max="3" chance="50.86" /> <!-- High-grade Spirit Stone -->
+				<item id="48622" min="1" max="1" chance="33.92" /> <!-- R99 Robe Crafting Pack -->
+				<item id="48621" min="1" max="1" chance="32.63" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="32.21" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="46489" min="1" max="1" chance="11.16" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46504" min="1" max="1" chance="10.81" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46474" min="1" max="1" chance="10.8" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.518" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.456" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.188" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.17" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.166" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.512" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.489" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46506" min="1" max="1" chance="3.455" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.439" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46476" min="1" max="1" chance="3.408" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="38048" min="1" max="1" chance="2.453" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="2.452" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="2.425" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="2.402" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38049" min="1" max="1" chance="2.394" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="2.39" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="2.38" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="2.377" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38046" min="1" max="1" chance="2.37" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="46461" min="1" max="1" chance="2.359" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="38052" min="1" max="1" chance="2.364" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="2.343" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="46446" min="1" max="1" chance="2.307" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26434" level="85" type="Npc" name="Fiend Sarboth" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26434" level="116" type="RaidBoss" name="Fiend Sarboth">
+		<race>DEMONIC</race>
+		<sex>MALE</sex>
+		<acquire exp="4583834285184" sp="4125450760" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="147352470.80583" hpRegen="543.0227337" mp="98179.66" mpRegen="3.6" />
+			<attack physical="367636.4933" magical="263650.599" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="42623.567" magical="20804.75" />
 			<speed>
 				<walk ground="45" />
 				<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="25" />
 			<height normal="68" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="74.96" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="45931" min="3" max="3" chance="50.73" /> <!-- High-grade Spirit Stone -->
+				<item id="39738" min="1" max="1" chance="50.71" /> <!-- Rune Stone -->
+				<item id="48621" min="1" max="1" chance="34.88" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="34.4" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="33.85" /> <!-- R99 Robe Crafting Pack -->
+				<item id="46474" min="1" max="1" chance="11.34" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46504" min="1" max="1" chance="10.95" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46489" min="1" max="1" chance="10.32" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.513" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.513" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.25" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.247" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.145" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.57" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.496" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46476" min="1" max="1" chance="3.485" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.457" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46506" min="1" max="1" chance="3.394" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="38049" min="1" max="1" chance="2.437" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="2.422" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="2.416" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="2.398" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="2.383" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="2.381" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="2.38" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="2.361" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="2.359" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="46461" min="1" max="1" chance="2.343" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="38046" min="1" max="1" chance="2.351" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38052" min="1" max="1" chance="2.344" /> <!-- Helios Caster Crafting Pack -->
+				<item id="46446" min="1" max="1" chance="2.3035" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26435" level="85" type="Npc" name="Watcher Tristan" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26435" level="108" type="RaidBoss" name="Watcher Tristan">
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="3557421649152" sp="3201679471" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="217701032.10752" hpRegen="470.5528213" mp="88542.547" mpRegen="3.3" />
+			<attack physical="318573.0144" magical="228464.7134" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="36935.17502" magical="18028.22092" />
 			<speed>
 				<walk ground="70" />
 				<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="36" />
 			<height normal="71.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5463" level="1" /> <!-- Water Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="83.35" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="39738" min="1" max="1" chance="49.77" /> <!-- Rune Stone -->
+				<item id="45931" min="3" max="3" chance="49.06" /> <!-- High-grade Spirit Stone -->
+				<item id="48621" min="1" max="1" chance="33.91" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="31.75" /> <!-- R99 Robe Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="31.63" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="46489" min="1" max="1" chance="11.24" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46474" min="1" max="1" chance="11.2" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46504" min="1" max="1" chance="10.38" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.532" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.47" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.225" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.194" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.136" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.509" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.434" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46476" min="1" max="1" chance="3.412" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.391" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46506" min="1" max="1" chance="3.382" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.3875" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.3825" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="38048" min="1" max="1" chance="1.17" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="1.15" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="1.148" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="38049" min="1" max="1" chance="1.145" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="1.135" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="1.101" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="1.096" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="1.091" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="1.061" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38046" min="1" max="1" chance="1.056" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38052" min="1" max="1" chance="1.035" /> <!-- Helios Caster Crafting Pack -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26436" level="85" type="Npc" name="Watcher Setheth" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26436" level="108" type="RaidBoss" name="Watcher Setheth">
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="3557421649152" sp="3201679471" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="217701032.10752" hpRegen="470.5528213" mp="88542.547" mpRegen="3.3" />
+			<attack physical="318573.0144" magical="228464.7134" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="36935.17502" magical="18028.22092" />
 			<speed>
 				<walk ground="60" />
 				<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="25.5" />
 			<height normal="67.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5463" level="1" /> <!-- Water Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="80.03" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="45931" min="3" max="3" chance="50.83" /> <!-- High-grade Spirit Stone -->
+				<item id="39738" min="1" max="1" chance="49.43" /> <!-- Rune Stone -->
+				<item id="48621" min="1" max="1" chance="35.63" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="32.54" /> <!-- R99 Robe Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="31.37" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="46504" min="1" max="1" chance="11.33" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46474" min="1" max="1" chance="11.06" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46489" min="1" max="1" chance="10.45" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.519" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.493" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.203" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.158" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.134" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.527" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.472" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46506" min="1" max="1" chance="3.456" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.448" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46476" min="1" max="1" chance="3.415" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.359" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.2665" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="38053" min="1" max="1" chance="1.16" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="1.159" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38052" min="1" max="1" chance="1.131" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="1.12" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="1.116" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="1.11" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38049" min="1" max="1" chance="1.092" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="1.085" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="1.079" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38046" min="1" max="1" chance="1.04" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="1.038" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26437" level="85" type="Npc" name="Berserker Zetahl" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26437" level="114" type="RaidBoss" name="Berserker Zetahl">
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="4308330575808" sp="3877497477" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="162454985.36911" hpRegen="524.4188804" mp="95735.306" mpRegen="3.6" />
+			<attack physical="355041.3385" magical="254617.9807" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="41163.29188" magical="20091.98331" />
 			<speed>
 				<walk ground="50" />
 				<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="30" />
 			<height normal="40.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoid -->
+			<skill id="5462" level="1" /> <!-- Fire Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="78.675" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="45931" min="3" max="3" chance="50.03" /> <!-- High-grade Spirit Stone -->
+				<item id="39738" min="1" max="1" chance="48.93" /> <!-- Rune Stone -->
+				<item id="48622" min="1" max="1" chance="34.29" /> <!-- R99 Robe Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="33.41" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="48621" min="1" max="1" chance="32.37" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="46489" min="1" max="1" chance="10.77" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46474" min="1" max="1" chance="10.68" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46504" min="1" max="1" chance="10.38" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.531" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.439" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.196" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.173" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.17" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.458" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.439" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46506" min="1" max="1" chance="3.5" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.45" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46476" min="1" max="1" chance="3.433" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.375" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.2955" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="38049" min="1" max="1" chance="2.168" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="2.156" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38046" min="1" max="1" chance="2.152" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="2.151" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="2.146" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="2.137" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="2.12" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38052" min="1" max="1" chance="2.118" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="2.104" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="2.101" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="2.09" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26438" level="85" type="Npc" name="Berserker Tabris" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26438" level="114" type="RaidBoss" name="Berserker Tabris">
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="4308330575808" sp="3877497477" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="162454985.36911" hpRegen="524.4188804" mp="95735.306" mpRegen="3.6" />
+			<attack physical="355041.3385" magical="254617.9807" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="41163.29188" magical="20091.98331" />
 			<speed>
 				<walk ground="50" />
 				<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="28" />
 			<height normal="54.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoid -->
+			<skill id="5462" level="1" /> <!-- Fire Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="77.75" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="45931" min="3" max="3" chance="50.92" /> <!-- High-grade Spirit Stone -->
+				<item id="39738" min="1" max="1" chance="49.84" /> <!-- Rune Stone -->
+				<item id="48621" min="1" max="1" chance="34.87" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="32.87" /> <!-- R99 Robe Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="31.42" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="46474" min="1" max="1" chance="11.15" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46504" min="1" max="1" chance="11.02" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46489" min="1" max="1" chance="10.34" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.458" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.447" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46475" min="1" max="1" chance="7.235" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46505" min="1" max="1" chance="7.219" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.179" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.55" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.485" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46506" min="1" max="1" chance="3.439" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.419" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46476" min="1" max="1" chance="3.409" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.331" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.2875" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="38045" min="1" max="1" chance="2.143" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="38046" min="1" max="1" chance="2.141" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="2.12" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38052" min="1" max="1" chance="2.089" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="2.084" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38049" min="1" max="1" chance="2.08" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="2.078" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="2.068" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="2.051" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="2.037" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="2.03" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26439" level="85" type="Npc" name="Ferocious Valac" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26439" level="112" type="RaidBoss" name="Ferocious Valac">
+		<race>DEMONIC</race>
+		<sex>MALE</sex>
+		<acquire exp="4044498296832" sp="3640048402" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="179115608.24732" hpRegen="506.1392772" mp="93288.519" mpRegen="3.6" />
+			<attack physical="342665.7071" magical="245742.7937" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="39728.46818" magical="19391.63956" />
 			<speed>
 				<walk ground="34" />
 				<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="54" />
 			<height normal="77.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="74.82" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="45931" min="3" max="3" chance="51.09" /> <!-- High-grade Spirit Stone -->
+				<item id="39738" min="1" max="1" chance="49.14" /> <!-- Rune Stone -->
+				<item id="48621" min="1" max="1" chance="35.12" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="34.04" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="32.73" /> <!-- R99 Robe Crafting Pack -->
+				<item id="46504" min="1" max="1" chance="11.31" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46489" min="1" max="1" chance="10.68" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46474" min="1" max="1" chance="10.28" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.557" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.466" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.269" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.25" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.167" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.529" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.529" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46476" min="1" max="1" chance="3.479" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46506" min="1" max="1" chance="3.435" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.412" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.367" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.2795" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="38046" min="1" max="1" chance="1.863" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="1.838" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38052" min="1" max="1" chance="1.823" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="1.809" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="1.778" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="1.777" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="1.77" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="1.768" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="1.761" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38049" min="1" max="1" chance="1.76" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="1.751" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="26440" level="85" type="Npc" name="Arrogant Lebruum" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="26440" level="112" type="RaidBoss" name="Arrogant Lebruum">
+		<race>DEMONIC</race>
+		<sex>MALE</sex>
+		<acquire exp="4044498296832" sp="3640048402" raidPoints="0" />
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="179115608.24732" hpRegen="506.1392772" mp="93288.519" mpRegen="3.6" />
+			<attack physical="342665.7071" magical="245742.7937" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="39728.46818" magical="19391.63956" />
 			<speed>
 				<walk ground="60" />
 				<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="40" />
 			<height normal="84.197" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="5467" level="1" /> <!-- Dark Attack -->
+			<skill id="32910" level="1" /> <!-- Rule of Looting -->
+			<skill id="32675" level="1" /> <!-- Status Effect Resistance -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Attack Resistance -->
+			<skill id="32908" level="1" /> <!-- Critical Atk. Shield -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="19447" min="1" max="1" chance="74.72" /> <!-- Blessed Scroll: Enchant R-grade Weapon -->
+				<item id="39738" min="1" max="1" chance="49.63" /> <!-- Rune Stone -->
+				<item id="45931" min="3" max="3" chance="49.08" /> <!-- High-grade Spirit Stone -->
+				<item id="48621" min="1" max="1" chance="34.66" /> <!-- R99 Light Armor Crafting Pack -->
+				<item id="48620" min="1" max="1" chance="31.93" /> <!-- R99 Heavy Armor Crafting Pack -->
+				<item id="48622" min="1" max="1" chance="31.6" /> <!-- R99 Robe Crafting Pack -->
+				<item id="46504" min="1" max="1" chance="10.43" /> <!-- Lionel's Soul Crystal Lv. 1 -->
+				<item id="46474" min="1" max="1" chance="10.36" /> <!-- Leona's Soul Crystal Lv. 1 -->
+				<item id="46489" min="1" max="1" chance="10.33" /> <!-- Pantheon's Soul Crystal Lv. 1 -->
+				<item id="46444" min="1" max="1" chance="8.569" /> <!-- Kain's Soul Crystal Lv. 1 -->
+				<item id="46459" min="1" max="1" chance="8.441" /> <!-- Mermoden's Soul Crystal Lv. 1 -->
+				<item id="46505" min="1" max="1" chance="7.239" /> <!-- Lionel's Soul Crystal Lv. 2 -->
+				<item id="46490" min="1" max="1" chance="7.238" /> <!-- Pantheon's Soul Crystal Lv. 2 -->
+				<item id="46475" min="1" max="1" chance="7.225" /> <!-- Leona's Soul Crystal Lv. 2 -->
+				<item id="46460" min="1" max="1" chance="5.524" /> <!-- Mermoden's Soul Crystal Lv. 2 -->
+				<item id="46445" min="1" max="1" chance="5.502" /> <!-- Kain's Soul Crystal Lv. 2 -->
+				<item id="46476" min="1" max="1" chance="3.519" /> <!-- Leona's Soul Crystal Lv. 3 -->
+				<item id="46506" min="1" max="1" chance="3.496" /> <!-- Lionel's Soul Crystal Lv. 3 -->
+				<item id="46491" min="1" max="1" chance="3.441" /> <!-- Pantheon's Soul Crystal Lv. 3 -->
+				<item id="46461" min="1" max="1" chance="2.31" /> <!-- Mermoden's Soul Crystal Lv. 3 -->
+				<item id="46446" min="1" max="1" chance="2.3055" /> <!-- Kain's Soul Crystal Lv. 3 -->
+				<item id="38045" min="1" max="1" chance="1.869" /> <!-- Helios Slasher Crafting Pack -->
+				<item id="38052" min="1" max="1" chance="1.845" /> <!-- Helios Caster Crafting Pack -->
+				<item id="38046" min="1" max="1" chance="1.84" /> <!-- Helios Avenger Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="1.825" /> <!-- Helios Stormer Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="1.824" /> <!-- Helios Fighter Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="1.784" /> <!-- Helios Cutter Crafting Pack -->
+				<item id="38053" min="1" max="1" chance="1.767" /> <!-- Helios Retributer Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="1.759" /> <!-- Helios Shaper Crafting Pack -->
+				<item id="38049" min="1" max="1" chance="1.748" /> <!-- Helios Thrower Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="1.742" /> <!-- Helios Buster Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="1.737" /> <!-- Helios Shooter Crafting Pack -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal Lv. 4 -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal Lv. 4 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal Lv. 4 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal Lv. 4 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal Lv. 4 -->
+			</drop>
+		</dropLists>
 	</npc>
 </list>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml
index 061db8f5fb..469ab829ba 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml
@@ -678,17 +678,15 @@
 		</effects>
 	</skill>
 	<skill id="1927" toLevel="1" name="Sigel Force">
-		<!-- Casts Sigel Force on entire party, which increases P Atk. by 1%. -->
+		<!-- P. Atk. +1%. -->
 		<icon>icon.icon_sigel</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<!-- Sigel Force -->
-				<skillId>1928</skillId> <!-- Sigel Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>5</ticks>
+			<effect name="PAtk">
+				<amount>1</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -728,17 +726,15 @@
 		</effects>
 	</skill>
 	<skill id="1929" toLevel="1" name="Tyrr Force">
-		<!-- Casts Tyrr Force on entire party, which increases P. Critical Rate by 1%. -->
+		<!-- P. Critical Rate +1%. -->
 		<icon>icon.icon_tir</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<!-- Tyrr Force -->
-				<skillId>1930</skillId> <!-- Tyrr Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>5</ticks>
+			<effect name="CriticalRate">
+				<amount>1</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -769,17 +765,15 @@
 		</effects>
 	</skill>
 	<skill id="1931" toLevel="1" name="Othell Force">
-		<!-- Casts Othell Force on entire party, which increases Atk. Spd. by 1%. -->
+		<!-- Atk. Spd. +1%. -->
 		<icon>icon.icon_othel</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<!-- Othell Force -->
-				<skillId>1932</skillId> <!-- Othell Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>5</ticks>
+			<effect name="PhysicalAttackSpeed">
+				<amount>1</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -810,17 +804,15 @@
 		</effects>
 	</skill>
 	<skill id="1933" toLevel="1" name="Yul Force">
-		<!-- Casts Yul Force on entire party, which increases MP Recovery Bonus by 50%. -->
+		<!-- MP Recovery Bonus +50%. -->
 		<icon>icon.icon_yr</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<!-- Yul Force -->
-				<skillId>1934</skillId> <!-- Yul Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>5</ticks>
+			<effect name="MpRegen">
+				<amount>50</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -851,17 +843,15 @@
 		</effects>
 	</skill>
 	<skill id="1935" toLevel="1" name="Feoh Force">
-		<!-- Casts Feoh Force on entire party, which increases Casting Spd. by 1%. -->
+		<!-- Casting Spd. +1%. -->
 		<icon>icon.icon_feoh</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<!-- Feoh Force -->
-				<skillId>1936</skillId> <!-- Feoh Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>5</ticks>
+			<effect name="MagicalAttackSpeed">
+				<amount>1</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -892,17 +882,21 @@
 		</effects>
 	</skill>
 	<skill id="1937" toLevel="1" name="Wynn Force">
-		<!-- Casts Wynn Force on entire party, which decreases P./ M. Skill MP Consumption by 3%. -->
+		<!-- P./ M. Skill MP Consumption -3%. -->
 		<icon>icon.icon_wynn</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<!-- Wynn Force -->
-				<skillId>1938</skillId> <!-- Wynn Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>5</ticks>
+			<effect name="MagicMpCost">
+				<amount>-3</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-3</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
 			</effect>
 		</effects>
 	</skill>
@@ -939,17 +933,15 @@
 		</effects>
 	</skill>
 	<skill id="1939" toLevel="1" name="Aeore Force">
-		<!-- Casts Aeore Force on entire party, which increases M. Atk. by 1%. -->
+		<!-- M. Atk. +1%. -->
 		<icon>icon.icon_eolh</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<!-- Aeore Force -->
-				<skillId>1940</skillId> <!-- Aeore Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>5</ticks>
+			<effect name="MAtk">
+				<amount>1</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml
index 326bd6862e..4c022a9b08 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml
@@ -24,10 +24,9 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<skillId>30603</skillId> <!-- Eviscerator Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>7</ticks>
+			<effect name="SkillCriticalProbability">
+				<amount>1</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -61,16 +60,15 @@
 		<operateType>P</operateType>
 	</skill>
 	<skill id="30605" toLevel="1" name="Sayha's Seer Force">
-		<!-- M. Skill Critical Rate +1%. -->
+		<!-- M. Critical Rate +1%. -->
 		<icon>icon.icon_Er_wizard</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
 		<effects>
-			<effect name="CallSkillOnActionTime">
-				<skillId>30606</skillId> <!-- Sayha's Seer Force -->
-				<skillLevel>1</skillLevel>
-				<ticks>7</ticks>
+			<effect name="MagicCriticalRate">
+				<amount>1</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>