Skip to content

Commit

Permalink
* Change whitelisting of a Shadow Word: Death spell
Browse files Browse the repository at this point in the history
* Regenerate DBC's
* Some Priest fixes.
  • Loading branch information
Alistair Kerr committed Feb 2, 2016
1 parent 4163929 commit c8276d5
Show file tree
Hide file tree
Showing 4 changed files with 288 additions and 284 deletions.
2 changes: 1 addition & 1 deletion dbc_extract2/dbc/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ class SpellDataGenerator(DataGenerator):
( 129197, 3 ), # Mind Flay (Insanity)
( 179338, 3 ), # Searing Insanity
( 165623, 0 ), # Item - Priest T17 Shadow 2P Bonus - dot spell
( 190714, 3 ), # Shadow Word: Death - Insanity gain
( 190714, 3, False ), # Shadow Word: Death - Insanity gain
),

# Death Knight:
Expand Down
23 changes: 13 additions & 10 deletions engine/class_modules/sc_priest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2399,8 +2399,8 @@ struct shadow_word_death_t : public priest_spell_t
shadow_word_death_t( priest_t& p, const std::string& options_str )
: priest_spell_t( "shadow_word_death", p,
p.find_class_spell( "Shadow Word: Death" ) ),
insanity_gain( 30.0 ) // FIXME not in spelldata
// insanity_gain( p.find_spell( 190714 )->effectN( 3 ).percent() ) // Probably the right value.
//insanity_gain( 30.0 ) // FIXME not in spelldata
insanity_gain( p.find_spell( 190714 )->effectN( 1 ).resource(RESOURCE_INSANITY) )
{
parse_options( options_str );

Expand All @@ -2427,16 +2427,19 @@ struct shadow_word_death_t : public priest_spell_t

void impact( action_state_t* s ) override
{
if ( result_is_hit( s->result ) )
{
if ( priest.talents.reaper_of_souls->ok() )
generate_insanity(
insanity_gain,
priest.gains
.insanity_shadow_word_death );
}
double save_health_percentage = s->target->health_percentage();

priest_spell_t::impact( s );

if (result_is_hit(s->result))
{
if ( priest.talents.reaper_of_souls->ok() ||
( ( save_health_percentage > 0.0 ) && ( s->target->health_percentage() <= 0.0 ) ) )
generate_insanity(
insanity_gain,
priest.gains
.insanity_shadow_word_death);
}
}

double composite_da_multiplier( const action_state_t* state ) const override
Expand Down
Loading

0 comments on commit c8276d5

Please sign in to comment.