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/fields/glastheim.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/fields/glastheim.txt')
| -rw-r--r-- | npc/warps/fields/glastheim.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt index b40cac0b5..1edc677e6 100644 --- a/npc/warps/fields/glastheim.txt +++ b/npc/warps/fields/glastheim.txt @@ -51,7 +51,7 @@ gl_knt02,10,138,0 warp gl14-1 1,1,gl_knt01,7,148 gl_knt02,157,292,0 warp gl16-1 1,1,gl_knt01,150,286 gl_knt02,289,138,0 warp gl17-1 1,1,gl_knt01,292,144 gl_prison,149,183,0 warp gl18-1 1,1,gl_prison1,150,14 -gl_prison,11,70,0 script gl18-2 45,1,1,{ +gl_prison,11,70,0 script gl18-2 WARPNPC,1,1,{ switch(rand(4)) { case 0: warp "gl_cas01",163,193; end; case 1: warp "gl_cas01",238,192; end; |