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

Follow up r17017 fixed some wrong type casted variables.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17070 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
rud0lp20 2013-01-01 17:51:49 +00:00
parent 0e6fbcb0ce
commit 026ca5ce1e
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/map/battle.c
View File

@ -40,9 +40,9 @@ int attr_fix_table[4][ELE_MAX][ELE_MAX];
struct Battle_Config battle_config; struct Battle_Config battle_config;
static struct eri *delay_damage_ers; //For battle delay damage structures. static struct eri *delay_damage_ers; //For battle delay damage structures.
#define DAMAGE_RATE(a){damage = (int64)damage * (a)/100;} #define DAMAGE_RATE(a){damage = (int64)(damage * (a)/100);}
#define DAMAGE_SUBRATE(a){damage -= (int64)damage * (a)/100;} #define DAMAGE_SUBRATE(a){damage -= (int64)(damage * (a)/100);}
#define DAMAGE_ADDRATE(a){damage += (int64)damage * (a)/100;} #define DAMAGE_ADDRATE(a){damage += (int64)(damage * (a)/100);}
int battle_getcurrentskill(struct block_list *bl) { //Returns the current/last skill in use by this bl. int battle_getcurrentskill(struct block_list *bl) { //Returns the current/last skill in use by this bl.
struct unit_data *ud; struct unit_data *ud;
@ -408,7 +408,7 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag
if( t < 5 && atk_elem == t ) if( t < 5 && atk_elem == t )
DAMAGE_SUBRATE(tsd->talisman[t] * 3) // -3% custom value DAMAGE_SUBRATE(tsd->talisman[t] * 3) // -3% custom value
} }
return (int64)damage*ratio/100; return (int64)(damage*ratio/100);
} }
/*========================================== /*==========================================
@ -431,7 +431,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li
tstatus = status_get_status_data(target); tstatus = status_get_status_data(target);
s_race2 = status_get_race2(src); s_race2 = status_get_race2(src);
#define bccDAMAGE_RATE(a){ damage = (int64)damage * (a)/1000;} #define bccDAMAGE_RATE(a){ damage = (int64)(damage * (a)/1000);}
switch(attack_type){ switch(attack_type){
case BF_MAGIC: case BF_MAGIC:
if ( sd && !(nk&NK_NO_CARDFIX_ATK) ) { if ( sd && !(nk&NK_NO_CARDFIX_ATK) ) {
@ -997,7 +997,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
#ifndef RENEWAL #ifndef RENEWAL
if( sc->data[SC_ASSUMPTIO] ) { if( sc->data[SC_ASSUMPTIO] ) {
if( map_flag_vs(bl->m) ) if( map_flag_vs(bl->m) )
damage = (int64)damage*2/3; //Receive 66% damage damage = (int64)(damage*2/3); //Receive 66% damage
else else
damage >>= 1; //Receive 50% damage damage >>= 1; //Receive 50% damage
} }
@ -1117,7 +1117,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
//(since battle_drain is strictly for players currently) //(since battle_drain is strictly for players currently)
if ((sce=sc->data[SC_BLOODLUST]) && flag&BF_WEAPON && damage > 0 && if ((sce=sc->data[SC_BLOODLUST]) && flag&BF_WEAPON && damage > 0 &&
rnd()%100 < sce->val3) rnd()%100 < sce->val3)
status_heal(src, (int64)damage*sce->val4/100, 0, 3); status_heal(src, (int64)(damage*sce->val4/100), 0, 3);
if( sd && (sce = sc->data[SC_FORCEOFVANGUARD]) && flag&BF_WEAPON && rnd()%100 < sce->val2 ) if( sd && (sce = sc->data[SC_FORCEOFVANGUARD]) && flag&BF_WEAPON && rnd()%100 < sce->val2 )
pc_addspiritball(sd,skill_get_time(LG_FORCEOFVANGUARD,sce->val1),sce->val3); pc_addspiritball(sd,skill_get_time(LG_FORCEOFVANGUARD,sce->val1),sce->val3);
@ -1366,7 +1366,7 @@ static int battle_calc_drain(int damage, int rate, int per)
int diff = 0; int diff = 0;
if (per && rnd()%1000 < rate) { if (per && rnd()%1000 < rate) {
diff = ((int64)damage * per) / 100; diff = ((int64)(damage * per)) / 100;
if (diff == 0) { if (diff == 0) {
if (per > 0) if (per > 0)
diff = 1; diff = 1;
@ -2048,8 +2048,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
//ATK_RATE scales the damage. 100 = no change. 50 is halved, 200 is doubled, etc //ATK_RATE scales the damage. 100 = no change. 50 is halved, 200 is doubled, etc
#define ATK_RATE( a ) { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(a)/100; } #define ATK_RATE( a ) { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(a)/100; }
#define ATK_RATE2( a , b ) { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(b)/100; } #define ATK_RATE2( a , b ) { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(b)/100; }
#define ATK_RATER(a){ wd.damage = (int64)wd.damage*(a)/100;} #define ATK_RATER(a){ wd.damage = (int64)(wd.damage*(a)/100);}
#define ATK_RATEL(a){ wd.damage2 = (int64)wd.damage2*(a)/100;} #define ATK_RATEL(a){ wd.damage2 = (int64)(wd.damage2*(a)/100);}
//Adds dmg%. 100 = +100% (double) damage. 10 = +10% damage //Adds dmg%. 100 = +100% (double) damage. 10 = +10% damage
#define ATK_ADDRATE( a ) { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(a)/100; } #define ATK_ADDRATE( a ) { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(a)/100; }
#define ATK_ADDRATE2( a , b ) { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(b)/100; } #define ATK_ADDRATE2( a , b ) { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(b)/100; }
@ -2060,7 +2060,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
switch (skill_id) switch (skill_id)
{ //Calc base damage according to skill { //Calc base damage according to skill
case PA_SACRIFICE: case PA_SACRIFICE:
wd.damage = (int64)sstatus->max_hp* 9/100; wd.damage = (int64)(sstatus->max_hp* 9/100);
wd.damage2 = 0; wd.damage2 = 0;
break; break;
#ifndef RENEWAL #ifndef RENEWAL
@ -2770,11 +2770,11 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
break; break;
case SR_TIGERCANNON:// ATK [((Caster consumed HP + SP) / 4) x Caster Base Level / 100] % case SR_TIGERCANNON:// ATK [((Caster consumed HP + SP) / 4) x Caster Base Level / 100] %
{ {
int hp = (int64)sstatus->max_hp * (10 + 2 * skill_lv) / 100, int hp = (int64)(sstatus->max_hp * (10 + 2 * skill_lv) / 100),
sp = (int64)sstatus->max_sp * (6 + skill_lv) / 100; sp = (int64)(sstatus->max_sp * (6 + skill_lv) / 100);
skillratio = ((int64)hp+sp) / 4; skillratio = ((int64)hp+sp) / 4;
if( sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE ) // ATK [((Caster consumed HP + SP) / 2) x Caster Base Level / 100] % if( sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE ) // ATK [((Caster consumed HP + SP) / 2) x Caster Base Level / 100] %
skillratio = ((int64)hp+sp) / 2; skillratio = (int64)(hp+sp / 2);
RE_LVL_DMOD(100); RE_LVL_DMOD(100);
} }
break; break;
@ -3450,7 +3450,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
} }
} else if(sd->status.weapon == W_KATAR && !skill_id) { //Katars (offhand damage only applies to normal attacks, tested on Aegis 10.2) } else if(sd->status.weapon == W_KATAR && !skill_id) { //Katars (offhand damage only applies to normal attacks, tested on Aegis 10.2)
skill = pc_checkskill(sd,TF_DOUBLE); skill = pc_checkskill(sd,TF_DOUBLE);
wd.damage2 = (int64)wd.damage * (1 + (skill * 2))/100; wd.damage2 = (int64)(wd.damage * (1 + (skill * 2))/100);
if(wd.damage && !wd.damage2) wd.damage2 = 1; if(wd.damage && !wd.damage2) wd.damage2 = 1;
flag.lh = 1; flag.lh = 1;
@ -3489,7 +3489,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
wd.damage = battle_calc_gvg_damage(src,target,wd.damage,wd.div_,skill_id,skill_lv,wd.flag); wd.damage = battle_calc_gvg_damage(src,target,wd.damage,wd.div_,skill_id,skill_lv,wd.flag);
else if( map[target->m].flag.battleground ) else if( map[target->m].flag.battleground )
wd.damage = battle_calc_bg_damage(src,target,wd.damage,wd.div_,skill_id,skill_lv,wd.flag); wd.damage = battle_calc_bg_damage(src,target,wd.damage,wd.div_,skill_id,skill_lv,wd.flag);
wd.damage2 = (int64)d2*100/d1 * wd.damage/100; wd.damage2 = (int64)(d2*100/d1 * wd.damage/100);
if(wd.damage > 1 && wd.damage2 < 1) wd.damage2 = 1; if(wd.damage > 1 && wd.damage2 < 1) wd.damage2 = 1;
wd.damage-=wd.damage2; wd.damage-=wd.damage2;
} }
@ -4069,7 +4069,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
if(sd) { if(sd) {
//Damage bonuses //Damage bonuses
if ((i = pc_skillatk_bonus(sd, skill_id))) if ((i = pc_skillatk_bonus(sd, skill_id)))
ad.damage += (int64)ad.damage*i/100; ad.damage += (int64)(ad.damage*i/100);
//Ignore Defense? //Ignore Defense?
if (!flag.imdef && ( if (!flag.imdef && (
@ -4268,7 +4268,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
damage_div_fix(md.damage, skill); damage_div_fix(md.damage, skill);
//Falcon Assault Modifier //Falcon Assault Modifier
md.damage=(int64)md.damage*(150+70*skill_lv)/100; md.damage=(int64)(md.damage*(150+70*skill_lv)/100);
} }
break; break;
case TF_THROWSTONE: case TF_THROWSTONE:
@ -4320,7 +4320,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
md.damage = sd?sd->status.job_level:status_get_lv(src); md.damage = sd?sd->status.job_level:status_get_lv(src);
break; break;
case HVAN_EXPLOSION: //[orn] case HVAN_EXPLOSION: //[orn]
md.damage = (int64)sstatus->max_hp * (50 + 50 * skill_lv) / 100 ; md.damage = (int64)(sstatus->max_hp * (50 + 50 * skill_lv) / 100);
break ; break ;
case ASC_BREAKER: case ASC_BREAKER:
md.damage = 500+rnd()%500 + 5*skill_lv * sstatus->int_; md.damage = 500+rnd()%500 + 5*skill_lv * sstatus->int_;
@ -4336,7 +4336,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
case RK_DRAGONBREATH: case RK_DRAGONBREATH:
md.damage = ((status_get_hp(src) / 50) + (status_get_max_sp(src) / 4)) * skill_lv; md.damage = ((status_get_hp(src) / 50) + (status_get_max_sp(src) / 4)) * skill_lv;
RE_LVL_MDMOD(150); RE_LVL_MDMOD(150);
if (sd) md.damage = (int64)md.damage * (100 + 5 * (pc_checkskill(sd,RK_DRAGONTRAINING) - 1)) / 100; if (sd) md.damage = (int64)(md.damage * (100 + 5 * (pc_checkskill(sd,RK_DRAGONTRAINING) - 1)) / 100);
md.flag |= BF_LONG|BF_WEAPON; md.flag |= BF_LONG|BF_WEAPON;
break; break;
/** /**
@ -4351,11 +4351,11 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
{ {
int researchskill_lv = pc_checkskill(sd,RA_RESEARCHTRAP); int researchskill_lv = pc_checkskill(sd,RA_RESEARCHTRAP);
if(researchskill_lv) if(researchskill_lv)
md.damage = (int64)md.damage * 20 * researchskill_lv / (skill_id == RA_CLUSTERBOMB?50:100); md.damage = (int64)(md.damage * 20 * researchskill_lv / (skill_id == RA_CLUSTERBOMB?50:100));
else else
md.damage = 0; md.damage = 0;
}else }else
md.damage = (int64)md.damage * 200 / (skill_id == RA_CLUSTERBOMB?50:100); md.damage = (int64)(md.damage * 200 / (skill_id == RA_CLUSTERBOMB?50:100));
break; break;
/** /**
@ -4380,7 +4380,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
{ {
struct Damage wd = battle_calc_weapon_attack(src,target,skill_id,skill_lv,mflag); struct Damage wd = battle_calc_weapon_attack(src,target,skill_id,skill_lv,mflag);
short totaldef = tstatus->def2 + (short)status_get_def(target); short totaldef = tstatus->def2 + (short)status_get_def(target);
md.damage = (int64)wd.damage * 60 * (5 + skill_lv) / 100; md.damage = (int64)(wd.damage * 60 * (5 + skill_lv) / 100);
md.damage -= totaldef; md.damage -= totaldef;
} }
break; break;
@ -4445,7 +4445,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
md.damage = battle_calc_cardfix(BF_MISC, src, target, nk, s_ele, 0, md.damage, 0, md.flag); md.damage = battle_calc_cardfix(BF_MISC, src, target, nk, s_ele, 0, md.damage, 0, md.flag);
if (sd && (i = pc_skillatk_bonus(sd, skill_id))) if (sd && (i = pc_skillatk_bonus(sd, skill_id)))
md.damage += (int64)md.damage*i/100; md.damage += (int64)(md.damage*i/100);
if(md.damage < 0) if(md.damage < 0)
md.damage = 0; md.damage = 0;
@ -4536,14 +4536,14 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
sc = status_get_sc(bl); sc = status_get_sc(bl);
if( sc && sc->data[SC_REFLECTDAMAGE] ) { if( sc && sc->data[SC_REFLECTDAMAGE] ) {
int max_damage = (int64)status_get_max_hp(bl) * status_get_lv(bl) / 100; int max_damage = (int64)(status_get_max_hp(bl) * status_get_lv(bl) / 100);
rdamage = (int64)(*dmg) * sc->data[SC_REFLECTDAMAGE]->val2 / 100; rdamage = (int64)((*dmg) * sc->data[SC_REFLECTDAMAGE]->val2 / 100);
if( rdamage > max_damage ) rdamage = max_damage; if( rdamage > max_damage ) rdamage = max_damage;
}else if( sc && sc->data[SC_CRESCENTELBOW] && !is_boss(src) && rnd()%100 < sc->data[SC_CRESCENTELBOW]->val2 ){ }else if( sc && sc->data[SC_CRESCENTELBOW] && !is_boss(src) && rnd()%100 < sc->data[SC_CRESCENTELBOW]->val2 ){
//ATK [{(Target HP / 100) x Skill Level} x Caster Base Level / 125] % + [Received damage x {1 + (Skill Level x 0.2)}] //ATK [{(Target HP / 100) x Skill Level} x Caster Base Level / 125] % + [Received damage x {1 + (Skill Level x 0.2)}]
int ratio = (int64)(status_get_hp(src) / 100) * sc->data[SC_CRESCENTELBOW]->val1 * status_get_lv(bl) / 125; int ratio = (int64)((status_get_hp(src) / 100) * sc->data[SC_CRESCENTELBOW]->val1 * status_get_lv(bl) / 125);
if (ratio > 5000) ratio = 5000; // Maximum of 5000% ATK if (ratio > 5000) ratio = 5000; // Maximum of 5000% ATK
rdamage = (int64)rdamage * ratio / 100 + (*dmg) * (10 + sc->data[SC_CRESCENTELBOW]->val1 * 20 / 10) / 10; rdamage = (int64)(rdamage * ratio / 100 + (*dmg) * (10 + sc->data[SC_CRESCENTELBOW]->val1 * 20 / 10) / 10);
skill_blown(bl, src, skill_get_blewcount(SR_CRESCENTELBOW_AUTOSPELL, sc->data[SC_CRESCENTELBOW]->val1), unit_getdir(src), 0); skill_blown(bl, src, skill_get_blewcount(SR_CRESCENTELBOW_AUTOSPELL, sc->data[SC_CRESCENTELBOW]->val1), unit_getdir(src), 0);
clif_skill_damage(bl, src, gettick(), status_get_amotion(src), 0, rdamage, clif_skill_damage(bl, src, gettick(), status_get_amotion(src), 0, rdamage,
1, SR_CRESCENTELBOW_AUTOSPELL, sc->data[SC_CRESCENTELBOW]->val1, 6); // This is how official does 1, SR_CRESCENTELBOW_AUTOSPELL, sc->data[SC_CRESCENTELBOW]->val1, 6); // This is how official does
@ -4553,12 +4553,12 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
return 0; // Just put here to minimize redundancy return 0; // Just put here to minimize redundancy
}else if (flag & BF_SHORT) {//Bounces back part of the damage. }else if (flag & BF_SHORT) {//Bounces back part of the damage.
if ( sd && sd->bonus.short_weapon_damage_return ) { if ( sd && sd->bonus.short_weapon_damage_return ) {
rdamage += (int64)damage * sd->bonus.short_weapon_damage_return / 100; rdamage += (int64)(damage * sd->bonus.short_weapon_damage_return / 100);
if(rdamage < 1) rdamage = 1; if(rdamage < 1) rdamage = 1;
} }
if( sc && sc->count ) { if( sc && sc->count ) {
if ( sc->data[SC_REFLECTSHIELD] && skill_id != WS_CARTTERMINATION ) { if ( sc->data[SC_REFLECTSHIELD] && skill_id != WS_CARTTERMINATION ) {
rdamage += (int64)damage * sc->data[SC_REFLECTSHIELD]->val2 / 100; rdamage += (int64)(damage * sc->data[SC_REFLECTSHIELD]->val2 / 100);
if (rdamage < 1) rdamage = 1; if (rdamage < 1) rdamage = 1;
} }
if(sc->data[SC_DEATHBOUND] && skill_id != WS_CARTTERMINATION && !(src->type == BL_MOB && is_boss(src)) ) { if(sc->data[SC_DEATHBOUND] && skill_id != WS_CARTTERMINATION && !(src->type == BL_MOB && is_boss(src)) ) {
@ -4567,8 +4567,8 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
int rd1 = 0; int rd1 = 0;
if( distance_bl(src,bl) <= 0 || !map_check_dir(dir,t_dir) ) { if( distance_bl(src,bl) <= 0 || !map_check_dir(dir,t_dir) ) {
rd1 = (int64)min(damage,status_get_max_hp(bl)) * sc->data[SC_DEATHBOUND]->val2 / 100; // Amplify damage. rd1 = (int64)(min(damage,status_get_max_hp(bl)) * sc->data[SC_DEATHBOUND]->val2 / 100); // Amplify damage.
*dmg = (int64)rd1 * 30 / 100; // Received damage = 30% of amplifly damage. *dmg = (int64)(rd1 * 30 / 100); // Received damage = 30% of amplifly damage.
clif_skill_damage(src,bl,gettick(), status_get_amotion(src), 0, -30000, 1, RK_DEATHBOUND, sc->data[SC_DEATHBOUND]->val1,6); clif_skill_damage(src,bl,gettick(), status_get_amotion(src), 0, -30000, 1, RK_DEATHBOUND, sc->data[SC_DEATHBOUND]->val1,6);
status_change_end(bl,SC_DEATHBOUND,INVALID_TIMER); status_change_end(bl,SC_DEATHBOUND,INVALID_TIMER);
rdamage += rd1; rdamage += rd1;
@ -4578,7 +4578,7 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
} }
} else { } else {
if (sd && sd->bonus.long_weapon_damage_return) { if (sd && sd->bonus.long_weapon_damage_return) {
rdamage += (int64)damage * sd->bonus.long_weapon_damage_return / 100; rdamage += (int64)(damage * sd->bonus.long_weapon_damage_return / 100);
if (rdamage < 1) rdamage = 1; if (rdamage < 1) rdamage = 1;
} }
} }