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/other/resetskill.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/other/resetskill.txt')
| -rw-r--r-- | npc/re/other/resetskill.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/other/resetskill.txt b/npc/re/other/resetskill.txt index 7e14c9537..f3415e6c9 100644 --- a/npc/re/other/resetskill.txt +++ b/npc/re/other/resetskill.txt @@ -13,7 +13,7 @@ //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ -izlude,127,175,3 script Hypnotist#novice 124,{ +izlude,127,175,3 script Hypnotist#novice 4_F_TELEPORTER,{ mes "[Hypnotist]"; mes "Greetings, adventurer."; mes "I'm a member of the Hypnotist"; @@ -141,7 +141,7 @@ izlude,127,175,3 script Hypnotist#novice 124,{ close; } } -izlude_a,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_a 124 -izlude_b,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_b 124 -izlude_c,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_c 124 -izlude_d,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_d 124 +izlude_a,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_a 4_F_TELEPORTER +izlude_b,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_b 4_F_TELEPORTER +izlude_c,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_c 4_F_TELEPORTER +izlude_d,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_d 4_F_TELEPORTER |