Replace Mercenary DB

1 files changed, 20 insertions, 16 deletions

diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 2380a1613..ede763825 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -4,21 +4,25 @@
 // ID,Sprite_Name,Name,LV,HP,SP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Speed,aDelay,aMotion,dMotion
 // Mercenaries IDs begin at 1191 for hardcoded reasons?
 
-1191,Merc,Merc,51,6120,187,2,150,900,10,40,44,121,1,60,75,110,10,12,1,0,60,100,972,500,288
-
 //ID,Sprite_Name     ,Name          ,LV ,  HP,SP,RG,ATK1,ATK2,DEF,MDF,STR,AGI,VIT,INT,DEX,LUK,Rg2,Rg3,Scale,Rc,Ele,Spd,aDelay,aMotion,dMotion
-1192,Merc_AndreiSakar,Andrei Sakar  ,100, 688,133,1,413,413, 36,26,  4,67,10,26,99,70, 10,12,1,11,45,150, 114, 114,200
-1193,Merc_DragonStar,Dragon Star    , 75,4305,892,1,538,538,192,89, 77,86, 1, 1,15,32, 10,12,1,11,45,150, 556, 480,140
-1194,Merc_Aisen,Aisen               , 70,4774,840,1,534,534,172,84, 63,75,20, 1,35,31, 10,12,1,11,45,152, 600, 480,160
-1195,Merc_Msawis,Msawis             , 62,4278,756,1,379,409,152,75, 62,74,20, 1,19, 1, 10,12,1,11,45,152, 604, 480,160
-1196,Merc_Saulc,Saulc               , 53,3690,793,1,320,200,132,79, 36,60,20,22,27,10, 10,12,1,11,45,152, 660, 480,180
-1197,Merc_Crazyfefe,Crazyfefe       , 51,3625,799,1,247,125,102,80, 54,17,22,28,35,17, 10,12,1,11,45,152, 822, 480,180
-1198,Merc_LawnCable,LawnCable       , 42,2744,540,1,297,132, 92,54, 39,38, 9, 2,32,12, 10,12,1,11,45,152, 748, 480,180
-1199,Merc_Demure,Demure             , 39,3036,504,1,245,125, 82,50, 15,36,30, 1,33, 6, 10,12,1,11,45,152, 756, 480,200
-1200,Merc_Pookie,Pookie             , 39,2369,504,1,265,125, 72,50, 44,48, 1, 1, 2, 1, 10,12,1,11,45,152, 708, 480,200
-1201,Merc_Jesusalva,Jesusalva       , 37,2618,484,1,230,125, 62,48, 24,31,17, 1,32,15, 10,12,1,11,45,152, 776, 480,200
-1202,Merc_GonzoDark,GonzoDark       , 23,1740,336,1,156, 35, 52,34, 24,10,15, 1,22, 1, 10,12,1,11,45,152, 860, 480,200
-1203,Merc_Apane,Legendary Apane     ,  8, 787,181,1, 73, 35, 42,18,  3, 1, 4, 1,24, 1, 10,12,1,11,45,152, 896, 480,200
-1204,Merc_Soren,Soren               ,  4, 561,141,2, 25, 25, 32,14,  1, 1, 1, 1, 1, 1, 10,12,1,11,45,152, 896, 480,200
-1205,Merc_Swezanne,Swezanne         , 61,4248,797,1,381,381,147,80, 54,70,20, 8,27,14, 10,12,1,11,45,152, 621, 480,160
 
+1191,Merc_Woody,Woody               ,80,4959,840,1,428,440,708,203,72,66,41,30,55,33,10,12,1,11,45,152,525,480,160
+1192,Merc_AndreiSakar,Andrei Sakar  ,100,688,133,1,413,413,36,26,4,67,10,26,99,70,10,12,1,11,45,150,114,114,200
+1193,Merc_Lilanna,Lilanna           ,90,4495,920,1,458,467,611,236,76,70,50,40,66,41,10,12,1,11,45,152,500,480,160
+1194,Merc_Aisen,Aisen               ,70,4774,740,1,406,427,517,172,63,75,20,1,35,31,10,12,1,11,45,152,600,480,160
+1195,Merc_Msawis,Msawis             ,62,4278,676,1,379,409,444,148,62,74,20,1,19,1,10,12,1,11,45,152,604,480,160
+1196,Merc_Saulc,Saulc               ,53,3690,560,1,341,366,364,121,36,60,20,22,27,10,10,12,1,11,45,152,660,480,180
+1197,Merc_Crazyfefe,Crazyfefe       ,51,3625,568,1,332,357,347,115,54,17,22,28,35,17,10,12,1,11,45,152,822,480,180
+1198,Merc_LawnCable,LawnCable       ,42,2744,496,1,285,309,272,90,39,38,9,2,32,12,10,12,1,11,45,152,748,480,180
+1199,Merc_Demure,Demure             ,39,3036,480,1,130,145,248,82,15,36,30,1,33,6,10,12,1,11,45,152,354,480,200
+1200,Merc_Pookie,Pookie             ,39,2369,480,1,267,290,248,82,44,48,1,1,2,1,10,12,1,11,45,152,708,480,200
+1201,Merc_Jesusalva,Jesusalva       ,37,2618,452,1,254,277,232,77,24,31,17,1,32,15,10,12,1,11,45,152,776,480,200
+1202,Merc_GonzoDark,GonzoDark       ,23,1740,316,1,163,181,127,45,24,10,15,1,22,1,10,12,1,11,45,152,860,480,200
+1203,Merc_Apane,Legendary Apane     ,8,787,176,1,66,73,33,16,3,1,4,1,24,1,10,12,1,11,45,152,896,480,200
+1204,Merc_Soren,Soren               ,4,561,141,2,25,25,14,7,1,1,1,1,1,1,10,12,1,11,45,152,896,480,200
+1205,Merc_DragonStar,Dragon Star    ,75,4305,796,1,421,440,563,187,77,86,1,1,15,32,10,12,1,11,45,150,556,480,140
+1206,Merc_Rosa,Rosa                 ,25,1542,332,4,181,200,142,47,17,18,9,1,22,11,10,12,1,11,45,150,980,480,200
+1207,Merc_Earthwitch,Earth Witch    ,40,2229,488,5,284,308,256,85,22,35,15,6,30,19,10,12,1,11,45,150,960,480,200
+1208,Merc_Arthur,Arthur             ,60,3006,632,6,404,428,426,142,47,55,24,12,44,26,10,12,1,11,45,150,940,480,180
+1209,Merc_Swezanne,Swezanne         ,69,3360,737,7,451,472,507,169,67,78,14,1,23,21,10,12,1,11,45,152,920,480,160
+1210,Merc_Xanthem,Xanthem           ,97,4201,960,7,577,580,778,259,78,81,55,44,72,47,10,12,1,11,45,152,900,480,160