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/merchants/socket_enchant.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/merchants/socket_enchant.txt')
| -rw-r--r-- | npc/merchants/socket_enchant.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 546c7c17b..9d90e31aa 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -334,10 +334,10 @@ function script Func_Socket { } } -payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 84 -lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 84 -prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 84 -morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84 +payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 4_M_02 +lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 4_M_02 +prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 4_M_02 +morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 4_M_02 - script Young Man#dummy::SocketMan -1,{ mes "[Young Man]"; @@ -356,7 +356,7 @@ morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84 close; } -prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 97 -payon,143,143,7 duplicate(SocketMan) Young Man#pay 97 -morocc,60,42,3 duplicate(SocketMan) Young Man#moc 97 -lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 97 +prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 4W_M_01 +payon,143,143,7 duplicate(SocketMan) Young Man#pay 4W_M_01 +morocc,60,42,3 duplicate(SocketMan) Young Man#moc 4W_M_01 +lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 4W_M_01 |