diff options
| author | kenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-17 23:18:33 +0000 |
|---|---|---|
| committer | kenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-17 23:18:33 +0000 |
| commit | 991cacb6b346fad774395b4c192864f224f2d53b (patch) | |
| tree | 2813dc843726a47b02f93238e389207c58e1259a /db/mercenary_db.txt | |
| parent | 6e1ebdd3890e10b0d24c9c833c702b3ede6e0753 (diff) | |
| download | hercules-991cacb6b346fad774395b4c192864f224f2d53b.tar.gz hercules-991cacb6b346fad774395b4c192864f224f2d53b.tar.bz2 hercules-991cacb6b346fad774395b4c192864f224f2d53b.tar.xz hercules-991cacb6b346fad774395b4c192864f224f2d53b.zip | |
Corrected two mercenary names. (bugreport:4976)
Updated Chemical Protection Scrolls bonus script. (bugreport:4944)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15605 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db/mercenary_db.txt')
| -rw-r--r-- | db/mercenary_db.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt index 72a8257e6..8bfd89759 100644 --- a/db/mercenary_db.txt +++ b/db/mercenary_db.txt @@ -30,7 +30,7 @@ 6029,MER_LANCER03,Luise,41,3397,161,2,248,124,36,5,45,1,22,1,40,6,10,0,0,7,20,150,700,432,300 6030,MER_LANCER04,Frank,55,4580,191,2,300,150,39,5,55,2,35,1,50,8,10,0,0,7,20,150,575,432,300 6031,MER_LANCER05,Ryan,60,5899,221,2,350,160,42,10,65,2,39,1,60,10,10,0,0,7,20,150,575,432,300 -6032,MER_LANCER06,Paolo,72,7874,252,2,370,185,46,10,75,3,15,77,61,12,10,0,0,7,20,150,575,432,300 +6032,MER_LANCER06,Thyla,72,7874,252,2,370,185,46,10,75,3,15,77,61,12,10,0,0,7,20,150,575,432,300 6033,MER_LANCER07,Jens,81,10260,330,2,380,190,50,15,85,3,63,20,61,14,10,0,0,7,20,150,450,432,300 6034,MER_LANCER08,Thierry,90,13167,366,2,400,200,55,20,95,20,74,20,63,16,10,0,0,7,20,150,450,432,300 6035,MER_LANCER09,Steven,95,14648,398,2,440,220,60,25,100,25,77,25,63,18,10,0,0,7,20,150,450,432,300 @@ -40,7 +40,7 @@ 6039,MER_SWORDMAN03,Nathan,40,1555,134,2,326,163,36,3,31,45,7,6,40,6,10,0,0,7,20,150,700,432,300 6040,MER_SWORDMAN04,Roan,50,2397,162,2,382,191,39,5,37,59,8,6,40,6,10,0,0,7,20,150,575,432,300 6041,MER_SWORDMAN05,Orizaro,60,3387,195,2,406,203,42,7,48,68,9,6,45,9,10,0,0,7,20,150,575,432,300 -6042,MER_SWORDMAN06,Thyla,70,4495,241,2,436,218,45,12,53,79,10,12,50,9,10,0,0,7,20,150,575,432,300 +6042,MER_SWORDMAN06,Paolo,70,4495,241,2,436,218,45,12,53,79,10,12,50,9,10,0,0,7,20,150,575,432,300 6043,MER_SWORDMAN07,Ben,80,5889,279,2,468,234,47,15,59,88,11,12,55,12,10,0,0,7,20,150,450,432,300 6044,MER_SWORDMAN08,Pinaka,90,7520,325,2,500,250,49,18,70,95,12,18,60,15,10,0,0,7,20,150,450,432,300 6045,MER_SWORDMAN09,Kuhlmann,95,9052,348,2,524,262,51,22,80,95,18,18,60,15,10,0,0,7,20,150,450,432,300 |