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/022-1 | |
| 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/022-1')
| -rw-r--r-- | world/map/npc/022-1/mapflags.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/022-1/tutorial.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/022-1/mapflags.txt b/world/map/npc/022-1/mapflags.txt index f1b0444b..cb3434b7 100644 --- a/world/map/npc/022-1/mapflags.txt +++ b/world/map/npc/022-1/mapflags.txt @@ -1,2 +1,2 @@ -022-1.gat mapflag no_player_drops -022-1.gat mapflag town +022-1.gat|mapflag|no_player_drops +022-1.gat|mapflag|town diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt index 1ecbb1a8..b8fcf2c6 100644 --- a/world/map/npc/022-1/tutorial.txt +++ b/world/map/npc/022-1/tutorial.txt @@ -2,7 +2,7 @@ // Author: Jenalya // if you enter the tutorial area from outside, it is set to be already done -022-1.gat,19,37,0|script|#tutorial|45,0,2 +022-1.gat,19,37,0|script|#tutorial-outside1|45,0,2 { callfunc "TutorialCompleted"; warp "042-1.gat", 95, 69; |