Skip to content

Commit

Permalink
Occult Impaction damage (fixes #1641)
Browse files Browse the repository at this point in the history
- Fixed Occult Impaction damage being double as high as it should be
- In renewal, the skill ratio is now applied to the piercing effect
(If a skill deals 400% damage, the piercing effect will now also be 4 times more effective.)
  • Loading branch information
Playtester committed Oct 22, 2016
1 parent d20cbca commit 04cf397
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/map/battle.c
Expand Up @@ -3524,7 +3524,7 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
skillratio += 50 * skill_lv;
break;
case MO_INVESTIGATE:
skillratio += 100 + 150 * skill_lv;
skillratio += 75 * skill_lv;
break;
case MO_EXTREMITYFIST:
skillratio += 100 * (7 + sstatus->sp / 10);
Expand Down Expand Up @@ -4661,8 +4661,8 @@ struct Damage battle_calc_defense_reduction(struct Damage wd, struct block_list
if( def1 == -400 ) /* -400 creates a division by 0 and subsequently crashes */
def1 = -399;
ATK_ADD2(wd.damage, wd.damage2,
is_attack_piercing(wd, src, target, skill_id, skill_lv, EQI_HAND_R) ? (def1/2) : 0,
is_attack_piercing(wd, src, target, skill_id, skill_lv, EQI_HAND_L) ? (def1/2) : 0
is_attack_piercing(wd, src, target, skill_id, skill_lv, EQI_HAND_R) ? (def1*battle_calc_attack_skill_ratio(wd, src, target, skill_id, skill_lv))/200 : 0,
is_attack_piercing(wd, src, target, skill_id, skill_lv, EQI_HAND_L) ? (def1*battle_calc_attack_skill_ratio(wd, src, target, skill_id, skill_lv))/200 : 0
);
if( !attack_ignores_def(wd, src, target, skill_id, skill_lv, EQI_HAND_R) && !is_attack_piercing(wd, src, target, skill_id, skill_lv, EQI_HAND_R) )
wd.damage = wd.damage * (4000+def1) / (4000+10*def1) - vit_def;
Expand Down

0 comments on commit 04cf397

Please sign in to comment.