From 73726c90a229856a88c55fe5121ea511ac2c228d Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 31 Aug 2006 01:10:36 +0000 Subject: - Skill required-state will now only be checked on cast-begin, not cast-end. - Added a check in status_calc_pc to prevent player rate adjustments from from going below 0. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8553 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 6 ++---- src/map/status.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/map/skill.c b/src/map/skill.c index 8f984019e..9d5f360f2 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8376,6 +8376,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t } } + if(!type)//States are only checked on begin-casting. [Skotlex] switch(state) { case ST_HIDING: if(!(sc && sc->option&OPTION_HIDE)) { @@ -8420,7 +8421,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t } break; case ST_SIGHT: - if((!sc || sc->data[SC_SIGHT].timer == -1) && type&1) { + if(!sc || sc->data[SC_SIGHT].timer == -1) { clif_skill_fail(sd,skill,0,0); return 0; } @@ -8444,9 +8445,6 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t } break; case ST_MOVE_ENABLE: - if(type)//Check only on begin casting. [Skotlex] - break; - if (sc && sc->data[SC_COMBO].timer != -1 && sc->data[SC_COMBO].val1 == skill) sd->ud.canmove_tick = gettick(); //When using a combo, cancel the can't move delay to enable the skill. [Skotlex] diff --git a/src/map/status.c b/src/map/status.c index 34459b495..1fe73423f 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2109,7 +2109,43 @@ int status_calc_pc(struct map_session_data* sd,int first) sd->dsprate -= sd->sc.data[SC_SERVICE4U].val3; } - if(sd->dsprate < 0) sd->dsprate = 0; + //Underflow protections. + if(sd->sprate < 0) + sd->sprate = 0; + if(sd->dsprate < 0) + sd->dsprate = 0; + if(sd->hprate < 0) + sd->hprate = 0; + if(sd->sprate < 0) + sd->sprate = 0; + if(sd->castrate < 0) + sd->castrate = 0; + if(sd->delayrate < 0) + sd->delayrate = 0; + if(sd->speed_rate < 0) + sd->speed_rate = 0; + if(sd->hprecov_rate < 0) + sd->hprecov_rate = 0; + if(sd->sprecov_rate < 0) + sd->sprecov_rate = 0; + if(sd->matk_rate < 0) + sd->matk_rate = 0; + if(sd->critical_rate < 0) + sd->critical_rate = 0; + if(sd->hit_rate < 0) + sd->hit_rate = 0; + if(sd->flee_rate < 0) + sd->flee_rate = 0; + if(sd->flee2_rate < 0) + sd->flee2_rate = 0; + if(sd->def_rate < 0) + sd->def_rate = 0; + if(sd->def2_rate < 0) + sd->def2_rate = 0; + if(sd->mdef_rate < 0) + sd->mdef_rate = 0; + if(sd->mdef2_rate < 0) + sd->mdef2_rate = 0; // Anti-element and anti-race if((skill=pc_checkskill(sd,CR_TRUST))>0) -- cgit v1.2.3-70-g09d2