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/quests/magic_books.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/quests/magic_books.txt')
-rw-r--r-- | npc/re/quests/magic_books.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index 7962a0544..de846567a 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -14,7 +14,7 @@ //= 1.1a Updated NPC name to "Master Velofos". [Euphy] //============================================================ -geffen_in,176,105,4 script Master Velofos 64,{ +geffen_in,176,105,4 script Master Velofos 1_M_WIZARD,{ if (checkweight(1201,1) == 0) { mes "You're carrying too many items. Please make some room in your bag first."; close; @@ -268,7 +268,7 @@ geffen_in,176,105,4 script Master Velofos 64,{ close; } -geffen_in,175,112,4 script Lea 123,{ +geffen_in,175,112,4 script Lea 2_F_MAGICMASTER,{ if (checkweight(1201,1) == 0) { mes "You're carrying too many items. Please make some room in your bag first."; close; @@ -504,7 +504,7 @@ geffen_in,175,112,4 script Lea 123,{ close; } -mid_camp,255,244,4 script Galfos 735,{ +mid_camp,255,244,4 script Galfos 4_M_JOB_WIZARD,{ if (checkweight(1201,1) == 0) { mes "You're carrying too many items. Please make some room in your bag first."; close; @@ -667,7 +667,7 @@ mid_camp,255,244,4 script Galfos 735,{ close; } -dic_in01,25,190,0 script Mysterious Documents 844,{ +dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ if (isequipped(2782) < 1) { mes "I better not forget to equip my ring."; close; @@ -830,8 +830,8 @@ function script Magic_Book_Essence { mes "Someone already used this area."; close; } -thor_v02,163,104,0 script Powerful Lava Energy#33 844,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; } -thor_v01,185,91,0 script Powerful Flame Energy#33 844,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; } -ice_dun03,137,148,0 script Powerful Glacier Energy 844,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; } -ein_dun02,181,124,0 script Powerful Fossil Energy 844,{ callfunc "Magic_Book_Essence",12221,7312,10,"Fossil"; end; } -gon_dun02,252,198,0 script Powerful Storm Energy#33 844,{ callfunc "Magic_Book_Essence",12222,7266,10,"Storm"; end; } +thor_v02,163,104,0 script Powerful Lava Energy#33 CLEAR_NPC,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; } +thor_v01,185,91,0 script Powerful Flame Energy#33 CLEAR_NPC,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; } +ice_dun03,137,148,0 script Powerful Glacier Energy CLEAR_NPC,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; } +ein_dun02,181,124,0 script Powerful Fossil Energy CLEAR_NPC,{ callfunc "Magic_Book_Essence",12221,7312,10,"Fossil"; end; } +gon_dun02,252,198,0 script Powerful Storm Energy#33 CLEAR_NPC,{ callfunc "Magic_Book_Essence",12222,7266,10,"Storm"; end; } |