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/re/guides/guides_izlude.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/re/guides/guides_izlude.txt')
-rw-r--r-- | npc/re/guides/guides_izlude.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt index 793a6ab77..a3a37537b 100644 --- a/npc/re/guides/guides_izlude.txt +++ b/npc/re/guides/guides_izlude.txt @@ -192,16 +192,16 @@ L_Mark: return; } -izlude,129,175,4 duplicate(GuideIzlude) Guide#01izlude 105 -izlude_a,129,175,4 duplicate(GuideIzlude) Guide#01izlude_a 105 -izlude_b,129,175,4 duplicate(GuideIzlude) Guide#01izlude_b 105 -izlude_c,129,175,4 duplicate(GuideIzlude) Guide#01izlude_c 105 -izlude_d,129,175,4 duplicate(GuideIzlude) Guide#01izlude_d 105 +izlude,129,175,4 duplicate(GuideIzlude) Guide#01izlude 8W_SOLDIER +izlude_a,129,175,4 duplicate(GuideIzlude) Guide#01izlude_a 8W_SOLDIER +izlude_b,129,175,4 duplicate(GuideIzlude) Guide#01izlude_b 8W_SOLDIER +izlude_c,129,175,4 duplicate(GuideIzlude) Guide#01izlude_c 8W_SOLDIER +izlude_d,129,175,4 duplicate(GuideIzlude) Guide#01izlude_d 8W_SOLDIER -izlude,133,113,4 duplicate(GuideIzlude) Guide#02izlude 105 -izlude_a,133,113,4 duplicate(GuideIzlude) Guide#02izlude_a 105 -izlude_b,133,113,4 duplicate(GuideIzlude) Guide#02izlude_b 105 -izlude_c,133,113,4 duplicate(GuideIzlude) Guide#02izlude_c 105 -izlude_d,133,113,4 duplicate(GuideIzlude) Guide#02izlude_d 105 +izlude,133,113,4 duplicate(GuideIzlude) Guide#02izlude 8W_SOLDIER +izlude_a,133,113,4 duplicate(GuideIzlude) Guide#02izlude_a 8W_SOLDIER +izlude_b,133,113,4 duplicate(GuideIzlude) Guide#02izlude_b 8W_SOLDIER +izlude_c,133,113,4 duplicate(GuideIzlude) Guide#02izlude_c 8W_SOLDIER +izlude_d,133,113,4 duplicate(GuideIzlude) Guide#02izlude_d 8W_SOLDIER -//izlude,120,206,4 duplicate(GuideIzlude) Guide#03izlude 105 +//izlude,120,206,4 duplicate(GuideIzlude) Guide#03izlude 8W_SOLDIER |