Permalink
Browse files

Merge branch 'legion-dev' of https://github.com/simulationcraft/simc

…into legion-dev
  • Loading branch information...
2 parents 806a58f + 4568440 commit 1a368b06e5b74f71df3b3671f2787e8be6b778a8 @pkaskaround pkaskaround committed Jan 11, 2017
@@ -12,7 +12,7 @@ set simcversion=715-01
set SIMCAPPFULLVERSION=7.1.5.01
:: For bumping the minor version, just change the above line. Make sure to also change setup32.iss and setup64.iss as well.
-set qt_dir=C:\Qt\Qt5.6.0.32\5.6\
+set qt_dir=C:\Qt\Qt5.7.1.32\5.7\
set visualstudio=%VS140COMNTOOLS:~0,-14%
cd ..
git clean -f -x -d
@@ -701,7 +701,7 @@ struct death_knight_t : public player_t {
artifact_power_t sanguinary_affinity;
artifact_power_t vampiric_fangs;
artifact_power_t rattling_bones;
- artifact_power_t bone_breaker;
+ artifact_power_t bonebreaker;
artifact_power_t allconsuming_rot;
artifact_power_t unending_thirst;
artifact_power_t blood_feast;
@@ -4903,7 +4903,7 @@ struct marrowrend_t : public death_knight_melee_attack_t
{
parse_options( options_str );
- base_multiplier *= 1.0 + p -> artifact.bone_breaker.percent();
+ base_multiplier *= 1.0 + p -> artifact.bonebreaker.percent();
weapon = &( p -> main_hand_weapon );
}
@@ -6740,7 +6740,7 @@ void death_knight_t::init_spells()
artifact.sanguinary_affinity = find_artifact_spell( "Sanguinary Affinity" );
artifact.vampiric_fangs = find_artifact_spell( "Vampiric Fangs" );
artifact.rattling_bones = find_artifact_spell( "Rattling Bones" );
- artifact.bone_breaker = find_artifact_spell( "Bone Breaker" );
+ artifact.bonebreaker = find_artifact_spell( "Bonebreaker" );
artifact.allconsuming_rot = find_artifact_spell( "All-Consuming Rot" );
artifact.unending_thirst = find_artifact_spell( "Unending Thirst" );
artifact.blood_feast = find_artifact_spell( "Blood Feast" );
@@ -7224,6 +7224,7 @@ void death_knight_t::create_buffs()
.spell( find_spell( 81141 ) )
.trigger_spell( spec.crimson_scourge );
buffs.dancing_rune_weapon = buff_creator_t( this, "dancing_rune_weapon", find_spell( 81256 ) )
+ .duration( find_spell( 81256 ) -> duration() + artifact.dance_of_darkness.time_value() )
.cd( timespan_t::zero() )
.add_invalidate( CACHE_PARRY );
buffs.dark_transformation = buff_creator_t( this, "dark_transformation", find_class_spell( "Dark Transformation" ) )
@@ -7572,6 +7573,8 @@ double death_knight_t::composite_armor_multiplier() const
a *= 1.0 + runeforge.rune_of_the_stoneskin_gargoyle -> data().effectN( 1 ).percent();
a *= 1.0 + artifact.frozen_skin.percent();
+
+ a *= 1.0 + artifact.iron_heart.percent();
return a;
}
@@ -7593,7 +7596,7 @@ double death_knight_t::composite_attribute_multiplier( attribute_e attr ) const
else if ( attr == ATTR_STAMINA )
{
m *= 1.0 + spec.veteran_of_the_third_war -> effectN( 5 ).percent();
-
+ m *= 1.0 + artifact.meat_shield.percent();
if ( runeforge.rune_of_the_stoneskin_gargoyle -> check() )
m *= 1.0 + runeforge.rune_of_the_stoneskin_gargoyle -> data().effectN( 2 ).percent();
}
@@ -7662,6 +7665,8 @@ double death_knight_t::composite_parry_rating() const
double death_knight_t::composite_parry() const
{
double parry = player_t::composite_parry();
+
+ parry *= 1.0 + artifact.grim_perseverance.percent();
if ( buffs.dancing_rune_weapon -> up() )
parry += buffs.dancing_rune_weapon -> data().effectN( 1 ).percent();
@@ -7710,6 +7715,7 @@ double death_knight_t::composite_player_multiplier( school_e school ) const
m *= 1.0 + artifact.soulbiter.percent();
m *= 1.0 + artifact.fleshsearer.percent();
+ m *= 1.0 + artifact.sanguinary_affinity.percent();
if ( buffs.t18_4pc_unholy -> up() )
{
@@ -54,7 +54,7 @@ actions.cds+=/exsanguinate,if=prev_gcd.1.rupture&dot.rupture.remains>4+4*cp_max_
# Finishers
actions.finish=death_from_above,if=combo_points>=cp_max_spend
-actions.finish+=/envenom,if=combo_points>=5|(talent.elaborate_planning.enabled&combo_points>=3+!talent.exsanguinate.enabled&buff.elaborate_planning.remains<0.1)
+actions.finish+=/envenom,if=combo_points>=4|(talent.elaborate_planning.enabled&combo_points>=3+!talent.exsanguinate.enabled&buff.elaborate_planning.remains<0.1)
# Maintain
actions.maintain=rupture,if=(talent.nightstalker.enabled&stealthed.rogue)|(talent.exsanguinate.enabled&((combo_points>=cp_max_spend&cooldown.exsanguinate.remains<1)|(!ticking&(time>10|combo_points>=2+artifact.urge_to_kill.enabled))))

0 comments on commit 1a368b0

Please sign in to comment.