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/029-1 | |
| 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/029-1')
| -rw-r--r-- | world/map/npc/029-1/_mobs.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/029-1/barrier.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/029-1/dock.txt | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt index 50ba01a1..e0577f4e 100644 --- a/world/map/npc/029-1/_mobs.txt +++ b/world/map/npc/029-1/_mobs.txt @@ -9,7 +9,8 @@ 029-1.gat,59,51,13,9|monster|LogHead|1025,2,25000,30000,Mob029-1::On1025 -029-1.gat,0,0,0|script|Mob029-1|-1,{ +029-1.gat,0,0,0|script|Mob029-1|-1, +{ On1013: set @mobID, 1013; callfunc "MobPoints"; diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt index 54ef3878..0ed76d2d 100644 --- a/world/map/npc/029-1/barrier.txt +++ b/world/map/npc/029-1/barrier.txt @@ -1,4 +1,5 @@ -029-1.gat,54,37,0|script|#CandorBarrier|45,0,0,{ +029-1.gat,54,37,0|script|#CandorBarrier|45,0,0, +{ if ($@FIGHT_CAVE_STATUS == 1) goto L_Block; warp "029-3.gat", 46, 23; end; diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt index dbc9449d..cf5dd795 100644 --- a/world/map/npc/029-1/dock.txt +++ b/world/map/npc/029-1/dock.txt @@ -1,6 +1,7 @@ // The ferry dock -029-1.gat,22,37,0|script|#candordock|45,2,1,{ +029-1.gat,22,37,0|script|#candordock|45,2,1, +{ set @loc, DOCK_candor; callfunc "Ferry"; } |