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/guildcastles.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/guildcastles.txt')
| -rw-r--r-- | npc/warps/guildcastles.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/warps/guildcastles.txt b/npc/warps/guildcastles.txt index 0b8dc0548..a3d00cafb 100644 --- a/npc/warps/guildcastles.txt +++ b/npc/warps/guildcastles.txt @@ -366,7 +366,7 @@ aldeg_cas04,21,123,0 warp aldeg-4-11_aldeg-4-12 1,1,aldeg_cas04,125,168 aldeg_cas04,121,168,0 warp aldeg-4-12_aldeg-4-11 1,1,aldeg_cas04,25,123 aldeg_cas04,156,210,0 warp aldeg-4-13_aldeg-4-5 1,1,aldeg_cas04,169,97 aldeg_cas04,108,210,0 warp aldeg-4-14_aldeg-4-4 1,1,aldeg_cas04,186,92 -aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- 45,1,1,{ +aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- WARPNPC,1,1,{ OnTouch: switch (rand(1,5)) { |