summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/mercenary_skill_db.txt77
1 files changed, 65 insertions, 12 deletions
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index ea692641d..b7da95bd8 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -120,6 +120,20 @@
6046,8201,10 //MS_BASH
6046,8206,1 //MS_BERSERK
+// Game Master Mercenaries
+// 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
+
// Monster Mercenaries
// MIMIC
1191,8233,1 //MER_AUTOBERSERK
@@ -144,18 +158,6 @@
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
-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
// M_MIMIC
2058,8233,1 //MER_AUTOBERSERK
2058,8220,5 //ML_AUTOGUARD
@@ -169,3 +171,54 @@
2060,8202,5 //MS_MAGNUM
2060,8217,5 //ML_BRANDISH
2060,8226,1 //MER_REGAIN
+// M_WANDER_MAN
+2213,8223,10 //MER_QUICKEN
+2213,8204,4 //MS_PARRYING
+2213,8233,1 //MER_AUTOBERSERK
+2213,8203,5 //MS_BOWLINGBASH
+// M_WICKED_NYMPH
+2214,8236,3 //MER_LEXDIVINA
+2214,8239,5 //MER_BLESSING
+2214,8227,1 //MER_TENDER
+2214,8222,1 //MER_MAGNIFICAT
+// M_KASA
+2215,8225,5 //MER_CRASH
+2215,8202,5 //MS_MAGNUM
+2215,8226,1 //MER_REGAIN
+2215,8233,1 //MER_AUTOBERSERK
+// M_SALAMANDER
+2216,8201,5 //MS_BASH
+2216,8217,5 //ML_BRANDISH
+2216,8233,1 //MER_AUTOBERSERK
+2216,8228,1 //MER_BENEDICTION
+// M_TEDDY_BEAR
+2217,8221,3 //ML_DEVOTION
+2217,8226,1 //MER_REGAIN
+2217,8219,1 //ML_DEFENDER
+2217,8235,1 //MER_SCAPEGOAT
+// M_BAPHOMET_
+2325,8201,5 //MS_BASH
+2325,8223,10 //MER_QUICKEN
+// M_GALAPAGO
+2326,8239,5 //MER_BLESSING
+2326,28,5 //AL_HEAL
+// MER_DIABOLIC
+2342,8225,5 //MER_CRASH
+2342,8202,5 //MS_MAGNUM
+2342,8226,1 //MER_REGAIN
+2342,8233,1 //MER_AUTOBERSERK
+// MER_ZHERLTHSH
+2345,8225,5 //MER_CRASH
+2345,8202,5 //MS_MAGNUM
+2345,8226,1 //MER_REGAIN
+2345,8233,1 //MER_AUTOBERSERK
+// MER_EDDGA
+2347,8225,5 //MER_CRASH
+2347,8202,5 //MS_MAGNUM
+2347,8226,1 //MER_REGAIN
+2347,8233,1 //MER_AUTOBERSERK
+// MER_ANTLER_SCARABA
+2378,8221,3 //ML_DEVOTION
+2378,8226,1 //MER_REGAIN
+2378,8219,1 //ML_DEFENDER
+2378,8235,1 //MER_SCAPEGOAT