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_enchant2.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_enchant2.txt')
| -rw-r--r-- | npc/merchants/socket_enchant2.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index 3ee1b036b..3e7c64808 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -377,10 +377,10 @@ } } -payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86 -lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86 -prt_in,22,60,6 duplicate(SocketEnchant2) Leablem#prt 86 -moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86 +payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 4_M_04 +lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 4_M_04 +prt_in,22,60,6 duplicate(SocketEnchant2) Leablem#prt 4_M_04 +moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 4_M_04 function script Func_Socket2 { |