Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/item_db.txt

1 files changed, 12 insertions, 29 deletions

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;
-}