From 31e2b1f178ebf7f625622a8aff4687373ee8ab8c Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 19 Sep 2021 23:02:21 +0000
Subject: [PATCH] Clan hall auctioneers get town name from fnAgitMap spawn
 value.

---
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../ClanHallAuctioneer.java                   | 61 ++++++++++++++++++-
 .../dist/game/data/spawns/Dion/Dion.xml       |  6 +-
 .../game/data/spawns/Gludin/GludinVillage.xml |  5 ++
 .../dist/game/data/spawns/Gludio/Gludio.xml   | 17 +++---
 21 files changed, 1082 insertions(+), 44 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index fd735bb6cd..e25a8f60d2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 75ce73d138..eaf1654a53 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 75ce73d138..eaf1654a53 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index a8b916705e..99f259ebe2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index e1575721d3..c238f3e148 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index e1575721d3..c238f3e148 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index e1575721d3..c238f3e148 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 58a1832471..670b26f133 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 58a1832471..670b26f133 100644
--- a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 58a1832471..670b26f133 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -77,9 +77,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase());
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -431,6 +432,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 912b9210b3..183b207c78 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index aa905d2406..0eab305e47 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index aa905d2406..0eab305e47 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index aa905d2406..0eab305e47 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index aa905d2406..0eab305e47 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index aa905d2406..0eab305e47 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index ff71c819ff..922243cba8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 4fbb951495..4a327b2c88 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -78,9 +78,10 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 			}
 			case "map":
 			{
+				final String fnAgitMap = npc.getParameters().getString("fnAgitMap", "gludio");
 				htmltext = getHtm(player, "ClanHallAuctioneer-map.html");
-				htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio"));
-				htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName());
+				htmltext = htmltext.replace("%MAP%", fnAgitMap);
+				htmltext = htmltext.replace("%TOWN_NAME%", getTownName(fnAgitMap));
 				break;
 			}
 			case "cancelBid":
@@ -432,6 +433,62 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 		}
 	}
 	
+	private String getTownName(String fnAgitMap)
+	{
+		String name = "";
+		switch (fnAgitMap)
+		{
+			case "aden":
+			{
+				name = "Aden";
+				break;
+			}
+			case "floran":
+			{
+				name = "Floran";
+				break;
+			}
+			case "dion":
+			case "dion01":
+			{
+				name = "Dion";
+				break;
+			}
+			case "giran":
+			{
+				name = "Giran";
+				break;
+			}
+			case "gludin":
+			{
+				name = "Gludin";
+				break;
+			}
+			case "gludio":
+			case "gludio01":
+			{
+				name = "Gludio";
+				break;
+			}
+			case "godard":
+			{
+				name = "Goddard";
+				break;
+			}
+			case "rune":
+			{
+				name = "Rune";
+				break;
+			}
+			case "schuttgart":
+			{
+				name = "Schuttgart";
+				break;
+			}
+		}
+		return name;
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClanHallAuctioneer();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml
index 6488b6b4d3..f1cc29bcc0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml
@@ -2,6 +2,11 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="Dion">
 		<group>
+			<npc id="30767" x="18853" y="145939" z="-3075" heading="49152" respawnTime="60sec"> <!-- Auctioneer -->
+				<parameters>
+					<param name="fnAgitMap" value="dion" />
+				</parameters>
+			</npc>
 			<npc id="30485" x="17725" y="108220" z="-9057" heading="16384" respawnTime="60sec" /> <!-- Belkadhi -->
 			<npc id="30673" x="16460" y="113488" z="-3575" heading="0" respawnTime="60sec" /> <!-- Lorain -->
 			<npc id="31843" x="17719" y="115430" z="-6582" heading="0" respawnTime="180sec" /> <!-- Teleportation Cubic -->
@@ -44,7 +49,6 @@
 			<npc id="30642" x="20000" y="143108" z="-3045" heading="63000" respawnTime="60sec" /> <!-- Chianta -->
 			<npc id="31688" x="16304" y="144288" z="-2992" heading="55000" respawnTime="60sec" /> <!-- Saige -->
 			<npc id="31690" x="16256" y="144256" z="-2992" heading="55000" respawnTime="60sec" /> <!-- Monument of Heroes -->
-			<npc id="30767" x="18853" y="145939" z="-3075" heading="49152" respawnTime="60sec" /> <!-- Auctioneer -->
 			<npc id="30057" x="20777" y="144971" z="-3068" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3068" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30469" x="21040" y="144608" z="-3069" heading="32768" respawnTime="60sec" /> <!-- Jonas -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludin/GludinVillage.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludin/GludinVillage.xml
index 91b5819d5a..c497666333 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludin/GludinVillage.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludin/GludinVillage.xml
@@ -2,6 +2,11 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="GludinVillage">
 		<group>
+			<npc id="30767" x="-81376" y="151715" z="-3132" heading="49152" respawnTime="60sec"> <!-- Auctioneer -->
+				<parameters>
+					<param name="fnAgitMap" value="gludin" />
+				</parameters>
+			</npc>
 			<npc id="30010" x="-81861" y="149197" z="-3120" heading="16384" respawnTime="60sec" /> <!-- Auron -->
 			<npc id="30014" x="-82212" y="149197" z="-3120" heading="16384" respawnTime="60sec" /> <!-- Celma -->
 			<npc id="30022" x="-79256" y="150676" z="-3040" heading="16384" respawnTime="60sec" /> <!-- Zigaunt -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludio/Gludio.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludio/Gludio.xml
index 7301d6dafb..132738df42 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludio/Gludio.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Gludio/Gludio.xml
@@ -2,6 +2,16 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="Gludio">
 		<group>
+			<npc id="30767" x="-14767" y="122955" z="-3120" heading="0" respawnTime="60sec"> <!-- Auctioneer -->
+				<parameters>
+					<param name="fnAgitMap" value="gludio" />
+				</parameters>
+			</npc>
+			<npc id="30767" x="-28276" y="122445" z="-3720" heading="9231" respawnTime="60sec"> <!-- Auctioneer -->
+				<parameters>
+					<param name="fnAgitMap" value="gludio01" />
+				</parameters>
+			</npc>
 			<npc id="30405" x="-115080" y="222168" z="-2930" heading="42000" respawnTime="60sec" /> <!-- Marius -->
 			<npc id="30407" x="-104240" y="222064" z="-3437" heading="16384" respawnTime="60sec" /> <!-- Mesella -->
 			<npc id="30497" x="-114685" y="222291" z="-2925" heading="44000" respawnTime="60sec" /> <!-- Edmond -->
@@ -50,7 +60,6 @@
 			<npc id="30611" x="-93523" y="152513" z="-3623" heading="28672" respawnTime="60sec" /> <!-- Triff -->
 			<npc id="30424" x="-92310" y="154223" z="-3284" heading="57344" respawnTime="60sec" /> <!-- Allana -->
 			<npc id="30428" x="-93275" y="147654" z="-2674" heading="0" respawnTime="60sec" /> <!-- Perrin -->
-			<npc id="30767" x="-81376" y="151715" z="-3132" heading="49152" respawnTime="60sec" /> <!-- Auctioneer -->
 			<npc id="30733" x="-87847" y="250564" z="-3616" heading="4096" respawnTime="60sec" /> <!-- Guard -->
 			<npc id="30733" x="-87406" y="250079" z="-3600" heading="8192" respawnTime="60sec" /> <!-- Guard -->
 			<npc id="30733" x="-75242" y="254590" z="-3310" heading="45056" respawnTime="60sec" /> <!-- Guard -->
@@ -165,7 +174,6 @@
 			<npc id="30506" x="-12788" y="124764" z="-3126" heading="0" respawnTime="60sec" /> <!-- Buka -->
 			<npc id="31688" x="-15120" y="122096" z="-3065" heading="3000" respawnTime="60sec" /> <!-- Saige -->
 			<npc id="31690" x="-15104" y="122040" z="-3059" heading="3000" respawnTime="60sec" /> <!-- Monument of Heroes -->
-			<npc id="30767" x="-14767" y="122955" z="-3120" heading="0" respawnTime="60sec" /> <!-- Auctioneer -->
 			<npc id="30289" x="-12784" y="121709" z="-2952" heading="32768" respawnTime="60sec" /> <!-- Raymond -->
 			<npc id="30030" x="-13269" y="121884" z="-2966" heading="49152" respawnTime="60sec" /> <!-- Vivyan -->
 			<npc id="30345" x="-13487" y="121884" z="-2960" heading="49152" respawnTime="60sec" /> <!-- Ramoniell -->
@@ -190,11 +198,6 @@
 			<npc id="32478" x="-13283" y="124612" z="-3120" heading="48655" respawnTime="60sec" /> <!-- Game Assistant -->
 			<npc id="33359" x="-14764" y="122994" z="-3112" respawnTime="60sec" /> <!-- Kerry -->
 			<npc id="30658" x="-28041" y="121821" z="-3726" heading="16384" respawnTime="60sec" /> <!-- Gupu -->
-			<npc id="30767" x="-28276" y="122445" z="-3720" heading="9231" respawnTime="60sec"> <!-- Auctioneer -->
-				<parameters>
-					<param name="fnAgitMap" value="gludio01" />
-				</parameters>
-			</npc>
 			<npc id="36721" x="-27451" y="122464" z="-3704" heading="61647" respawnTime="60sec" /> <!-- Leina -->
 			<npc id="36722" x="-27637" y="122637" z="-3720" heading="31429" respawnTime="60sec" /> <!-- Bini -->
 			<npc id="36723" x="-28410" y="121621" z="-3704" heading="28798" respawnTime="60sec" /> <!-- Bubek -->