summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
authorj-tkay <j-tkay@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-11 18:38:42 +0000
committerj-tkay <j-tkay@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-11 18:38:42 +0000
commit9c09b5aa848716f478b55624a7fb1bd1bc5fba82 (patch)
tree7dbde590198fc0009f9b0228a20eb5c06a8e3bc1 /npc/pre-re
parent46f88c20bf7d33a6562247844c5e094c47f4cb2e (diff)
downloadhercules-9c09b5aa848716f478b55624a7fb1bd1bc5fba82.tar.gz
hercules-9c09b5aa848716f478b55624a7fb1bd1bc5fba82.tar.bz2
hercules-9c09b5aa848716f478b55624a7fb1bd1bc5fba82.tar.xz
hercules-9c09b5aa848716f478b55624a7fb1bd1bc5fba82.zip
- Fixed bugreport:6993, invalid item id in mercenary script. (other/mercenary_rent.txt)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17016 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/other/mercenary_rent.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index c45fa7b8b..26520994b 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -13,5 +13,5 @@
//= 1.0 First version. [Daegaladh]
//============================================================
-izlude,47,139,5 duplicate(Mercenary_Manager_Sword) Mercenary Manager#Sword 734
+izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 734
izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892