summaryrefslogtreecommitdiff
path: root/db/mercenary_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_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_db.txt')
-rw-r--r--db/mercenary_db.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 23bd4970d..e9aacd4b2 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -6,6 +6,8 @@
1965,M_WILD_ROSE,Wild Rose,38,2980,130,2,315,360,0,15,65,85,15,35,65,80,10,12,0,2,24,100,964,864,288
1966,M_DOPPELGANGER,Doppelganger,72,249000,200,2,1340,1590,60,35,88,90,30,35,125,65,10,12,1,6,67,100,480,480,288
1967,M_YGNIZEM,Egnigem Cenia,58,11200,320,2,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,145,576,432,288
+2000,M_GAMEMASTER,[GM] Game Master,50,7000,250,2,100,50,6,17,1,109,1,60,215,111,10,0,0,7,20,150,450,432,300
+2001,F_GAMEMASTER,[GM] Game Master,50,7000,250,2,100,50,6,17,1,109,1,60,215,111,10,0,0,7,20,150,450,432,300
// Normal Mercenaries
6017,MER_ARCHER01,Mina,20,256,200,10,170,85,7,5,1,16,5,1,28,8,10,0,0,7,20,150,700,432,300
6018,MER_ARCHER02,Dororu,30,457,70,10,228,114,11,7,1,18,8,1,40,11,10,0,0,7,20,150,700,432,300