diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 4 | ||||
| -rw-r--r-- | src/map/status.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 45fa87bc6..355065a61 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -807,6 +807,8 @@ int64 battle_calc_masteryfix(struct block_list *src, struct block_list *target, damage += div * sd->spiritball * 3; if( skill_id != CR_SHIELDBOOMERANG ) // Only Shield boomerang doesn't takes the Star Crumbs bonus. damage += div * (left ? sd->left_weapon.star : sd->right_weapon.star); + if( skill_id != MC_CARTREVOLUTION && (skill=pc->checkskill(sd,BS_HILTBINDING)) > 0 ) + damage += 4; if(sd->status.party_id && (skill=pc->checkskill(sd,TK_POWER)) > 0){ if( (i = party_foreachsamemap(party->sub_count, sd, 0)) > 1 ) @@ -1084,7 +1086,7 @@ int64 battle_calc_cardfix(int attack_type, struct block_list *src, struct block_ } } #ifndef RENEWAL - if( wflag&BF_LONG ) + if( wd.flag&BF_LONG ) cardfix = cardfix * (100 + sd->bonus.long_attack_atk_rate) / 100; #endif if( (cflag&1) && cardfix_ != 1000 ) diff --git a/src/map/status.c b/src/map/status.c index 2d68bf28e..014bcabf7 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2900,8 +2900,10 @@ int status_calc_pc_(struct map_session_data* sd, bool first) // ----- HIT CALCULATION ----- // Absolute modifiers from passive skills - if((skill=pc->checkskill(sd,BS_WEAPONRESEARCH))>0) +#ifndef RENEWAL + if((skill=pc->checkskill(sd,BS_WEAPONRESEARCH))>0) // is this correct in pre? there is already hitrate bonus in battle.c status->hit += skill*2; +#endif if((skill=pc->checkskill(sd,AC_VULTURE))>0){ #ifndef RENEWAL status->hit += skill; |