NPC changes

11 files changed, 48 insertions, 55 deletions

diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index 6af33f2f..ad0e80b4 100644
--- a/world/map/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
@@ -21,20 +21,25 @@
 }
 
 // Guards by the gates to East Tulimshar
+021-1.gat,146,23,0|script|Guard|104,{
+    mes "[Guard]";
+    mes "\"I make sure less desirables don't enter the Noble District.\"";
+    close;
+}
 021-1.gat,156,42,0|script|Guard|104,{
     mes "[Guard]";
-    mes "\"It's still a mess in East Tulimshar. The volcano and earthquake did a lot of damage.\"";
+    mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
     close;
 }
 
 021-1.gat,156,95,0|script|Guard|104,{
     mes "[Guard]";
-    mes "\"It can get quite dangerous east of town. But for now, the passage is closed.\"";
+    mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
     close;
 }
 
 // Near the bazaar, outside the government building
-021-1.gat,58,135,0|script|Guard|123,{
+021-1.gat,55,136,0|script|Guard|123,{
     mes "[Guard]";
     mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
     close;
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index 5ad150f8..ac541c87 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -10,7 +10,7 @@ OnInit:
     end;
 }
 
-021-1.gat,128,36,0|script|Imec|162,{
+021-1.gat,120,33,0|script|Imec|162,{
 
     set @state, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);
     set @money, 500;
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 75df89e0..71b9e757 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -3,7 +3,18 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,136,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
+021-1.gat,135,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
+
+021-1.gat,129,40,0|script|Well|400,{
+    callfunc "WaterBottle";
+}
+
+// An officer (for security)
+021-1.gat,128,36,0|script|Officer|150,{
+    mes "[Officer]";
+    mes "I'm here for extra security for this market.";
+    close;
+}
 
 // A snobby store that won't sell to the player
 // takes part in quest given by 021-2/kylian.txt
@@ -25,31 +36,3 @@ L_Close:
     close;
 }
 
-// A barber (later we can make it so certain styles need to come from him, for a price)
-021-1.gat,119,29,0|script|Issay|156,{
-    mes "[Issay the Barber]";
-    mes "\"Do you need a change of style?\"";
-    next;
-    callfunc "Barber";
-    mes "[Issay the Barber]";
-    mes "\"Come again!\"";
-    close;
-}
-
-// Another banker
-021-1.gat,122,32,0|script|Hydusun|149,{
-    set @npcname$, "Hydusun";
-    callfunc "Banker";
-    close;
-}
-
-021-1.gat,129,40,0|script|Well|400,{
-    callfunc "WaterBottle";
-}
-
-// An officer (for security)
-021-1.gat,130,38,0|script|Officer|150,{
-    mes "[Officer]";
-    mes "I'm here for extra security for this market.";
-    close;
-}
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt
index 89a3111e..662a69e2 100644
--- a/world/map/npc/021-1/npcs.txt
+++ b/world/map/npc/021-1/npcs.txt
@@ -10,7 +10,7 @@
     close;
 }
 
-021-1.gat,75,67,0|script|Silvia|207,{
+021-1.gat,76,67,0|script|Silvia|207,{
     set @npcname$, "Silvia";
 
     mes "[" + @npcname$ + "]";
@@ -22,7 +22,7 @@
     close;
 }
 
-021-1.gat,45,77,0|script|Pauline|208,{
+021-1.gat,55,66,0|script|Pauline|208,{
     set @npcname$, "Pauline";
 
     mes "[" + @npcname$ + "]";
@@ -32,7 +32,7 @@
     close;
 }
 
-021-1.gat,49,123,0|script|Michel|215,{
+021-1.gat,51,123,0|script|Michel|215,{
     set @npcname$, "Michel";
 
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/021-1/royal_guards.txt b/world/map/npc/021-1/royal_guards.txt
deleted file mode 100644
index 1920e43b..00000000
--- a/world/map/npc/021-1/royal_guards.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-
-021-1.gat,141,23,0|script|Guard|126,{
-    mes "[Guard]";
-    mes "\"Stay away.\"";
-    close;
-}
-
-021-1.gat,147,23,0|script|Guard|126,{
-    mes "[Guard]";
-    mes "\"Stay away.\"";
-    close;
-}
diff --git a/world/map/npc/021-2/bank.txt b/world/map/npc/021-2/bank.txt
new file mode 100644
index 00000000..5ebbe5ea
--- /dev/null
+++ b/world/map/npc/021-2/bank.txt
@@ -0,0 +1,7 @@
+// Another banker
+021-2.gat,69,135,0|script|Hydusun|149,{
+    set @npcname$, "Hydusun";
+    callfunc "Banker";
+    close;
+}
+
diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/021-2/barber.txt
new file mode 100644
index 00000000..d0ff401e
--- /dev/null
+++ b/world/map/npc/021-2/barber.txt
@@ -0,0 +1,11 @@
+// A barber (later we can make it so certain styles need to come from him, for a price)
+021-2.gat,72,101,0|script|Issay|156,{
+    mes "[Issay the Barber]";
+    mes "\"Do you need a change of style?\"";
+    next;
+    callfunc "Barber";
+    mes "[Issay the Barber]";
+    mes "\"Come again!\"";
+    close;
+}
+
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 526e64e0..681f40df 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -1,6 +1,6 @@
 //Items for NPC are incomplete.  Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
 
-021-2.gat,29,55,0|script|Heathin|147,{
+021-2.gat,70,129,0|script|Heathin|147,{
 
     set @TARROW_REQ_TERRA_ORE, 1;
     set @TARROW_REQ_COAL, 5;
diff --git a/world/map/npc/021-2/workshop.txt b/world/map/npc/021-2/hotel_receptionist.txt
index ed23ab5b..0a7fcbb2 100644
--- a/world/map/npc/021-2/workshop.txt
+++ b/world/map/npc/021-2/hotel_receptionist.txt
@@ -3,9 +3,9 @@
 // The receptionist
 021-2.gat,22,63,0|script|Sonir|118,{
     mes "[Sonir]";
-    mes "\"This is Tulimshar's main workshop. Much crafting happens here.\"";
+    mes "\"Welcome to The Wizards's Rest!\"";
     next;
     mes "[Sonir]";
-    mes "\"We also have limited housing on the second floor.\"";
+    mes "\"We have limited housing on the second floor.\"";
     close;
-}
\ No newline at end of file
+}
diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index 946bdb33..4a70730c 100644
--- a/world/map/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
@@ -1,7 +1,7 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings.  Are they related to stats, tiers of power, schools of magic?
 
-021-2.gat,43,62,0|script|Inya|106,{
+021-2.gat,80,134,0|script|Inya|106,{
 
     mes "[Inya]";
     mes "\"I am Inya, a jeweler of fine rings.  If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\"";
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index 32f043f3..1bffd0eb 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -1,6 +1,6 @@
 // Ingot maker takes iron ore, gives ingots for future crafting purposes.
 
-021-2.gat,23,55,0|script|Jhedia|160,{
+021-2.gat,70,124,0|script|Jhedia|160,{
 
     set @Cost_Per_Ingot, 1000;
     set @Iron_Ore_Per, 5;