[Druid] Solar wrath needs some astral power resources.

simulationcraft · Oct 30, 2016 · 2127af7 · 2127af7
1 parent 3ac8300
commit 2127af7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/WinReleaseScripts/WinCompileUpload.bat b/WinReleaseScripts/WinCompileUpload.bat
@@ -12,7 +12,7 @@ set simcversion=710-01
 set SIMCAPPFULLVERSION=7.1.0.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.2\5.6\
+set qt_dir=C:\Qt\Qt5.6.0\5.6\
 set visualstudio=%VS140COMNTOOLS:~0,-14%
 cd ..
 git clean -f -x -d

diff --git a/WinReleaseScripts/WinCompileUpload_32.bat b/WinReleaseScripts/WinCompileUpload_32.bat
@@ -12,7 +12,7 @@ set simcversion=710-01
 set SIMCAPPFULLVERSION=7.1.0.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.2.32\5.6\
+set qt_dir=C:\Qt\Qt5.6.0.32\5.6\
 set visualstudio=%VS140COMNTOOLS:~0,-14%
 cd ..
 git clean -f -x -d

diff --git a/WinReleaseScripts/WinCompileUpload_DEBUG.bat b/WinReleaseScripts/WinCompileUpload_DEBUG.bat
@@ -11,7 +11,7 @@
 cd ..
 git clean -f -x -d
 set currdir=%cd%
-call C:\Qt\Qt5.6.2\5.6\msvc2015_64\bin\qtenv2.bat
+call C:\Qt\Qt5.6.0\5.6\msvc2015_64\bin\qtenv2.bat
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
 cd %currdir%
 qmake -r -tp vc -spec win32-msvc2015 simulationcraft.pro

diff --git a/engine/class_modules/sc_druid.cpp b/engine/class_modules/sc_druid.cpp
@@ -4844,7 +4844,7 @@ struct lunar_strike_t : public druid_spell_t
   void impact( action_state_t* s ) override
   {
     druid_spell_t::impact( s );
-    // Nature's Balance only extends Moonfire on the primary target.
+    // Nature's Balance only extends Moonfire on the primary target. FIXME: Actually extends the duration of ALL sunfires.
     if ( natures_balance > timespan_t::zero() && hit_any_target )
     {
       td( s -> target ) -> dots.moonfire -> extend_duration( natures_balance, timespan_t::from_seconds( 20.0 ) );
@@ -5147,6 +5147,7 @@ struct solar_wrath_t : public druid_spell_t
     base_execute_time *= 1.0 + player -> sets.set( DRUID_BALANCE, T17, B2 ) -> effectN( 1 ).percent();
     base_multiplier   *= 1.0 + player -> artifact.skywrath.percent();
     base_multiplier   *= 1.0 + player -> artifact.solar_stabbing.percent();
+    energize_amount = player -> spec.astral_power -> effectN( 2 ) .resource( RESOURCE_ASTRAL_POWER );
   }
 
   double composite_crit_chance() const override