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/020-2/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/020-2/shops.txt')
-rw-r--r-- | world/map/npc/020-2/shops.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/020-2/shops.txt b/world/map/npc/020-2/shops.txt index 3cb03c7d..80399668 100644 --- a/world/map/npc/020-2/shops.txt +++ b/world/map/npc/020-2/shops.txt @@ -1,7 +1,8 @@ // Snow town shops // About the Area NPC -020-2.gat,75,28,0|script|Taylor|137,{ +020-2.gat,75,28,0|script|Taylor|137, +{ mes "[Taylor]"; mes "\"While it can be dangerous up here in Kaizei, I take comfort that Nivalis is not surrounded by the Yeti like Thermin is. What a weird town.\""; next; @@ -18,7 +19,8 @@ 020-2.gat,75,24,0|shop|Mede|103,CactusDrink :-1, CactusPotion :-1, IronPotion :-1, ConcentrationPotion :-1 // INN -020-2.gat,111,23,0|script|Kane|120,{ +020-2.gat,111,23,0|script|Kane|120, +{ set @npcname$, "Kane the Inn Keeper"; set @cost, 100; |