summaryrefslogtreecommitdiff
path: root/db/mercenary_skill_db.txt
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-07-31 01:50:57 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-07-31 01:50:57 +0000
commit9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba (patch)
tree11806685224fc447d19fc10d70c6804d1eb4a853 /db/mercenary_skill_db.txt
parent8c57f9decf3895c9081aa70bafd3ee949273030f (diff)
downloadhercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.tar.gz
hercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.tar.bz2
hercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.tar.xz
hercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.zip
* Implemented three new mercenary skills.
* Added two new monster mercenaries. - Added information for the three new mercenary skills. - Added mercenary skills with cast times to castnodex. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14367 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db/mercenary_skill_db.txt')
-rw-r--r--db/mercenary_skill_db.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index e1b8a20c1..533fb5004 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -116,3 +116,15 @@
// Monster Mercenaries
// Wild Rose
1965,8201,5 //MS_BASH
+// M_GAMEMASTER
+2000,8226,1 //MER_REGAIN
+2000,8227,1 //MER_TENDER
+2000,8238,5 //MER_KYRIE
+2000,8239,5 //MER_BLESSING
+2000,8240,5 //MER_INCAGI
+// F_GAMEMASTER
+2001,8226,1 //MER_REGAIN
+2001,8227,1 //MER_TENDER
+2001,8238,5 //MER_KYRIE
+2001,8239,5 //MER_BLESSING
+2001,8240,5 //MER_INCAGI