summaryrefslogtreecommitdiff
path: root/db/mercenary_skill_db.txt
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-03 02:24:34 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-03 02:24:34 +0000
commit8858572dd6887a2c41f9b4d64df3e1491dd3c452 (patch)
treec08ee6d76638d143b4737c813e25d96bdd119e48 /db/mercenary_skill_db.txt
parentb4bcbd1a2dca417a61f70eb9d1524fa92b2e0aa9 (diff)
downloadhercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.tar.gz
hercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.tar.bz2
hercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.tar.xz
hercules-8858572dd6887a2c41f9b4d64df3e1491dd3c452.zip
Updated some more cash shop boxes to use rentitem instead of getitem.
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem. Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555) Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586) Corrected a typo in the christmas_2008 event. (bugreport:4600) Changed which White Lady spawns in endless tower. (bugreport:4601) Also added Quest Log Entries to Endless Tower, please test. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db/mercenary_skill_db.txt')
-rw-r--r--db/mercenary_skill_db.txt23
1 files changed, 22 insertions, 1 deletions
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index 533fb5004..71462aa79 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -114,8 +114,29 @@
6046,8201,10 //MS_BASH
6046,8206,1 //MS_BERSERK
// Monster Mercenaries
-// Wild Rose
+// MIMIC
+1191,8233,1 //MER_AUTOBERSERK
+1191,8220,5 //ML_AUTOGUARD
+1191,8201,5 //MS_BASH
+// DISGUISE
+1506,8223,2 //MER_QUICKEN
+1506,8225,5 //MER_CRASH
+1506,8236,3 //MER_LEXDIVINA
+// ALICE
+1275,8232,5 //MER_PROVOKE
+1275,8202,5 //MS_MAGNUM
+1275,8217,5 //ML_BRANDISH
+1275,8226,1 //MER_REGAIN
+// M_WILD_ROSE
1965,8201,5 //MS_BASH
+// M_DOPPELGANGER
+1966,8223,5 //MER_QUICKEN
+1966,8201,5 //MS_BASH
+1966,8221,3 //ML_DEVOTION
+// M_YGNIZEM
+1967,8223,5 //MER_QUICKEN
+1967,8201,5 //MS_BASH
+1967,8221,3 //ML_DEVOTION
// M_GAMEMASTER
2000,8226,1 //MER_REGAIN
2000,8227,1 //MER_TENDER