From 022f002f01d42e9adaf5c84aec0290bafb450fde Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 1 Jun 2006 21:10:58 +0000 Subject: - Fixed pc_damage setting your canlog_tick even if the damage has no source (eg: poison, berserk) - Berserk's aspd bonus now stacks with other aspd bonuses, and is unaffected by Quagmire/Forget-me-not. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6916 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 9 ++++++--- src/map/status.c | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/map/pc.c b/src/map/pc.c index 91732ab2a..f39b6b33a 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4510,9 +4510,6 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h skill_rest(sd,0); } - if(sd->status.pet_id > 0 && sd->pd && battle_config.pet_damage_support) - pet_target_check(sd,src,1); - clif_updatestatus(sd,SP_HP); if (sd->battle_status.hpbattle_status.max_hp>>2) @@ -4526,6 +4523,12 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h } } + if(!src || src == &sd->bl) + return; + + if(sd->status.pet_id > 0 && sd->pd && battle_config.pet_damage_support) + pet_target_check(sd,src,1); + sd->canlog_tick = gettick(); return; } diff --git a/src/map/status.c b/src/map/status.c index 7dce072f0..4bb09130d 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3190,8 +3190,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change * if(sc->data[SC_STAR_COMFORT].timer!=-1) max = sc->data[SC_STAR_COMFORT].val2; if((sc->data[SC_TWOHANDQUICKEN].timer!=-1 || - sc->data[SC_ONEHAND].timer!=-1 || - sc->data[SC_BERSERK].timer!=-1 + sc->data[SC_ONEHAND].timer!=-1 ) && max < 30) max = 30; @@ -3238,6 +3237,9 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change * } } aspd_rate -= max; + + if(sc->data[SC_BERSERK].timer!=-1) + aspd_rate -= 30; //Stacks with the rest of bonuses. } if(sc->data[i=SC_ASPDPOTION3].timer!=-1 || sc->data[i=SC_ASPDPOTION2].timer!=-1 || -- cgit v1.2.3-70-g09d2