summaryrefslogtreecommitdiff
path: root/db/mercenary_skill_db.txt
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-26 22:36:41 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-26 22:36:41 +0000
commit6096ce0b42a3eee07dc70ae5ef489aa4c30bf515 (patch)
treee91f8afd3b7b8b80f0c55aae07f7a478f469c37a /db/mercenary_skill_db.txt
parent23e1b7db5ba2277a406fc84c30e87c324a83097c (diff)
downloadhercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.gz
hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.bz2
hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.tar.xz
hercules-6096ce0b42a3eee07dc70ae5ef489aa4c30bf515.zip
* Merged changes from trunk [14496:14630/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14632 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