summaryrefslogtreecommitdiff
path: root/db/mercenary_skill_db.txt
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-07 23:45:49 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-07 23:45:49 +0000
commita1b41fc31ea08bd869e609bb41dd8ba011dcbb66 (patch)
tree1998a7d08771a1e22163727db9b6018186f1b0fb /db/mercenary_skill_db.txt
parent5fd92c094561f989546694d6a80a4adf1609eca2 (diff)
downloadhercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.tar.gz
hercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.tar.bz2
hercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.tar.xz
hercules-a1b41fc31ea08bd869e609bb41dd8ba011dcbb66.zip
Merged database changes from trunk r14927.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14927 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db/mercenary_skill_db.txt')
-rw-r--r--db/mercenary_skill_db.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index 71462aa79..438b7e656 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -149,3 +149,16 @@
2001,8238,5 //MER_KYRIE
2001,8239,5 //MER_BLESSING
2001,8240,5 //MER_INCAGI
+// M_MIMIC
+2058,8233,1 //MER_AUTOBERSERK
+2058,8220,5 //ML_AUTOGUARD
+2058,8201,5 //MS_BASH
+// M_DISGUISE
+2059,8223,2 //MER_QUICKEN
+2059,8225,5 //MER_CRASH
+2059,8236,3 //MER_LEXDIVINA
+// M_ALICE
+2060,8232,5 //MER_PROVOKE
+2060,8202,5 //MS_MAGNUM
+2060,8217,5 //ML_BRANDISH
+2060,8226,1 //MER_REGAIN