diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/021-1/north_shops.txt | |
parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/021-1/north_shops.txt')
-rw-r--r-- | world/map/npc/021-1/north_shops.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt index 71b9e757..b4e03d28 100644 --- a/world/map/npc/021-1/north_shops.txt +++ b/world/map/npc/021-1/north_shops.txt @@ -5,12 +5,14 @@ // Some clothing 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,{ +021-1.gat,129,40,0|script|Well|400, +{ callfunc "WaterBottle"; } // An officer (for security) -021-1.gat,128,36,0|script|Officer|150,{ +021-1.gat,128,36,0|script|Officer|150, +{ mes "[Officer]"; mes "I'm here for extra security for this market."; close; @@ -18,8 +20,8 @@ // A snobby store that won't sell to the player // takes part in quest given by 021-2/kylian.txt -021-1.gat,138,29,0|script|Latoy|106,{ - +021-1.gat,138,29,0|script|Latoy|106, +{ set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT; set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT); |