From d1ab35fcfa270a713c916cf9d79be76baa9ebf52 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 23 Oct 2019 20:23:46 +0000
Subject: [PATCH] Various NPC adjustments. contributed by Edoo.

---
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 10 +++---
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 10 +++---
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 10 +++---
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 10 +++---
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 10 +++---
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 10 +++---
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 34 ++++++++++++++++---
 .../dist/game/data/stats/npcs/31900-31999.xml |  2 +-
 .../dist/game/data/spawns/old/24_15.xml       |  2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml | 34 ++++++++++++++++---
 .../dist/game/data/stats/npcs/31900-31999.xml |  2 +-
 18 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/20900-20999.xml
index d6191bf63d..821ece1609 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/20900-20999.xml
@@ -3409,16 +3409,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="39686" sp="9" />
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<vitals hp="2089" hpRegen="7.5" mp="1127" mpRegen="2.7" />
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/20900-20999.xml
index bd1cf94416..1b5d3c288b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/20900-20999.xml
@@ -3409,16 +3409,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="39686" sp="9" />
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<vitals hp="2089" hpRegen="7.5" mp="1127" mpRegen="2.7" />
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/20900-20999.xml
index 841da0b8f8..cbf6621fdd 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/20900-20999.xml
@@ -3409,16 +3409,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="39686" sp="9" />
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<vitals hp="2089" hpRegen="7.5" mp="1127" mpRegen="2.7" />
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/20900-20999.xml
index 00b50a8462..613dbda4ce 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/20900-20999.xml
@@ -3432,16 +3432,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="19843" sp="4" />
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<vitals hp="2089" hpRegen="7.5" mp="1127" mpRegen="2.7" />
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/20900-20999.xml
index 00b50a8462..613dbda4ce 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/20900-20999.xml
@@ -3432,16 +3432,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="19843" sp="4" />
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<vitals hp="2089" hpRegen="7.5" mp="1127" mpRegen="2.7" />
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/20900-20999.xml
index 81d67d3139..d2dcf0343a 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/20900-20999.xml
@@ -3432,16 +3432,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="19843" sp="4" />
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<vitals hp="2089" hpRegen="7.5" mp="1127" mpRegen="2.7" />
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/20900-20999.xml
index f3b7cd77ae..b138bdbb0c 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/20900-20999.xml
@@ -2218,14 +2218,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
@@ -2237,9 +2239,31 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai clanHelpRange="300" aggroRange="450" />
 		<collision>
-			<radius normal="10" />
-			<height normal="32" />
+			<radius normal="12" />
+			<height normal="33" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="5308" min="1" max="1" chance="0.003" /> <!-- Sealed Dark Crystal Robe -->
+				<item id="57" min="60" max="141" chance="70" /> <!-- Adena -->
+				<item id="45929" min="1" max="3" chance="0.003" /> <!-- Spirit Stone -->
+				<item id="36559" min="1" max="1" chance="0.0009" /> <!-- Accessory Gem (High-grade) -->
+				<item id="45930" min="1" max="1" chance="0.0009" /> <!-- Mid-grade Spirit Stone -->
+				<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="36557" min="1" max="1" chance="0.3" /> <!-- Accessory Gem -->
+				<item id="36558" min="1" max="1" chance="0.075" /> <!-- Accessory Gem (Mid-grade) -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="20976" level="62" type="Monster" name="Spiteful Soul Warrior">
 		<!-- Confirmed CT2.5 -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/31900-31999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/31900-31999.xml
index 2c5f4a1bb9..4cc09411f3 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/31900-31999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/31900-31999.xml
@@ -864,7 +864,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31920" level="70" type="Monster" name="Elmoreden Servant's Ghost">
+	<npc id="31920" level="70" type="Npc" name="Elmoreden Servant's Ghost">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<acquire exp="0" sp="0" />
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/24_15.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/24_15.xml
index 23ad0b28f0..34bcd2bf7d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/24_15.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/24_15.xml
@@ -6,7 +6,7 @@
 			<npc id="31652" x="161728" y="-92880" z="-1848" heading="16500" respawnTime="60sec" /> <!-- Tablet of Vision -->
 			<npc id="31559" x="149000" y="-81392" z="-5632" heading="48000" respawnTime="60sec" /> <!-- Box of Asefa -->
 			<npc id="31371" x="146980" y="-67483" z="-3656" heading="33000" respawnTime="60sec" /> <!-- Wahkan -->
-			<npc id="33852" x="146578" y="-67322" z="-3660" heading="4223" respawnTime="60sec" /> <!-- Lugonnes -->
+			<npc id="33852" x="146552" y="-66408" z="-3552" heading="3298" respawnTime="60sec" /> <!-- Lugonnes -->
 			<npc id="21335" x="139808" y="-87592" z="-4360" heading="58657" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="142643" y="-88202" z="-4552" heading="19393" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
 			<npc id="21335" x="143023" y="-89295" z="-4464" heading="47414" respawnTime="120sec" /> <!-- Ketra Orc Elite Soldier -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/20900-20999.xml
index c0e4e0db56..acb9c53689 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/20900-20999.xml
@@ -2218,14 +2218,16 @@
 		</parameters>
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
+		<acquire exp="16843" sp="4" />
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
-			<attack physical="541.44774" magical="369.73862" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="262.19426" magical="191.86238" />
+			<vitals hp="2037.224535" hpRegen="7.5" mp="1107.826" mpRegen="2.7" />
+			<attack physical="521.12391" magical="355.86007" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="80" />
 				<run ground="174" />
 			</speed>
-			<hitTime>410</hitTime>
+			<hitTime>390</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status undying="false" canBeSown="true" />
@@ -2237,9 +2239,31 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai clanHelpRange="300" aggroRange="450" />
 		<collision>
-			<radius normal="10" />
-			<height normal="32" />
+			<radius normal="12" />
+			<height normal="33" />
 		</collision>
+		<dropLists>
+			<drop>
+				<item id="5308" min="1" max="1" chance="0.003" /> <!-- Sealed Dark Crystal Robe -->
+				<item id="57" min="60" max="141" chance="70" /> <!-- Adena -->
+				<item id="45929" min="1" max="3" chance="0.003" /> <!-- Spirit Stone -->
+				<item id="36559" min="1" max="1" chance="0.0009" /> <!-- Accessory Gem (High-grade) -->
+				<item id="45930" min="1" max="1" chance="0.0009" /> <!-- Mid-grade Spirit Stone -->
+				<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="36557" min="1" max="1" chance="0.3" /> <!-- Accessory Gem -->
+				<item id="36558" min="1" max="1" chance="0.075" /> <!-- Accessory Gem (Mid-grade) -->
+			</spoil>
+		</dropLists>
 	</npc>
 	<npc id="20976" level="62" type="Monster" name="Spiteful Soul Warrior">
 		<!-- Confirmed CT2.5 -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/31900-31999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/31900-31999.xml
index 2c5f4a1bb9..4cc09411f3 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/31900-31999.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/31900-31999.xml
@@ -864,7 +864,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31920" level="70" type="Monster" name="Elmoreden Servant's Ghost">
+	<npc id="31920" level="70" type="Npc" name="Elmoreden Servant's Ghost">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<acquire exp="0" sp="0" />