diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
| commit | 2a73e3544d6ac4d4f000c621753d70e8695e203c (patch) | |
| tree | b3784983e268ecf01a506229255116ac64fb0f57 /npc/021-1_Tulimshar | |
| parent | 7464175373616085130e0d2e3b9ddc8e0322f291 (diff) | |
| parent | 3226368a1cd36e4d6e47302493fe5e0e91dddef3 (diff) | |
| download | serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.gz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.bz2 serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.xz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.zip | |
Merge commit 'mainline/master'
Conflicts:
conf/magic.conf
Diffstat (limited to 'npc/021-1_Tulimshar')
| -rw-r--r-- | npc/021-1_Tulimshar/north_shops.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt index cf2dbbe2..51fd1139 100644 --- a/npc/021-1_Tulimshar/north_shops.txt +++ b/npc/021-1_Tulimshar/north_shops.txt @@ -3,10 +3,10 @@ // 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 +021-1.gat,136,38,0 shop Inar 108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-5,DesertHat :-4 // Some general stuff -021-1.gat,128,36,0 shop Imec 162,CoinBag :-4,EmptyBottle :-10,CasinoCoins :10,CottonCloth :-10 +021-1.gat,128,36,0 shop Imec 162,CoinBag :-3,EmptyBottle :-6,CasinoCoins :10,CottonCloth :-6 // A snobby store that won't sell to the player 021-1.gat,138,29,0 script Latoy 106,{ |