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

- Fixed the value range checks added by Zido on pc_bonus (some of them were even redundant...)

Browse Source 
- Fixed script command "recovery".


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7654 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-07-13 13:55:58 +00:00
parent b505f07a7a
commit 6ec9580e34
3 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
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/07/13
* Fixed script command "recovery". [Skotlex]
2006/07/12 2006/07/12
* Fixed a small typo in my code [Zido] * Fixed a small typo in my code [Zido]
* Added negative value in bonus exploit fix for more stat bonuses [Zido] * Added negative value in bonus exploit fix for more stat bonuses [Zido]

50
src/map/pc.c
View File

@ -1267,81 +1267,73 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
break; break;
case SP_ATK1: case SP_ATK1:
if(!sd->state.lr_flag) { if(!sd->state.lr_flag) {
if(!(val<0 && ((val-val-val)>status->rhw.atk))) bonus = status->rhw.atk + val;
status->rhw.atk+=val; status->rhw.atk = cap_value(bonus, 0, USHRT_MAX);
} }
else if(sd->state.lr_flag == 1) { else if(sd->state.lr_flag == 1) {
if(!(val<0 && ((val-val-val)>status->lhw->atk))) bonus = status->lhw->atk + val;
status->lhw->atk+=val; status->lhw->atk = cap_value(bonus, 0, USHRT_MAX);
} }
break; break;
case SP_ATK2: case SP_ATK2:
if(!sd->state.lr_flag) { if(!sd->state.lr_flag) {
if(!(val<0 && ((val-val-val)>status->rhw.atk2))) bonus = status->rhw.atk2 + val;
status->rhw.atk2+=val; status->rhw.atk2 = cap_value(bonus, 0, USHRT_MAX);
} }
else if(sd->state.lr_flag == 1) { else if(sd->state.lr_flag == 1) {
if(!(val<0 && ((val-val-val)>status->lhw->atk2))) bonus = status->lhw->atk2 + val;
status->lhw->atk2+=val; status->lhw->atk2 = cap_value(bonus, 0, USHRT_MAX);
} }
break; break;
case SP_BASE_ATK: case SP_BASE_ATK:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->batk))) bonus = status->batk + val;
status->batk+=val; status->batk = cap_value(bonus, 0, USHRT_MAX);
} }
break; break;
case SP_MATK1: case SP_MATK1:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->matk_max))) bonus = status->matk_max + val;
status->matk_max += val; status->matk_max = cap_value(bonus, 0, USHRT_MAX);
} }
break; break;
case SP_MATK2: case SP_MATK2:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->matk_min))) bonus = status->matk_min + val;
status->matk_min += val; status->matk_min = cap_value(bonus, 0, USHRT_MAX);
} }
break; break;
case SP_MATK: case SP_MATK:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->matk_max))) bonus = status->matk_max + val;
status->matk_max += val; status->matk_max = cap_value(bonus, 0, USHRT_MAX);
if(!(val<0 && ((val-val-val)>status->matk_min))) bonus = status->matk_min + val;
status->matk_min += val; status->matk_min = cap_value(bonus, 0, USHRT_MAX);
} }
break; break;
case SP_DEF1: case SP_DEF1:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->def))) {
bonus = status->def + val; bonus = status->def + val;
status->def = cap_value(bonus, CHAR_MIN, CHAR_MAX); status->def = cap_value(bonus, CHAR_MIN, CHAR_MAX);
} }
}
break; break;
case SP_DEF2: case SP_DEF2:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->def2))) {
bonus = status->def2 + val; bonus = status->def2 + val;
status->def2 = cap_value(bonus, SHRT_MIN, SHRT_MAX); status->def2 = cap_value(bonus, SHRT_MIN, SHRT_MAX);
} }
}
break; break;
case SP_MDEF1: case SP_MDEF1:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->mdef))) {
bonus = status->mdef + val; bonus = status->mdef + val;
status->mdef = cap_value(bonus, CHAR_MIN, CHAR_MAX); status->mdef = cap_value(bonus, CHAR_MIN, CHAR_MAX);
} }
}
break; break;
case SP_MDEF2: case SP_MDEF2:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
if(!(val<0 && ((val-val-val)>status->mdef2))) {
bonus = status->mdef2 + val; bonus = status->mdef2 + val;
status->mdef2 = cap_value(bonus, SHRT_MIN, SHRT_MAX); status->mdef2 = cap_value(bonus, SHRT_MIN, SHRT_MAX);
} }
}
break; break;
case SP_HIT: case SP_HIT:
if(sd->state.lr_flag != 2) { if(sd->state.lr_flag != 2) {
@ -1692,14 +1684,12 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
} }
break; break;
case SP_PERFECT_HIDE: // [Valaris] case SP_PERFECT_HIDE: // [Valaris]
if(sd->state.lr_flag!=2) { if(sd->state.lr_flag!=2)
sd->state.perfect_hiding=1; sd->state.perfect_hiding=1;
}
break; break;
case SP_UNBREAKABLE: case SP_UNBREAKABLE:
if(sd->state.lr_flag!=2) { if(sd->state.lr_flag!=2)
sd->unbreakable += val; sd->unbreakable += val;
}
break; break;
case SP_UNBREAKABLE_WEAPON: case SP_UNBREAKABLE_WEAPON:
if(sd->state.lr_flag != 2) if(sd->state.lr_flag != 2)

12
src/map/script.c
View File

@ -8815,14 +8815,10 @@ int buildin_recovery(struct script_state *st)
for (i = 0; i < users; i++) for (i = 0; i < users; i++)
{ {
sd = all_sd[i]; sd = all_sd[i];
sd->status.hp = sd->status.max_hp; if(pc_isdead(sd))
sd->status.sp = sd->status.max_sp; status_revive(&sd->bl, 100, 100);
clif_updatestatus(sd, SP_HP); else
clif_updatestatus(sd, SP_SP); status_percent_heal(&sd->bl, 100, 100);
if(pc_isdead(sd)){
pc_setstand(sd);
clif_resurrection(&sd->bl, 1);
}
clif_displaymessage(sd->fd,"You have been recovered!"); clif_displaymessage(sd->fd,"You have been recovered!");
} }
return 0; return 0;