From e2f250042bb00dcfaa81d6e2142842b091191e8c Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 3 Oct 2017 22:22:15 +0000
Subject: [PATCH] Mermoden NPC improvements. Contributed by gamelike85.

---
 .../dist/game/data/stats/npcs/36700-36799.xml | 48 +++++++++----------
 .../dist/game/data/stats/npcs/36700-36799.xml | 48 +++++++++----------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/36700-36799.xml
index 19b026704d..86099c5143 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/36700-36799.xml
@@ -133,9 +133,9 @@
 		</collision>
 	</npc>
 	<npc id="36706" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -155,9 +155,9 @@
 		</collision>
 	</npc>
 	<npc id="36707" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -177,9 +177,9 @@
 		</collision>
 	</npc>
 	<npc id="36708" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -199,9 +199,9 @@
 		</collision>
 	</npc>
 	<npc id="36709" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -221,9 +221,9 @@
 		</collision>
 	</npc>
 	<npc id="36710" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -243,9 +243,9 @@
 		</collision>
 	</npc>
 	<npc id="36711" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -265,9 +265,9 @@
 		</collision>
 	</npc>
 	<npc id="36712" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -287,9 +287,9 @@
 		</collision>
 	</npc>
 	<npc id="36713" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/36700-36799.xml
index 19b026704d..86099c5143 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/36700-36799.xml
@@ -133,9 +133,9 @@
 		</collision>
 	</npc>
 	<npc id="36706" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -155,9 +155,9 @@
 		</collision>
 	</npc>
 	<npc id="36707" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -177,9 +177,9 @@
 		</collision>
 	</npc>
 	<npc id="36708" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -199,9 +199,9 @@
 		</collision>
 	</npc>
 	<npc id="36709" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -221,9 +221,9 @@
 		</collision>
 	</npc>
 	<npc id="36710" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -243,9 +243,9 @@
 		</collision>
 	</npc>
 	<npc id="36711" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -265,9 +265,9 @@
 		</collision>
 	</npc>
 	<npc id="36712" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>
@@ -287,9 +287,9 @@
 		</collision>
 	</npc>
 	<npc id="36713" level="75" type="L2Npc" name="Mermoden" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>ELF</race>
+		<sex>MALE</sex>
+		<equipment rhand="192" /> <!-- Crystal Staff -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2676" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<speed>