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

Added an int64 typecast to both the acid demonstration equation (which couldn't handle 1000-ish stats), and the misc damage reduction code (followup to r13694).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13700 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-04-25 10:03:23 +00:00
parent 7d85415214
commit 7c730e4fbd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/battle.c
View File

@ -2654,7 +2654,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
break; break;
case CR_ACIDDEMONSTRATION: // updated the formula based on a Japanese formula found to be exact [Reddozen] case CR_ACIDDEMONSTRATION: // updated the formula based on a Japanese formula found to be exact [Reddozen]
if(tstatus->vit+sstatus->int_) //crash fix if(tstatus->vit+sstatus->int_) //crash fix
md.damage = 7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_)); md.damage = (int64)7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_));
else else
md.damage = 0; md.damage = 0;
if (tsd) md.damage>>=1; if (tsd) md.damage>>=1;
@ -2739,7 +2739,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
} }
if( md.damage && tsd && !(nk&NK_NO_CARDFIX_DEF) ) if( md.damage && tsd && !(nk&NK_NO_CARDFIX_DEF) )
{ {// misc damage reduction from equipment
int cardfix = 10000; int cardfix = 10000;
int race2 = status_get_race2(src); int race2 = status_get_race2(src);
if (!(nk&NK_NO_ELEFIX)) if (!(nk&NK_NO_ELEFIX))
@ -2758,7 +2758,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
cardfix=cardfix*(100-tsd->long_attack_def_rate)/100; cardfix=cardfix*(100-tsd->long_attack_def_rate)/100;
if (cardfix != 10000) if (cardfix != 10000)
md.damage=md.damage*((double)cardfix/10000); md.damage=(int64)md.damage*cardfix/10000;
} }
if (sd && (i = pc_skillatk_bonus(sd, skill_num))) if (sd && (i = pc_skillatk_bonus(sd, skill_num)))