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/005-1/npcs.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/005-1/npcs.txt')
| -rw-r--r-- | world/map/npc/005-1/npcs.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt index 2c40697f..499b637e 100644 --- a/world/map/npc/005-1/npcs.txt +++ b/world/map/npc/005-1/npcs.txt @@ -2,14 +2,16 @@ 005-1.gat,69,76,0|shop|George|115,ShortBow :-1,Arrow :1,IronArrow :-1,Beer :-1,ChickenLeg :-2 -005-1.gat,66,75,0|script|Kieron|132,{ +005-1.gat,66,75,0|script|Kieron|132, +{ mes "[Kieron]"; mes "\"Be careful if you're going in that cave,"; mes "it's packed full of monsters.\""; close; } -005-1.gat,91,23,0|script|William|131,{ +005-1.gat,91,23,0|script|William|131, +{ mes "[William]"; mes "\"Going in the cave?"; mes "You better watch your step, last time I checked it was full of monsters!\""; |