Skip to content

Commit

Permalink
[Havoc] Add Chaotic Transformation Support
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanMichaels committed Dec 10, 2018
1 parent cb6e3d5 commit 37be703
Show file tree
Hide file tree
Showing 15 changed files with 224,060 additions and 18 deletions.
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[*.{c,h,cpp,hpp}]
indent_size = 2
indent_style = space
Binary file added Report20180903-1845.vspx
Binary file not shown.
Binary file added Report20180903-1920.vspx
Binary file not shown.
218,171 changes: 218,171 additions & 0 deletions SimulationCraft.map

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions WinReleaseScripts/WinGenerateSLN - Copy.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
:: Example script that will work on a computer with qt 5.6 + vs2015
:: See: https://github.com/simulationcraft/simc/wiki/HowToBuild#alternate-way-for-microsoft-windows
:: These are default paths, if installed to non-default paths enter those in instead.
:: Change 5.6.2\5.6 to 5.x.y\5.x if you are using qt 5.x.y instead.
:: Change win32-msvc2015 to win32-msvc2013 and 14.0 to 12.0 for vs2013
:: qmake must be in your path
cd ..
set currdir=%cd%
call C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\bin\qtenv2.bat
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
cd /D %currdir%
qmake -r -tp vc -spec win32-msvc simulationcraft.pro
288 changes: 288 additions & 0 deletions debug.log

Large diffs are not rendered by default.

37 changes: 31 additions & 6 deletions engine/class_modules/sc_demon_hunter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ class demon_hunter_t : public player_t
struct azerite_t
{
// Havoc
azerite_power_t chaotic_transformation;
azerite_power_t eyes_of_rage;
azerite_power_t furious_gaze;
azerite_power_t revolving_blades;
Expand Down Expand Up @@ -2407,6 +2408,11 @@ struct metamorphosis_t : public demon_hunter_spell_t
{
p()->buff.metamorphosis->trigger();
}

if ( p()->azerite.chaotic_transformation.ok() )
{
p()->cooldown.eye_beam->reset( false );
}
}
else // DEMON_HUNTER_VENGEANCE
{
Expand Down Expand Up @@ -3313,6 +3319,15 @@ struct demons_bite_t : public demon_hunter_attack_t
return ea;
}

virtual double bonus_da( const action_state_t* s ) const override
{
double b = demon_hunter_attack_t::bonus_da( s );

b += p()->azerite.chaotic_transformation.value( 2 );

return b;
}

void execute() override
{
demon_hunter_attack_t::execute();
Expand Down Expand Up @@ -3351,6 +3366,15 @@ struct demon_blades_t : public demon_hunter_attack_t
energize_delta = energize_amount * data().effectN( 2 ).m_delta();
}

virtual double bonus_da( const action_state_t* s ) const override
{
double b = demon_hunter_attack_t::bonus_da( s );

b += p()->azerite.chaotic_transformation.value( 2 );

return b;
}

void impact( action_state_t* s ) override
{
demon_hunter_attack_t::impact( s );
Expand Down Expand Up @@ -4771,11 +4795,12 @@ void demon_hunter_t::init_spells()
// Azerite ================================================================

// Havoc
azerite.eyes_of_rage = find_azerite_spell( "Eyes of Rage" );
azerite.furious_gaze = find_azerite_spell( "Furious Gaze" );
azerite.revolving_blades = find_azerite_spell( "Revolving Blades" );
azerite.seething_power = find_azerite_spell( "Seething Power" );
azerite.thirsting_blades = find_azerite_spell( "Thirsting Blades" );
azerite.chaotic_transformation = find_azerite_spell( "Chaotic Transformation" );
azerite.eyes_of_rage = find_azerite_spell( "Eyes of Rage" );
azerite.furious_gaze = find_azerite_spell( "Furious Gaze" );
azerite.revolving_blades = find_azerite_spell( "Revolving Blades" );
azerite.seething_power = find_azerite_spell( "Seething Power" );
azerite.thirsting_blades = find_azerite_spell( "Thirsting Blades" );

// Spell Initialization ===================================================

Expand Down Expand Up @@ -4924,7 +4949,7 @@ void demon_hunter_t::apl_precombat()

if (specialization() == DEMON_HUNTER_HAVOC)
{
pre->add_action( this, "Metamorphosis" );
pre->add_action( this, "Metamorphosis", "if=!azerite.chaotic_transformation.enabled" );
}
}

Expand Down
Loading

0 comments on commit 37be703

Please sign in to comment.