summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/mercenary_db.txt18
-rw-r--r--db/re/item_db.conf6
2 files changed, 18 insertions, 6 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index f7ff96f67..aab91f8c6 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -6,7 +6,19 @@
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,100,70,10,12,1,11,45,150,114,114,200
-1205,Merc_Testing,Testing Mercenar,100,688,133,1,413,413,36,26,4,67,10,26,100,70,10,12,1,11,45,150,114,114,200
+//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
+1993,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
+1994,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
+1995,Merc_Msawis,Msawis , 62,4278,756,1,409,409,152,75, 62,74,20, 1,19, 1, 10,12,1,11,45,152, 604, 480,160
+1996,Merc_Saulc,Saulc , 53,3690,793,1,200,200,132,79, 36,60,20,22,27,10, 10,12,1,11,45,152, 660, 480,180
+1997,Merc_Crazyfefe,Crazyfefe , 51,3625,799,1,125,125,102,80, 54,17,22,28,35,17, 10,12,1,11,45,152, 822, 480,180
+1998,Merc_LawnCable,LawnCable , 42,2744,540,1,132,132, 92,54, 39,38, 9, 2,32,12, 10,12,1,11,45,152, 748, 480,180
+1999,Merc_Demure,Demure , 39,3036,504,1,125,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,125,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,125,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, 35, 35, 52,34, 24,10,15, 1,22, 1, 10,12,1,11,45,152, 860, 480,200
+1203,Merc_Apane,Apane , 8, 787,181,1, 35, 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
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5b797519b..e03a170b9 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -10891,7 +10891,7 @@ item_db: (
// 0.5%
if (.@seed < 50) {
- setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar;
+ setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
.@n=rand(getarraysize(.@r));
// 2.0%
} else if (.@seed < 250) {
@@ -10939,7 +10939,7 @@ item_db: (
// 1.0%
if (.@seed < 100) {
- setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar;
+ setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
.@n=rand(getarraysize(.@r));
// 5.0%
} else if (.@seed < 600) {
@@ -10987,7 +10987,7 @@ item_db: (
// 2.0%
if (.@seed < 200) {
- setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar;
+ setarray .@r, MercCard_AndreiSakar, MercCard_DragonStar, MercCard_DragonStar;
.@n=rand(getarraysize(.@r));
// 10.0%
} else if (.@seed < 1200) {