diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
| commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
| tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/005-1/npcs.txt | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-2011.09.08.tar.gz serverdata-2011.09.08.tar.bz2 serverdata-2011.09.08.tar.xz serverdata-2011.09.08.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/005-1/npcs.txt')
| -rw-r--r-- | world/map/npc/005-1/npcs.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt index d8f08cc1..2c40697f 100644 --- a/world/map/npc/005-1/npcs.txt +++ b/world/map/npc/005-1/npcs.txt @@ -1,15 +1,15 @@ // -005-1.gat,69,76,0 shop George 115,ShortBow :-1,Arrow :1,IronArrow :-1,Beer :-1,ChickenLeg :-2 +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!\""; |