Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed pc_damage setting your canlog_tick even if the damage has no source (eg: poison, berserk)

Browse Source 
- Berserk's aspd bonus now stacks with other aspd bonuses, and is unaffected by Quagmire/Forget-me-not.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6916 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-06-01 21:10:58 +00:00
parent 94069beced
commit 03f8683f8c
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/06/01 2006/06/01
* Fixed pc_damage setting your canlog_tick even if the damage has no source
(eg: poison, berserk) [Skotlex]
* Berserk's aspd bonus now stacks with other aspd bonuses, but is still
affected by Quagmire/Forget-me-not. [Skotlex]
* Corrected setting slaves_inherit_mode to not apply to morphosis skills. * Corrected setting slaves_inherit_mode to not apply to morphosis skills.
[Skotlex] [Skotlex]
* Corrected pc_setoption to invoke status_calc_pc when getting/removing the * Corrected pc_setoption to invoke status_calc_pc when getting/removing the

9
src/map/pc.c
View File

@ -4510,9 +4510,6 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h
skill_rest(sd,0); 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); clif_updatestatus(sd,SP_HP);
if (sd->battle_status.hp<sd->battle_status.max_hp>>2) if (sd->battle_status.hp<sd->battle_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(); sd->canlog_tick = gettick();
return; return;
} }

6
src/map/status.c
View File

@ -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) if(sc->data[SC_STAR_COMFORT].timer!=-1)
max = sc->data[SC_STAR_COMFORT].val2; max = sc->data[SC_STAR_COMFORT].val2;
if((sc->data[SC_TWOHANDQUICKEN].timer!=-1 || if((sc->data[SC_TWOHANDQUICKEN].timer!=-1 ||
sc->data[SC_ONEHAND].timer!=-1 || sc->data[SC_ONEHAND].timer!=-1
sc->data[SC_BERSERK].timer!=-1
) && max < 30) ) && max < 30)
max = 30; max = 30;
@ -3238,6 +3237,9 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
} }
} }
aspd_rate -= max; 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 || if(sc->data[i=SC_ASPDPOTION3].timer!=-1 ||
sc->data[i=SC_ASPDPOTION2].timer!=-1 || sc->data[i=SC_ASPDPOTION2].timer!=-1 ||