diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/warps/dungeons/prt_maze.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/warps/dungeons/prt_maze.txt')
| -rw-r--r-- | npc/warps/dungeons/prt_maze.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt index 7df4ac094..03ca59de5 100644 --- a/npc/warps/dungeons/prt_maze.txt +++ b/npc/warps/dungeons/prt_maze.txt @@ -106,7 +106,7 @@ prt_maze02,100,182,0 warp mazewarp5202 1,1,prt_maze03,182,88 /*To No.3-15*/ prt_maze03,22,194,0 warp mazewarp5301 1,1,prt_maze03,175,48 /*To No.3-20*/ prt_maze03,5,186,0 warp mazewarp5302 1,1,prt_maze03,151,134 /*To No.3-9*/ //3rd Floor No.02 -prt_maze03,58,194,0 script #mazewarp5303 45,1,1,{ +prt_maze03,58,194,0 script #mazewarp5303 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ @@ -164,7 +164,7 @@ prt_maze03,14,74,0 warp mazewarp5336 1,1,prt_maze03,63,111 /*To No.3-12*/ prt_maze03,14,45,0 warp mazewarp5337 1,1,prt_maze03,88,174 /*To No.3-3*/ prt_maze03,5,58,0 warp mazewarp5338 1,1,prt_maze03,191,15 /*To No.3-25*/ // 3rd Floor No.17 -prt_maze03,74,74,0 script #mazewarp5339 45,1,1,{ +prt_maze03,74,74,0 script #mazewarp5339 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ @@ -180,7 +180,7 @@ prt_maze03,114,56,0 warp mazewarp5343 1,1,prt_maze03,8,140 /*To No.3-6*/ prt_maze03,85,56,0 warp mazewarp5344 1,1,prt_maze03,176,31 /*To No.3-25*/ // 3rd Floor No.19 prt_maze03,137,74,0 warp mazewarp5345 1,1,prt_maze03,102,168 /*To No.3-3*/ -prt_maze03,139,45,0 script #mazewarp5346 45,1,1,{ +prt_maze03,139,45,0 script #mazewarp5346 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ @@ -204,7 +204,7 @@ prt_maze03,99,34,0 warp mazewarp5355 1,1,prt_maze03,98,151 /*To No.3-8*/ prt_maze03,114,22,0 warp mazewarp5356 1,1,prt_maze03,104,71 /*To No.3-18*/ prt_maze03,85,13,0 warp mazewarp5357 1,1,prt_maze03,23,8 /*To No.3-21*/ // 3rd Floor No.24 -prt_maze03,154,22,0 script #mazewarp5358 45,1,1,{ +prt_maze03,154,22,0 script #mazewarp5358 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/ case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/ |