From 253e1739c85babe90ea78cdbf8c7f2f035267502 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 30 Aug 2022 00:19:10 +0000
Subject: [PATCH] Updated Giran and Aden square merchant spawns.

---
 .../data/spawns/Aden/AdenSquareMerchants.xml     | 16 ++++++++++++++++
 .../dist/game/data/spawns/Aden/TownOfAden.xml    |  9 ---------
 .../data/spawns/Giran/GiranSquareMerchants.xml   | 16 ++++++++++++++++
 .../dist/game/data/spawns/Giran/TownOfGiran.xml  |  9 ---------
 .../data/spawns/Aden/AdenSquareMerchants.xml     | 16 ++++++++++++++++
 .../dist/game/data/spawns/Aden/TownOfAden.xml    |  9 ---------
 .../data/spawns/Giran/GiranSquareMerchants.xml   | 16 ++++++++++++++++
 .../dist/game/data/spawns/Giran/TownOfGiran.xml  | 10 ----------
 .../data/spawns/Aden/AdenSquareMerchants.xml     | 15 +++++++++++++++
 .../dist/game/data/spawns/Aden/TownOfAden.xml    | 10 ----------
 .../data/spawns/Giran/GiranSquareMerchants.xml   | 15 +++++++++++++++
 .../dist/game/data/spawns/Giran/TownOfGiran.xml  | 11 -----------
 .../data/spawns/Aden/AdenSquareMerchants.xml     | 13 +++++++++++++
 .../data/spawns/Giran/GiranSquareMerchants.xml   | 13 +++++++++++++
 .../dist/game/data/spawns/Others/22_22.xml       |  5 -----
 .../dist/game/data/spawns/Others/24_18.xml       |  5 -----
 .../dist/game/data/spawns/Aden/Aden.xml          |  5 -----
 .../data/spawns/Aden/AdenSquareMerchants.xml     | 13 +++++++++++++
 .../dist/game/data/spawns/Giran/Giran.xml        |  5 -----
 .../data/spawns/Giran/GiranSquareMerchants.xml   | 13 +++++++++++++
 .../dist/game/data/spawns/Aden/Aden.xml          |  5 -----
 .../data/spawns/Aden/AdenSquareMerchants.xml     | 13 +++++++++++++
 .../dist/game/data/spawns/Giran/Giran.xml        |  5 -----
 .../data/spawns/Giran/GiranSquareMerchants.xml   | 13 +++++++++++++
 24 files changed, 172 insertions(+), 88 deletions(-)
 create mode 100644 L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
 create mode 100644 L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
 create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
 create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
 create mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
 create mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
 create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
 create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
 create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
 create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
 create mode 100644 L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
 create mode 100644 L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml

diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
new file mode 100644
index 0000000000..c00aee9d18
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="AdenSquareMerchants">
+		<group>
+			<npc id="32880" x="147420" y="27250" z="-2200" heading="48230" respawnTime="1min" /> <!-- Dolphren - Recipe Merchant -->
+			<npc id="30839" x="147480" y="27250" z="-2200" heading="48230" respawnTime="1min" /> <!-- Holly - Grocer -->
+			<npc id="30844" x="147525" y="27270" z="-2200" heading="49000" respawnTime="1min" /> <!-- Walderal - Warehouse Keeper -->
+			<npc id="31577" x="147375" y="27270" z="-2200" heading="49000" respawnTime="1min" /> <!-- Linnaeus - Fishing Guild -->
+			<npc id="30846" x="147300" y="27300" z="-2200" heading="49000" respawnTime="1min" /> <!-- Wilbert - Blacksmith -->
+			<npc id="30847" x="147250" y="27350" z="-2200" heading="48230" respawnTime="1min" /> <!-- Ferris - Head Blacksmith -->
+			<npc id="32325" x="147650" y="27350" z="-2200" heading="48230" respawnTime="1min" /> <!-- Yin - Attribute Master -->
+			<npc id="31053" x="147697" y="27373" z="-2200" heading="48230" respawnTime="1min" /> <!-- Kidder - Dye Merchant -->
+			<npc id="33715" x="147600" y="27300" z="-2200" heading="48230" respawnTime="1min" /> <!-- Seed Talisman Manager -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml
index 061a106ac0..50d600afab 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml
@@ -104,15 +104,6 @@
 			<npc id="34362" x="146472" y="26808" z="-2209" heading="62980" respawnTime="60sec" /> <!-- Herphah -->
 			<npc id="34513" x="146471" y="26730" z="-2205" respawnTime="60sec" /> <!-- Joachim - Dual Class Master -->
 			<npc id="34514" x="146534" y="26663" z="-2204" heading="6027" respawnTime="60sec" /> <!-- Gallias - Dual Class Certificate Manager -->
-			<npc id="30847" x="147252" y="27360" z="-2205" heading="50744" respawnTime="60sec" /> <!-- Ferris - Head Blacksmith -->
-			<npc id="30846" x="147299" y="27301" z="-2203" heading="49151" respawnTime="60sec" /> <!-- Wilbert - Blacksmith -->
-			<npc id="30839" x="147484" y="27236" z="-2205" heading="41905" respawnTime="60sec" /> <!-- Holly - Grocer -->
-			<npc id="32880" x="147434" y="27237" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Dolphren - Recipe Merchant -->
-			<npc id="31577" x="147370" y="27252" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Linnaeus - Fishing Guild -->
-			<npc id="30844" x="147536" y="27255" z="-2205" heading="50449" respawnTime="60sec" /> <!-- Walderal - Warehouse Keeper -->
-			<npc id="33715" x="147599" y="27301" z="-2205" heading="47429" respawnTime="60sec" /> <!-- Seed Talisman Manager -->
-			<npc id="32325" x="147655" y="27362" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Yin - Attribute Master -->
-			<npc id="31053" x="147697" y="27383" z="-2204" heading="45409" respawnTime="60sec" /> <!-- Kidder - Dye Merchant -->
 			<npc id="34541" x="147039" y="26692" z="-2208" heading="16383" respawnTime="60sec" /> <!-- Karinia - Manager of Solo Instance Zones -->
 			<npc id="34542" x="146918" y="26695" z="-2208" heading="14903" respawnTime="60sec" /> <!-- Benusta - Manager of Party Instance Zones -->
 			<npc id="34543" x="146800" y="26691" z="-2208" heading="15270" respawnTime="60sec" /> <!-- Bellra - Manager of Command Channel Instance Zones -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
new file mode 100644
index 0000000000..c091af5361
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="GiranSquareMerchants">
+		<group>
+			<npc id="32877" x="83367" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Plani - Recipe Merchant -->
+			<npc id="34445" x="79669" y="145914" z="-3496" heading="-8192" respawnTime="1min" /> <!-- Denign - Accessory Artisan -->
+			<npc id="30081" x="83217" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Helvetia - Grocer -->
+			<npc id="30095" x="83067" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Randolf - Warehouse Keeper -->
+			<npc id="31572" x="82917" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- O'Fulle - Fishing Guild -->
+			<npc id="30300" x="82767" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Pushkin - Blacksmith -->
+			<npc id="30512" x="82617" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Kusto - Head Blacksmith -->
+			<npc id="30098" x="82467" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Alexandria - Artifact Merchant -->
+			<npc id="34445" x="82317" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Denign - Accessory Artisan -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml
index 2cd43137dc..7083e2385f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml
@@ -117,15 +117,6 @@
 			<npc id="34222" x="83487" y="149304" z="-3400" heading="48708" respawnTime="60sec" /> <!-- Kekropus - Hierarch -->
 			<npc id="34328" x="80370" y="145482" z="-3512" heading="0" respawnTime="60sec" /> <!-- Laia - Auction Broker -->
 			<npc id="34445" x="79672" y="145912" z="-3498" heading="48457" respawnTime="60sec" /> <!-- Denign - Accessory Artisan -->
-			<npc id="31049" x="83431" y="147552" z="-3429" heading="24575" respawnTime="60sec" /> <!-- Pepper - Dye Merchant -->
-			<npc id="32877" x="83367" y="147495" z="-3461" heading="23095" respawnTime="60sec" /> <!-- Plani - Recipe Merchant -->
-			<npc id="30081" x="83231" y="147496" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Helvetia - Grocer -->
-			<npc id="30095" x="83112" y="147498" z="-3470" heading="13828" respawnTime="60sec" /> <!-- Randolf - Warehouse Keeper -->
-			<npc id="31572" x="82922" y="147506" z="-3470" heading="18794" respawnTime="60sec" /> <!-- O'Fulle - Fishing Guild -->
-			<npc id="30300" x="82765" y="147506" z="-3470" heading="7246" respawnTime="60sec" /> <!-- Pushkin - Blacksmith -->
-			<npc id="30512" x="82618" y="147505" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Kusto - Head Blacksmith -->
-			<npc id="30098" x="82456" y="147512" z="-3470" heading="15229" respawnTime="60sec" /> <!-- Alexandria - Artifact Merchant -->
-			<npc id="34445" x="82318" y="147511" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Denign - Accessory Artisan -->
 			<npc id="30981" x="83775" y="149336" z="-3408" heading="16383" respawnTime="60sec" /> <!-- Dark Judge -->
 			<npc id="31126" x="81266" y="150091" z="-3523" heading="0" respawnTime="60sec" /> <!-- Blacksmith of Mammon -->
 			<npc id="33737" x="81272" y="150041" z="-3523" heading="0" respawnTime="60sec" /> <!-- Merchant of Mammon -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
new file mode 100644
index 0000000000..c00aee9d18
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="AdenSquareMerchants">
+		<group>
+			<npc id="32880" x="147420" y="27250" z="-2200" heading="48230" respawnTime="1min" /> <!-- Dolphren - Recipe Merchant -->
+			<npc id="30839" x="147480" y="27250" z="-2200" heading="48230" respawnTime="1min" /> <!-- Holly - Grocer -->
+			<npc id="30844" x="147525" y="27270" z="-2200" heading="49000" respawnTime="1min" /> <!-- Walderal - Warehouse Keeper -->
+			<npc id="31577" x="147375" y="27270" z="-2200" heading="49000" respawnTime="1min" /> <!-- Linnaeus - Fishing Guild -->
+			<npc id="30846" x="147300" y="27300" z="-2200" heading="49000" respawnTime="1min" /> <!-- Wilbert - Blacksmith -->
+			<npc id="30847" x="147250" y="27350" z="-2200" heading="48230" respawnTime="1min" /> <!-- Ferris - Head Blacksmith -->
+			<npc id="32325" x="147650" y="27350" z="-2200" heading="48230" respawnTime="1min" /> <!-- Yin - Attribute Master -->
+			<npc id="31053" x="147697" y="27373" z="-2200" heading="48230" respawnTime="1min" /> <!-- Kidder - Dye Merchant -->
+			<npc id="33715" x="147600" y="27300" z="-2200" heading="48230" respawnTime="1min" /> <!-- Seed Talisman Manager -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/TownOfAden.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/TownOfAden.xml
index 4b03f2a8ca..5893728747 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/TownOfAden.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/TownOfAden.xml
@@ -103,15 +103,6 @@
 			<npc id="34362" x="146472" y="26808" z="-2209" heading="62980" respawnTime="60sec" /> <!-- Herphah -->
 			<npc id="34513" x="146471" y="26730" z="-2205" respawnTime="60sec" /> <!-- Joachim - Dual Class Master -->
 			<npc id="34514" x="146534" y="26663" z="-2204" heading="6027" respawnTime="60sec" /> <!-- Gallias - Dual Class Certificate Manager -->
-			<npc id="30847" x="147252" y="27360" z="-2205" heading="50744" respawnTime="60sec" /> <!-- Ferris - Head Blacksmith -->
-			<npc id="30846" x="147299" y="27301" z="-2203" heading="49151" respawnTime="60sec" /> <!-- Wilbert - Blacksmith -->
-			<npc id="30839" x="147484" y="27236" z="-2205" heading="41905" respawnTime="60sec" /> <!-- Holly - Grocer -->
-			<npc id="32880" x="147434" y="27237" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Dolphren - Recipe Merchant -->
-			<npc id="31577" x="147370" y="27252" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Linnaeus - Fishing Guild -->
-			<npc id="30844" x="147536" y="27255" z="-2205" heading="50449" respawnTime="60sec" /> <!-- Walderal - Warehouse Keeper -->
-			<npc id="33715" x="147599" y="27301" z="-2205" heading="47429" respawnTime="60sec" /> <!-- Seed Talisman Manager -->
-			<npc id="32325" x="147655" y="27362" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Yin - Attribute Master -->
-			<npc id="31053" x="147697" y="27383" z="-2204" heading="45409" respawnTime="60sec" /> <!-- Kidder - Dye Merchant -->
 			<npc id="34541" x="147039" y="26692" z="-2208" heading="16383" respawnTime="60sec" /> <!-- Karinia - Manager of Solo Instance Zones -->
 			<npc id="34542" x="146918" y="26695" z="-2208" heading="14903" respawnTime="60sec" /> <!-- Benusta - Manager of Party Instance Zones -->
 			<npc id="34543" x="146800" y="26691" z="-2208" heading="15270" respawnTime="60sec" /> <!-- Bellra - Manager of Command Channel Instance Zones -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
new file mode 100644
index 0000000000..c091af5361
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="GiranSquareMerchants">
+		<group>
+			<npc id="32877" x="83367" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Plani - Recipe Merchant -->
+			<npc id="34445" x="79669" y="145914" z="-3496" heading="-8192" respawnTime="1min" /> <!-- Denign - Accessory Artisan -->
+			<npc id="30081" x="83217" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Helvetia - Grocer -->
+			<npc id="30095" x="83067" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Randolf - Warehouse Keeper -->
+			<npc id="31572" x="82917" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- O'Fulle - Fishing Guild -->
+			<npc id="30300" x="82767" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Pushkin - Blacksmith -->
+			<npc id="30512" x="82617" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Kusto - Head Blacksmith -->
+			<npc id="30098" x="82467" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Alexandria - Artifact Merchant -->
+			<npc id="34445" x="82317" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Denign - Accessory Artisan -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/TownOfGiran.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/TownOfGiran.xml
index 37c39f3469..3060c29d27 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/TownOfGiran.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Giran/TownOfGiran.xml
@@ -91,7 +91,6 @@
 			<npc id="32877" x="81362" y="147260" z="-3528" heading="55549" respawnTime="60sec" /> <!-- Plani - Recipe Merchant -->
 			<npc id="33359" x="81388" y="149728" z="-3464" heading="53197" respawnTime="60sec" /> <!-- Kerry - Provisional Clan Hall Gatekeeper -->
 			<npc id="33417" x="81083" y="149459" z="-3448" heading="58312" respawnTime="60sec" /> <!-- Perina - Auction House Manager -->
-			<!-- <npc id="33420" x="83309" y="150220" z="-3512" heading="33306" respawnTime="60sec" /> --> <!-- Diania - Mysterious Dye Merchant -->
 			<npc id="33460" x="81436" y="152950" z="-3528" heading="16384" respawnTime="60sec" /> <!-- Shuman - Guard -->
 			<npc id="33584" x="80790" y="148760" z="-3477" heading="10372" respawnTime="60sec" /> <!-- Moe - Aden Reconstruction Society Leader -->
 			<npc id="33587" x="83644" y="147590" z="-3400" heading="18408" respawnTime="60sec" /> <!-- Mentor Guide - Mentoring Manager -->
@@ -117,15 +116,6 @@
 			<npc id="34222" x="83487" y="149304" z="-3400" heading="48708" respawnTime="60sec" /> <!-- Kekropus - Hierarch -->
 			<npc id="34328" x="80370" y="145482" z="-3512" heading="0" respawnTime="60sec" /> <!-- Laia - Auction Broker -->
 			<npc id="34445" x="79672" y="145912" z="-3498" heading="48457" respawnTime="60sec" /> <!-- Denign - Accessory Artisan -->
-			<npc id="31049" x="83431" y="147552" z="-3429" heading="24575" respawnTime="60sec" /> <!-- Pepper - Dye Merchant -->
-			<npc id="32877" x="83367" y="147495" z="-3461" heading="23095" respawnTime="60sec" /> <!-- Plani - Recipe Merchant -->
-			<npc id="30081" x="83231" y="147496" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Helvetia - Grocer -->
-			<npc id="30095" x="83112" y="147498" z="-3470" heading="13828" respawnTime="60sec" /> <!-- Randolf - Warehouse Keeper -->
-			<npc id="31572" x="82922" y="147506" z="-3470" heading="18794" respawnTime="60sec" /> <!-- O'Fulle - Fishing Guild -->
-			<npc id="30300" x="82765" y="147506" z="-3470" heading="7246" respawnTime="60sec" /> <!-- Pushkin - Blacksmith -->
-			<npc id="30512" x="82618" y="147505" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Kusto - Head Blacksmith -->
-			<npc id="30098" x="82456" y="147512" z="-3470" heading="15229" respawnTime="60sec" /> <!-- Alexandria - Artifact Merchant -->
-			<npc id="34445" x="82318" y="147511" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Denign - Accessory Artisan -->
 			<npc id="30981" x="83775" y="149336" z="-3408" heading="16383" respawnTime="60sec" /> <!-- Dark Judge -->
 			<npc id="31126" x="81266" y="150091" z="-3523" heading="0" respawnTime="60sec" /> <!-- Blacksmith of Mammon -->
 			<npc id="33737" x="81272" y="150041" z="-3523" heading="0" respawnTime="60sec" /> <!-- Merchant of Mammon -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
new file mode 100644
index 0000000000..9688221485
--- /dev/null
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
@@ -0,0 +1,15 @@
+ο»Ώ<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="AdenSquareMerchants">
+		<group>
+			<npc id="30839" x="147480" y="27250" z="-2200" heading="48230" respawnTime="1min" /> <!-- Holly - Grocer -->
+			<npc id="30844" x="147525" y="27270" z="-2200" heading="49000" respawnTime="1min" /> <!-- Walderal - Warehouse Keeper -->
+			<npc id="31577" x="147375" y="27270" z="-2200" heading="49000" respawnTime="1min" /> <!-- Linnaeus - Fishing Guild -->
+			<npc id="30846" x="147300" y="27300" z="-2200" heading="49000" respawnTime="1min" /> <!-- Wilbert - Blacksmith -->
+			<npc id="30847" x="147250" y="27350" z="-2200" heading="48230" respawnTime="1min" /> <!-- Ferris - Head Blacksmith -->
+			<npc id="32325" x="147650" y="27350" z="-2200" heading="48230" respawnTime="1min" /> <!-- Yin - Attribute Master -->
+			<npc id="31053" x="147697" y="27373" z="-2200" heading="48230" respawnTime="1min" /> <!-- Kidder - Dye Merchant -->
+			<npc id="33715" x="147600" y="27300" z="-2200" heading="48230" respawnTime="1min" /> <!-- Seed Talisman Manager -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/TownOfAden.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/TownOfAden.xml
index 86046b2841..c0e937576e 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/TownOfAden.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/TownOfAden.xml
@@ -69,7 +69,6 @@
 			<npc id="32478" x="148399" y="26626" z="-2200" heading="11382" respawnTime="60sec" /> <!-- Game Assistant - Special -->
 			<npc id="32571" x="147569" y="29362" z="-2264" heading="24576" respawnTime="60sec" /> <!-- Colin - Secret Agent -->
 			<npc id="32610" x="148478" y="28034" z="-2264" heading="32768" respawnTime="60sec" /> <!-- Olf Kanore - Weaver -->
-			<!-- <npc id="32880" x="150915" y="28398" z="-2248" heading="25000" respawnTime="60sec" /> --> <!-- Dolphren -->
 			<npc id="33359" x="148465" y="27156" z="-2200" heading="31666" respawnTime="60sec" /> <!-- Kerry - Provisional Clan Hall Gatekeeper -->
 			<npc id="33418" x="147199" y="28581" z="-2248" heading="52116" respawnTime="60sec" /> <!-- Sarnya - Auction House Manager -->
 			<npc id="33461" x="147274" y="19838" z="-2000" heading="49152" respawnTime="60sec" /> <!-- Noah - Guard -->
@@ -103,15 +102,6 @@
 			<npc id="34362" x="146472" y="26808" z="-2209" heading="62980" respawnTime="60sec" /> <!-- Herphah -->
 			<npc id="34513" x="146471" y="26730" z="-2205" respawnTime="60sec" /> <!-- Joachim - Dual Class Master -->
 			<npc id="34514" x="146534" y="26663" z="-2204" heading="6027" respawnTime="60sec" /> <!-- Gallias - Dual Class Certificate Manager -->
-			<npc id="30847" x="147252" y="27360" z="-2205" heading="50744" respawnTime="60sec" /> <!-- Ferris - Head Blacksmith -->
-			<npc id="30846" x="147299" y="27301" z="-2203" heading="49151" respawnTime="60sec" /> <!-- Wilbert - Blacksmith -->
-			<npc id="30839" x="147484" y="27236" z="-2205" heading="41905" respawnTime="60sec" /> <!-- Holly - Grocer -->
-			<!-- <npc id="32880" x="147434" y="27237" z="-2205" heading="49151" respawnTime="60sec" /> --> <!-- Dolphren -->
-			<npc id="31577" x="147370" y="27252" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Linnaeus - Fishing Guild -->
-			<npc id="30844" x="147536" y="27255" z="-2205" heading="50449" respawnTime="60sec" /> <!-- Walderal - Warehouse Keeper -->
-			<npc id="33715" x="147599" y="27301" z="-2205" heading="47429" respawnTime="60sec" /> <!-- Seed Talisman Manager -->
-			<npc id="32325" x="147655" y="27362" z="-2205" heading="49151" respawnTime="60sec" /> <!-- Yin - Attribute Master -->
-			<npc id="31053" x="147697" y="27383" z="-2204" heading="45409" respawnTime="60sec" /> <!-- Kidder - Dye Merchant -->
 			<npc id="34541" x="147039" y="26692" z="-2208" heading="16383" respawnTime="60sec" /> <!-- Karinia - Manager of Solo Instance Zones -->
 			<npc id="34542" x="146918" y="26695" z="-2208" heading="14903" respawnTime="60sec" /> <!-- Benusta - Manager of Party Instance Zones -->
 			<npc id="34543" x="146800" y="26691" z="-2208" heading="15270" respawnTime="60sec" /> <!-- Bellra - Manager of Command Channel Instance Zones -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
new file mode 100644
index 0000000000..83025942dd
--- /dev/null
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
@@ -0,0 +1,15 @@
+ο»Ώ<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="GiranSquareMerchants">
+		<group>
+			<npc id="34445" x="79669" y="145914" z="-3496" heading="-8192" respawnTime="1min" /> <!-- Denign - Accessory Artisan -->
+			<npc id="30081" x="83217" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Helvetia - Grocer -->
+			<npc id="30095" x="83067" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Randolf - Warehouse Keeper -->
+			<npc id="31572" x="82917" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- O'Fulle - Fishing Guild -->
+			<npc id="30300" x="82767" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Pushkin - Blacksmith -->
+			<npc id="30512" x="82617" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Kusto - Head Blacksmith -->
+			<npc id="30098" x="82467" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Alexandria - Artifact Merchant -->
+			<npc id="34445" x="82317" y="147521" z="-3464" heading="18965" respawnTime="1min" /> <!-- Denign - Accessory Artisan -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/TownOfGiran.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/TownOfGiran.xml
index e6c054d556..80156536ed 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/TownOfGiran.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/TownOfGiran.xml
@@ -88,10 +88,8 @@
 			<npc id="32327" x="83575" y="147665" z="-3400" heading="18408" respawnTime="60sec" /> <!-- Adventurers' Guide - Buff Manager -->
 			<npc id="32478" x="82672" y="146752" z="-3464" heading="33000" respawnTime="60sec" /> <!-- Game Assistant - Special -->
 			<npc id="32498" x="85104" y="147616" z="-3400" heading="53248" respawnTime="60sec" /> <!-- Devil's Isle Survivor -->
-			<!-- <npc id="32877" x="81362" y="147260" z="-3528" heading="55549" respawnTime="60sec" /> --> <!-- Plani -->
 			<npc id="33359" x="81388" y="149728" z="-3464" heading="53197" respawnTime="60sec" /> <!-- Kerry - Provisional Clan Hall Gatekeeper -->
 			<npc id="33417" x="81083" y="149459" z="-3448" heading="58312" respawnTime="60sec" /> <!-- Perina - Auction House Manager -->
-			<!-- <npc id="33420" x="83309" y="150220" z="-3512" heading="33306" respawnTime="60sec" /> --> <!-- Diania - Mysterious Dye Merchant -->
 			<npc id="33460" x="81436" y="152950" z="-3528" heading="16384" respawnTime="60sec" /> <!-- Shuman - Guard -->
 			<npc id="33584" x="80790" y="148760" z="-3477" heading="10372" respawnTime="60sec" /> <!-- Moe - Aden Reconstruction Society Leader -->
 			<npc id="33587" x="83644" y="147590" z="-3400" heading="18408" respawnTime="60sec" /> <!-- Mentor Guide - Mentoring Manager -->
@@ -117,15 +115,6 @@
 			<npc id="34222" x="83487" y="149304" z="-3400" heading="48708" respawnTime="60sec" /> <!-- Kekropus - Hierarch -->
 			<npc id="34328" x="80370" y="145482" z="-3512" heading="0" respawnTime="60sec" /> <!-- Laia - Auction Broker -->
 			<npc id="34445" x="79672" y="145912" z="-3498" heading="48457" respawnTime="60sec" /> <!-- Denign - Accessory Artisan -->
-			<npc id="31049" x="83431" y="147552" z="-3429" heading="24575" respawnTime="60sec" /> <!-- Pepper - Dye Merchant -->
-			<!-- <npc id="32877" x="83367" y="147495" z="-3461" heading="23095" respawnTime="60sec" /> --> <!-- Plani -->
-			<npc id="30081" x="83231" y="147496" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Helvetia - Grocer -->
-			<npc id="30095" x="83112" y="147498" z="-3470" heading="13828" respawnTime="60sec" /> <!-- Randolf - Warehouse Keeper -->
-			<npc id="31572" x="82922" y="147506" z="-3470" heading="18794" respawnTime="60sec" /> <!-- O'Fulle - Fishing Guild -->
-			<npc id="30300" x="82765" y="147506" z="-3470" heading="7246" respawnTime="60sec" /> <!-- Pushkin - Blacksmith -->
-			<npc id="30512" x="82618" y="147505" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Kusto - Head Blacksmith -->
-			<npc id="30098" x="82456" y="147512" z="-3470" heading="15229" respawnTime="60sec" /> <!-- Alexandria - Artifact Merchant -->
-			<npc id="34445" x="82318" y="147511" z="-3470" heading="16383" respawnTime="60sec" /> <!-- Denign - Accessory Artisan -->
 			<npc id="30981" x="83775" y="149336" z="-3408" heading="16383" respawnTime="60sec" /> <!-- Dark Judge -->
 			<npc id="31126" x="81266" y="150091" z="-3523" heading="0" respawnTime="60sec" /> <!-- Blacksmith of Mammon -->
 			<npc id="33737" x="81272" y="150041" z="-3523" heading="0" respawnTime="60sec" /> <!-- Merchant of Mammon -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
new file mode 100644
index 0000000000..4f9ea0b8f7
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="AdenSquareMerchants">
+		<group>
+			<npc id="30869" x="147259" y="27356" z="-2200" heading="47094" respawnTime="1min" /> <!-- Lemper - Pet Manager -->
+			<npc id="30936" x="147321" y="27315" z="-2200" heading="41794" respawnTime="1min" /> <!-- Pona - Collector -->
+			<npc id="30843" x="147402" y="27277" z="-2200" heading="44416" respawnTime="1min" /> <!-- Romp - Warehouse Keeper -->
+			<npc id="30839" x="147466" y="27255" z="-2200" heading="52721" respawnTime="1min" /> <!-- Holly - Grocer -->
+			<npc id="30846" x="147545" y="27276" z="-2200" heading="55313" respawnTime="1min" /> <!-- Wilbert - Blacksmith -->
+			<npc id="31051" x="147596" y="27315" z="-2200" heading="55711" respawnTime="1min" /> <!-- Keach - Tattoo Master -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
new file mode 100644
index 0000000000..1a7a868a91
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="GiranSquareMerchants">
+		<group>
+			<npc id="30829" x="82224" y="149712" z="-3464" heading="53303" respawnTime="1min" /> <!-- Cooper - Pet Manager -->
+			<npc id="30936" x="82324" y="149712" z="-3464" heading="53376" respawnTime="1min" /> <!-- Pona - Collector -->
+			<npc id="30081" x="82424" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Helvetia - Grocer -->
+			<npc id="30095" x="82524" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Randolf - Warehouse Keeper -->
+			<npc id="30300" x="82624" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Pushkin - Blacksmith -->
+			<npc id="31049" x="82724" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Pepper - Tattoo Master -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/22_22.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/22_22.xml
index becead7465..aa1e84538f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/22_22.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/22_22.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_22">
 		<group>
-			<npc id="30829" x="82239" y="149709" z="-3469" heading="50373" respawnTime="60sec" /> <!-- Cooper - Pet Manager -->
-			<npc id="30936" x="82335" y="149710" z="-3469" heading="49648" respawnTime="60sec" /> <!-- Pona - Collector -->
-			<npc id="30081" x="82436" y="149711" z="-3469" heading="48457" respawnTime="60sec" /> <!-- Helvetia - Grocer -->
-			<npc id="30095" x="82524" y="149709" z="-3469" heading="49151" respawnTime="60sec" /> <!-- Randolf - Warehouse Keeper -->
-			<npc id="30300" x="82622" y="149714" z="-3469" heading="47997" respawnTime="60sec" /> <!-- Pushkin - Blacksmith -->
 			<npc id="20248" x="98302" y="136197" z="-3528" heading="25104" respawnTime="60sec" /> <!-- Turak Bugbear -->
 			<npc id="20249" x="98152" y="134216" z="-3611" heading="49900" respawnTime="60sec" /> <!-- Turak Bugbear Warrior -->
 			<npc id="20248" x="98152" y="134216" z="-3611" heading="49900" respawnTime="60sec" /> <!-- Turak Bugbear -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/24_18.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/24_18.xml
index bbc41c4975..d9d3f94253 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/24_18.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Others/24_18.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="24_18">
 		<group>
-			<npc id="30846" x="147552" y="27274" z="-2204" heading="49151" respawnTime="60sec" /> <!-- Wilbert - Blacksmith -->
-			<npc id="30839" x="147456" y="27256" z="-2204" heading="49151" respawnTime="60sec" /> <!-- Holly - Grocer -->
-			<npc id="30843" x="147362" y="27265" z="-2204" heading="50632" respawnTime="60sec" /> <!-- Romp - Warehouse Keeper -->
-			<npc id="30936" x="147311" y="27307" z="-2203" heading="47671" respawnTime="60sec" /> <!-- Pona - Collector -->
-			<npc id="30869" x="147256" y="27353" z="-2204" heading="48698" respawnTime="60sec" /> <!-- Lemper - Pet Manager -->
 			<npc id="32478" x="148465" y="26654" z="-2200" heading="24329" respawnTime="60sec" /> <!-- Game Assistant - Special -->
 			<npc id="33359" x="148465" y="27156" z="-2200" heading="33121" respawnTime="60sec" /> <!-- Kerry - Provisional Clan Hall Gatekeeper -->
 			<npc id="31001" x="145747" y="21312" z="-2136" heading="93" respawnTime="60sec" /> <!-- Claudia Athebaldt -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/Aden.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/Aden.xml
index 9e79e03808..15bd0f0530 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/Aden.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/Aden.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="Aden">
 		<group>
-			<npc id="30846" x="147552" y="27274" z="-2204" heading="49151" respawnTime="60sec" /> <!-- Wilbert - Blacksmith -->
-			<npc id="30839" x="147456" y="27256" z="-2204" heading="49151" respawnTime="60sec" /> <!-- Holly - Grocer -->
-			<npc id="30843" x="147362" y="27265" z="-2204" heading="50632" respawnTime="60sec" /> <!-- Romp - Warehouse Keeper -->
-			<npc id="34218" x="147311" y="27307" z="-2203" heading="47671" respawnTime="60sec" /> <!-- Greno - Equipment Merchant -->
-			<npc id="30869" x="147256" y="27353" z="-2204" heading="48698" respawnTime="60sec" /> <!-- Lemper - Pet Manager -->
 			<npc id="32478" x="148465" y="26654" z="-2200" heading="24329" respawnTime="60sec" /> <!-- Game Assistant - Special -->
 			<npc id="33359" x="148465" y="27156" z="-2200" heading="33121" respawnTime="60sec" /> <!-- Kerry - Provisional Clan Hall Gatekeeper -->
 			<npc id="31001" x="145747" y="21312" z="-2136" heading="93" respawnTime="60sec" /> <!-- Claudia Athebaldt -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
new file mode 100644
index 0000000000..5d3763faeb
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
@@ -0,0 +1,13 @@
+ο»Ώ<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="AdenSquareMerchants">
+		<group>
+			<npc id="30869" x="147259" y="27356" z="-2200" heading="47094" respawnTime="1min" /> <!-- Lemper - Pet Manager -->
+			<npc id="34218" x="147321" y="27315" z="-2200" heading="41794" respawnTime="1min" /> <!-- Greno - Equipment Merchant -->
+			<npc id="30843" x="147402" y="27277" z="-2200" heading="44416" respawnTime="1min" /> <!-- Romp - Warehouse Keeper -->
+			<npc id="30839" x="147466" y="27255" z="-2200" heading="52721" respawnTime="1min" /> <!-- Holly - Grocer -->
+			<npc id="30846" x="147545" y="27276" z="-2200" heading="55313" respawnTime="1min" /> <!-- Wilbert - Blacksmith -->
+			<!-- <npc id="31051" x="147596" y="27315" z="-2200" heading="55711" respawnTime="1min" /> Keach - Tattoo Master -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml
index d8b11e52da..fc0a759bff 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="Giran">
 		<group>
-			<npc id="30829" x="82239" y="149709" z="-3469" heading="50373" respawnTime="60sec" /> <!-- Cooper - Pet Manager -->
-			<npc id="34217" x="82335" y="149710" z="-3469" heading="49648" respawnTime="60sec" /> <!-- Dresen - Equipment Merchant -->
-			<npc id="30081" x="82436" y="149711" z="-3469" heading="48457" respawnTime="60sec" /> <!-- Helvetia - Grocer -->
-			<npc id="30095" x="82524" y="149709" z="-3469" heading="49151" respawnTime="60sec" /> <!-- Randolf - Warehouse Keeper -->
-			<npc id="30300" x="82622" y="149714" z="-3469" heading="47997" respawnTime="60sec" /> <!-- Pushkin - Blacksmith -->
 			<npc id="20248" x="98302" y="136197" z="-3528" heading="25104" respawnTime="60sec" /> <!-- Turak Bugbear -->
 			<npc id="20249" x="98152" y="134216" z="-3611" heading="49900" respawnTime="60sec" /> <!-- Turak Bugbear Warrior -->
 			<npc id="20248" x="98152" y="134216" z="-3611" heading="49900" respawnTime="60sec" /> <!-- Turak Bugbear -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
new file mode 100644
index 0000000000..03e7f7d54f
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
@@ -0,0 +1,13 @@
+ο»Ώ<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="GiranSquareMerchants">
+		<group>
+			<npc id="30829" x="82224" y="149712" z="-3464" heading="53303" respawnTime="1min" /> <!-- Cooper - Pet Manager -->
+			<npc id="34217" x="82324" y="149712" z="-3464" heading="53376" respawnTime="1min" /> <!-- Dresen - Equipment Merchant -->
+			<npc id="30081" x="82424" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Helvetia - Grocer -->
+			<npc id="30095" x="82524" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Randolf - Warehouse Keeper -->
+			<npc id="30300" x="82624" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Pushkin - Blacksmith -->
+			<!-- <npc id="31049" x="82724" y="149712" z="-3464" heading="53501" respawnTime="1min" /> Pepper - Tattoo Master -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/Aden.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/Aden.xml
index 6b029926fe..e9e483f81a 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/Aden.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/Aden.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="Aden">
 		<group>
-			<npc id="30846" x="147552" y="27274" z="-2204" heading="49151" respawnTime="60sec" /> <!-- Wilbert - Blacksmith -->
-			<npc id="30839" x="147456" y="27256" z="-2204" heading="49151" respawnTime="60sec" /> <!-- Holly - Grocer -->
-			<npc id="30843" x="147362" y="27265" z="-2204" heading="50632" respawnTime="60sec" /> <!-- Romp - Warehouse Keeper -->
-			<npc id="34218" x="147311" y="27307" z="-2203" heading="47671" respawnTime="60sec" /> <!-- Greno - Equipment Merchant -->
-			<npc id="30869" x="147256" y="27353" z="-2204" heading="48698" respawnTime="60sec" /> <!-- Lemper - Pet Manager -->
 			<npc id="32478" x="148465" y="26654" z="-2200" heading="24329" respawnTime="60sec" /> <!-- Game Assistant - Special -->
 			<npc id="33359" x="148465" y="27156" z="-2200" heading="33121" respawnTime="60sec" /> <!-- Kerry - Provisional Clan Hall Gatekeeper -->
 			<npc id="31001" x="145747" y="21312" z="-2136" heading="93" respawnTime="60sec" /> <!-- Claudia Athebaldt -->
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
new file mode 100644
index 0000000000..5d3763faeb
--- /dev/null
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml
@@ -0,0 +1,13 @@
+ο»Ώ<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="AdenSquareMerchants">
+		<group>
+			<npc id="30869" x="147259" y="27356" z="-2200" heading="47094" respawnTime="1min" /> <!-- Lemper - Pet Manager -->
+			<npc id="34218" x="147321" y="27315" z="-2200" heading="41794" respawnTime="1min" /> <!-- Greno - Equipment Merchant -->
+			<npc id="30843" x="147402" y="27277" z="-2200" heading="44416" respawnTime="1min" /> <!-- Romp - Warehouse Keeper -->
+			<npc id="30839" x="147466" y="27255" z="-2200" heading="52721" respawnTime="1min" /> <!-- Holly - Grocer -->
+			<npc id="30846" x="147545" y="27276" z="-2200" heading="55313" respawnTime="1min" /> <!-- Wilbert - Blacksmith -->
+			<!-- <npc id="31051" x="147596" y="27315" z="-2200" heading="55711" respawnTime="1min" /> Keach - Tattoo Master -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml
index d8b11e52da..fc0a759bff 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="Giran">
 		<group>
-			<npc id="30829" x="82239" y="149709" z="-3469" heading="50373" respawnTime="60sec" /> <!-- Cooper - Pet Manager -->
-			<npc id="34217" x="82335" y="149710" z="-3469" heading="49648" respawnTime="60sec" /> <!-- Dresen - Equipment Merchant -->
-			<npc id="30081" x="82436" y="149711" z="-3469" heading="48457" respawnTime="60sec" /> <!-- Helvetia - Grocer -->
-			<npc id="30095" x="82524" y="149709" z="-3469" heading="49151" respawnTime="60sec" /> <!-- Randolf - Warehouse Keeper -->
-			<npc id="30300" x="82622" y="149714" z="-3469" heading="47997" respawnTime="60sec" /> <!-- Pushkin - Blacksmith -->
 			<npc id="20248" x="98302" y="136197" z="-3528" heading="25104" respawnTime="60sec" /> <!-- Turak Bugbear -->
 			<npc id="20249" x="98152" y="134216" z="-3611" heading="49900" respawnTime="60sec" /> <!-- Turak Bugbear Warrior -->
 			<npc id="20248" x="98152" y="134216" z="-3611" heading="49900" respawnTime="60sec" /> <!-- Turak Bugbear -->
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
new file mode 100644
index 0000000000..03e7f7d54f
--- /dev/null
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml
@@ -0,0 +1,13 @@
+ο»Ώ<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="GiranSquareMerchants">
+		<group>
+			<npc id="30829" x="82224" y="149712" z="-3464" heading="53303" respawnTime="1min" /> <!-- Cooper - Pet Manager -->
+			<npc id="34217" x="82324" y="149712" z="-3464" heading="53376" respawnTime="1min" /> <!-- Dresen - Equipment Merchant -->
+			<npc id="30081" x="82424" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Helvetia - Grocer -->
+			<npc id="30095" x="82524" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Randolf - Warehouse Keeper -->
+			<npc id="30300" x="82624" y="149712" z="-3464" heading="53501" respawnTime="1min" /> <!-- Pushkin - Blacksmith -->
+			<!-- <npc id="31049" x="82724" y="149712" z="-3464" heading="53501" respawnTime="1min" /> Pepper - Tattoo Master -->
+		</group>
+	</spawn>
+</list>