summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKisuka <kisuka@kisuka.com>2014-08-14 15:44:14 -0700
committerKisuka <kisuka@kisuka.com>2014-08-14 15:44:14 -0700
commit87125192b6598999b215a35b63de8d3214b2c5e0 (patch)
treef3cef27df8cc6945d569c8eea720543b42d15932
parent7f4d6fc1cb21da16e30eb5a5848f550d7d41d3e3 (diff)
parent9cd3ec094633e1ec761003dd9a97be2fac504727 (diff)
downloadhercules-87125192b6598999b215a35b63de8d3214b2c5e0.tar.gz
hercules-87125192b6598999b215a35b63de8d3214b2c5e0.tar.bz2
hercules-87125192b6598999b215a35b63de8d3214b2c5e0.tar.xz
hercules-87125192b6598999b215a35b63de8d3214b2c5e0.zip
Merge pull request #320 from nadiyama/master
Corrected doppelganger mercenary HP
-rw-r--r--db/mercenary_db.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 829a898c9..6adbae8ee 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -8,7 +8,7 @@
1506,DISGUISE,Disguise,55,7543,180,2,279,546,18,29,0,72,45,35,48,65,10,12,1,6,82,147,516,768,384
1275,ALICE,Alice,62,10000,221,2,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,200,502,2304,480
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
+1966,M_DOPPELGANGER,Doppelganger,72,7800,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