Merge commit 'mainline/master'

Conflicts:
	db/item_db.txt

1 files changed, 38 insertions, 0 deletions

diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt
new file mode 100644
index 00000000..9d409616
--- /dev/null
+++ b/npc/021-1_Tulimshar/north_shops.txt
@@ -0,0 +1,38 @@
+// Northern shopping plaza
+
+// 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,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-8,DesertHat :-6
+
+// Some general stuff
+021-1.gat,128,36,0	shop	Imec	162,CoinBag :-4,EmptyBottle :-10,CasinoCoins :10,CottonCloth :-10
+
+// A snobby store that won't sell to the player
+021-1.gat,138,29,0	script	Latoy	106,{
+	mes "[Latoy]";
+	mes "\"There's nothing here you could want or afford.\"";
+}
+
+// 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";
+}
+
+// An officer (for security)
+021-1.gat,130,38,0	script	Officer	150,{
+	mes "[Officer]";
+	mes "I'm here for extra secutiry for this market.";
+}