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/merchants/refine.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/merchants/refine.txt')
| -rw-r--r-- | npc/re/merchants/refine.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 923e862e6..fa1853520 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -17,15 +17,15 @@ // +11 and above Refiners //============================================================ -prt_in,90,72,5 script Vestri#prt 826,{ +prt_in,90,72,5 script Vestri#prt 4_M_DWARF,{ callfunc "refinenew","Vestri",0; end; } -morocc_in,64,41,5 script Vestri#moc 826,{ +morocc_in,64,41,5 script Vestri#moc 4_M_DWARF,{ callfunc "refinenew","Vestri",0; end; } -payon_in01,18,132,3 script Vestri#pay 826,{ +payon_in01,18,132,3 script Vestri#pay 4_M_DWARF,{ callfunc "refinenew","Vestri",0; end; } @@ -387,13 +387,13 @@ function script refinenew { mes "or "+getitemname(.@i[0])+"."; close; } -prt_in,85,71,5 duplicate(Austri#ref) Austri#prt 826 -payon_in01,14,125,5 duplicate(Austri#ref) Austri#pay 826 -morocc_in,60,38,5 duplicate(Austri#ref) Austri#moc 826 +prt_in,85,71,5 duplicate(Austri#ref) Austri#prt 4_M_DWARF +payon_in01,14,125,5 duplicate(Austri#ref) Austri#pay 4_M_DWARF +morocc_in,60,38,5 duplicate(Austri#ref) Austri#moc 4_M_DWARF // Malangdo Refiner //============================================================ -malangdo,224,172,6 script Clink#mal_normal 544,{ +malangdo,224,172,6 script Clink#mal_normal 4_CAT_SAILOR1,{ disable_items; mes "[Clink]"; mes "My cool dad Holink said I have the world's greatest refine hammer!!"; |