diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/009-4/waric.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/009-4/waric.txt')
| -rw-r--r-- | world/map/npc/009-4/waric.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt index 9231bb94..13187203 100644 --- a/world/map/npc/009-4/waric.txt +++ b/world/map/npc/009-4/waric.txt @@ -19,7 +19,7 @@ close; } -009-4.gat,120,43,0|script|Orum|158, +009-4.gat,120,43,0|script|Orum#trap|158, { mes "[Orum]"; mes "\"I told you to forget about this place but you did not heed my advice!\""; @@ -28,7 +28,7 @@ close; } -009-4.gat,118,42,0|script|Waric|153, +009-4.gat,118,42,0|script|Waric#trap|153, { set @EXP_LEARNED_ALOT, 10000; if (OrumQuest >= 13) |