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

Follow Ups

Browse Source 
* Follow up to d95f5d2 - Fixes an issue with parenthesis. Thanks to @cydh.
* Follow up to 3c92075 - Fixes a potential divide by zero. Thanks to @theultramage.
This commit is contained in:
aleos89 2015-08-18 10:59:01 -04:00
parent 66b23fc40f
commit 01a93723c9
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/skill.c
View File

@ -15487,7 +15487,7 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
req.itemid[i] = skill_db[idx]->require.itemid[i];
req.amount[i] = skill_db[idx]->require.amount[i];
if (skill_id >= HT_SKIDTRAP && skill_id <= HT_TALKIEBOX && pc_checkskill(sd, RA_RESEARCHTRAP) > 0 || skill_id == SC_ESCAPE) {
if ((skill_id >= HT_SKIDTRAP && skill_id <= HT_TALKIEBOX && pc_checkskill(sd, RA_RESEARCHTRAP) > 0) || skill_id == SC_ESCAPE) {
int16 itIndex;
if ((itIndex = pc_search_inventory(sd,req.itemid[i])) < 0 || ( itIndex >= 0 && sd->status.inventory[itIndex].amount < req.amount[i])) {

24
src/map/status.c
View File

@ -9857,23 +9857,21 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
break;
case SC_GT_CHANGE:
{ // Take note there is no def increase as skill desc says. [malufett]
struct status_data *sstatus = src ? status_get_status_data(src) : NULL;
val2 = ((sstatus?sstatus->dex:4) / 4 + (sstatus?sstatus->str:2) / 2) * val1 / 5; // ATK increase: ATK [{(Caster DEX / 4) + (Caster STR / 2)} x Skill Level / 5]
val3 = status->agi * val1 / 60; // ASPD increase: [(Target AGI x Skill Level) / 60] %
val4 = (200/(sstatus?sstatus->int_:1)) * val1; // MDEF decrease: MDEF [(200 / Caster INT) x Skill Level]
int stat = status_get_int(src);
if (val4 < 0)
val4 = 0;
if (stat <= 0)
stat = 1; // Prevent divide by zero.
val2 = (status_get_dex(src) / 4 + status_get_str(src) / 2) * val1 / 5; // ATK increase: ATK [{(Caster DEX / 4) + (Caster STR / 2)} x Skill Level / 5]
val3 = status->agi * val1 / 60; // ASPD increase: [(Target AGI x Skill Level) / 60] %
val4 = 200 / stat * val1; // MDEF decrease: MDEF [(200 / Caster INT) x Skill Level]
}
break;
case SC_GT_REVITALIZE:
{ // Take note there is no vit,aspd,speed increase as skill desc says. [malufett]
struct status_data *sstatus = src ? status_get_status_data(src) : NULL;
val2 = 2 * val1; // MaxHP: [(Skill Level * 2)]%
val3 = val1 * 30 + 50; // Natural HP recovery increase: [(Skill Level x 30) + 50] %
// The stat def is not shown in the status window and it is process differently
val4 = ((sstatus?sstatus->vit:4)/4 ) * val1; // STAT DEF increase: [(Caster VIT / 4) x Skill Level]
}
// Take note there is no vit, aspd, speed increase as skill desc says. [malufett]
val2 = 2 * val1; // MaxHP: [(Skill Level * 2)]%
val3 = val1 * 30 + 50; // Natural HP recovery increase: [(Skill Level x 30) + 50] %
// The stat def is not shown in the status window and it is processed differently
val4 = status_get_vit(src) / 4 * val1; // STAT DEF increase: [(Caster VIT / 4) x Skill Level]
break;
case SC_PYROTECHNIC_OPTION:
val2 = 60; // Eatk Renewal (Atk2)