summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 36d67b52e..0c6e03b6b 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -346,13 +346,14 @@ int mercenary_kills(struct mercenary_data *md)
md->mercenary.kill_count = cap_value(md->mercenary.kill_count, 0, INT_MAX);
if( (md->mercenary.kill_count % 50) == 0 )
+ {
mercenary_set_faith(md, 1);
+ mercenary_killbonus(md);
+ }
if( md->master )
clif_mercenary_updatestatus(md->master, SP_MERCKILLS);
- mercenary_killbonus(md);
-
return 0;
}
@@ -407,7 +408,7 @@ int read_mercenarydb(void)
status->max_sp = atoi(str[5]);
status->rhw.range = atoi(str[6]);
status->rhw.atk = atoi(str[7]);
- status->rhw.atk2 = atoi(str[8]);
+ status->rhw.atk2 = status->rhw.atk + atoi(str[8]);
status->def = atoi(str[9]);
status->mdef = atoi(str[10]);
status->str = atoi(str[11]);