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/051-1/forest.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/051-1/forest.txt')
| -rw-r--r-- | world/map/npc/051-1/forest.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt index e0f392ae..e773fb03 100644 --- a/world/map/npc/051-1/forest.txt +++ b/world/map/npc/051-1/forest.txt @@ -9,7 +9,8 @@ // 3: Players unlocked the door //----------------------------------------------------------------------------- -051-1.gat,64,46,0|script|Strange Stone|400,{ +051-1.gat,64,46,0|script|Strange Stone|400, +{ set @step, 1; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if (isin("051-1.gat", 65,45, 67,48) == 0) end; @@ -59,7 +60,8 @@ L_TaskComplete: } // Warp from the forest, to the cave -051-1.gat,66,44,0|script|#ToCave|32767,1,1,{ +051-1.gat,66,44,0|script|#ToCave|32767,1,1, +{ set @step, 1; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if ($@illia_level_1_progress < 2) goto L_Blocked; |