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/pre-re/other/mercenary_rent.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/pre-re/other/mercenary_rent.txt')
| -rw-r--r-- | npc/pre-re/other/mercenary_rent.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt index 938c3dfa7..5c382a0e0 100644 --- a/npc/pre-re/other/mercenary_rent.txt +++ b/npc/pre-re/other/mercenary_rent.txt @@ -11,5 +11,5 @@ //= 1.0 First version. [Daegaladh] //============================================================ -izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 734 -izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892 +izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 4_M_JOB_KNIGHT2 +izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUGRANMA |