Skip to content

Commit

Permalink
[Warlock] Adjust 7.1.5 damage bonus.
Browse files Browse the repository at this point in the history
  • Loading branch information
Collisionc committed Jan 11, 2017
1 parent ca2b383 commit 3b52b5d
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions engine/class_modules/sc_warlock.cpp
Expand Up @@ -2235,7 +2235,8 @@ struct warlock_spell_t: public spell_t
bool affected_by_contagion;
bool affected_by_flamelicked;
bool affected_by_odr_shawl_of_the_ymirjar;
bool affected_by_destruction_hotfix;
bool destruction_damage_increase;
bool destruction_dot_increase;
bool destro_mastery;

// Warlock module overrides the "target" option handling to properly target their own Soul Effigy
Expand Down Expand Up @@ -2330,7 +2331,12 @@ struct warlock_spell_t: public spell_t
}

affected_by_odr_shawl_of_the_ymirjar = data().affected_by( p() -> find_spell( 212173 ) -> effectN( 1 ) );
affected_by_destruction_hotfix = data().affected_by( p() -> spec.destruction -> effectN( 1 ) );
destruction_damage_increase = data().affected_by( p() -> spec.destruction -> effectN( 1 ) );
destruction_dot_increase = data().affected_by( p() -> spec.destruction -> effectN( 2 ) );
if ( destruction_damage_increase )
base_dd_multiplier *= 1.0 + p() -> spec.destruction -> effectN( 1 ).percent();
if ( destruction_dot_increase )
base_td_multiplier *= 1.0 + p() -> spec.destruction -> effectN( 2 ).percent();
}

int n_targets() const override
Expand Down Expand Up @@ -2538,9 +2544,6 @@ struct warlock_spell_t: public spell_t
pm *= 1.0 + chaotic_energies_rng;
}

if ( affected_by_destruction_hotfix )
pm *= 1.0 + p() -> spec.destruction -> effectN( 1 ).percent();

return pm;
}

Expand Down

0 comments on commit 3b52b5d

Please sign in to comment.