diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/skill.c | 6 | ||||
| -rw-r--r-- | src/map/status.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 098101f65..47d151f6c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1362,9 +1362,6 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int case GS_PIERCINGSHOT: sc_start(bl,SC_BLEEDING,(skilllv*3),skilllv,skill_get_time2(skillid,skilllv)); break; - case GS_FULLBUSTER: - sc_start(src,SC_BLIND,(2*skilllv),skilllv,skill_get_time2(skillid,1)); - break; case NJ_HYOUSYOURAKU: sc_start(bl,SC_FREEZE,(10+10*skilllv),skilllv,skill_get_time2(skillid,skilllv)); break; @@ -1503,6 +1500,9 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list * case MO_EXTREMITYFIST: sc_start(src,SkillStatusChangeTable(skillid),100,skilllv,skill_get_time2(skillid,skilllv)); break; + case GS_FULLBUSTER: + sc_start(src,SC_BLIND,(2*skilllv),skilllv,skill_get_time2(skillid,skilllv)); + break; } if(sd && skillid && attack_type&BF_MAGIC && status_isdead(bl) && diff --git a/src/map/status.c b/src/map/status.c index 7aeaa39ae..feb497d7a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1846,17 +1846,17 @@ int status_calc_pc(struct map_session_data* sd,int first) // Bonuses from cards and equipment as well as base stat, remember to avoid overflows. i = status->str + sd->status.str + sd->param_bonus[0] + sd->param_equip[0]; - status->str = i<0?0:(i>USHRT_MAX?USHRT_MAX:i); + status->str = cap_value(i,0,USHRT_MAX); i = status->agi + sd->status.agi + sd->param_bonus[1] + sd->param_equip[1]; - status->agi = i<0?0:(i>USHRT_MAX?USHRT_MAX:i); + status->agi = cap_value(i,0,USHRT_MAX); i = status->vit + sd->status.vit + sd->param_bonus[2] + sd->param_equip[2]; - status->vit = i<0?0:(i>USHRT_MAX?USHRT_MAX:i); + status->vit = cap_value(i,0,USHRT_MAX); i = status->int_+ sd->status.int_+ sd->param_bonus[3] + sd->param_equip[3]; - status->int_ = i<0?0:(i>USHRT_MAX?USHRT_MAX:i); + status->int_ = cap_value(i,0,USHRT_MAX); i = status->dex + sd->status.dex + sd->param_bonus[4] + sd->param_equip[4]; - status->dex = i<0?0:(i>USHRT_MAX?USHRT_MAX:i); + status->dex = cap_value(i,0,USHRT_MAX); i = status->luk + sd->status.luk + sd->param_bonus[5] + sd->param_equip[5]; - status->luk = i<0?0:(i>USHRT_MAX?USHRT_MAX:i); + status->luk = cap_value(i,0,USHRT_MAX); // ------ BASE ATTACK CALCULATION ------ |