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

Revert of efdc748

Browse Source 
* Going to follow up later with a better fix.
This commit is contained in:
aleos89 2016-07-27 18:56:17 -04:00
parent 00868e59ec
commit 1daa6fd65b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/pc.c
View File

@ -3132,7 +3132,7 @@ void pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
sd->state.lr_flag != 2 ? val : 0, sd->state.lr_flag == 2 ? val : 0, ATF_SELF, 0);
break;
case SP_RESEFF: // bonus2 bResEff,eff,n;
if (type2 <= SC_NONE || type2 >= SC_MAX) {
if (type2 < SC_COMMON_MIN || type2 > SC_COMMON_MAX) {
ShowError("pc_bonus2: SP_RESEFF: %d is invalid effect.\n", type2);
break;
}

7
src/map/status.c
View File

@ -7735,12 +7735,9 @@ int status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_typ
}
// Item resistance (only applies to rate%)
// TODO: Need to come up with a better way of flagging "common" SC rather than setting them at the start of sc_enum
if(sd && type > SC_NONE && type < SC_MAX) {
if( sd->reseff[type] > 0 )
rate -= ((rate*sd->reseff[type])/10000);
}
if(sd && SC_COMMON_MIN <= type && type <= SC_COMMON_MAX) {
if( sd->reseff[type-SC_COMMON_MIN] > 0 )
rate -= rate*sd->reseff[type-SC_COMMON_MIN]/10000;
if( sd->sc.data[SC_COMMONSC_RESIST] )
rate -= rate*sd->sc.data[SC_COMMONSC_RESIST]->val1/100;
}