From f4444897e96b9278ca952686e7dc0561a8b30efc Mon Sep 17 00:00:00 2001 From: zephyrus Date: Tue, 2 Sep 2008 16:29:29 +0000 Subject: - Implementing a correct update of mercenary status window on status change updates. - Fixed Mercenary Heal is reduced 50%. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13185 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/mercenary.c') 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]); -- cgit v1.2.3-60-g2f50