Merge pull request #5183 from syrifgit/im-sorry-shadow-priests

Shadowpriests can play the Long VF build now I guess

Author: Hekili

TheWarWithin/PriestShadow.lua

@@ -603,6 +603,7 @@ spec:RegisterAuras( {
         max_stack = 1
     },
     power_surge = {
+        id = 453113,
         duration = 10,
         tick_time = 5,
         max_stack = 1
@@ -738,6 +739,11 @@ spec:RegisterAuras( {
         duration = 3600,
         max_stack = 1
     },
+    sustained_potency = {
+        id = 454002,
+        duration =  60,
+        max_stack = 6
+    },
     -- Taking Shadow damage every $t1 sec.
     -- https://wowhead.com/beta/spell=363656
     torment_mind = {
@@ -985,6 +991,10 @@ spec:RegisterStateExpr( "tww3_archon_4pc_helper_stacks", function()
     return PowerSurgeDPs
 end )
 
+spec:RegisterStateExpr( "tww3_archon_halo_extensions", function()
+    return floor( PowerSurgeDPs / 2 )
+end )
+
 spec:RegisterStateTable( "priest", setmetatable( {},{
     __index = function( t, k )
         if k == "self_power_infusion" then return true
@@ -1017,7 +1027,7 @@ spec:RegisterGear( {
             tww3_archon_4pc_helper = {
                 -- id = 999999, -- dummy ID
                 duration = spec.auras.power_surge.duration,
-                max_stack = 6, -- 3 extensions max * 2 casts per extension
+                max_stack = 4, -- 3 extensions max * 2 casts per extension
                 generate = function( t )
                     if tww3_archon_4pc_helper_stacks > 0 and state.buff.power_surge.up then
                         local power_surge_expiry = state.buff.power_surge.expires
@@ -1166,12 +1176,15 @@ spec:RegisterHook( "reset_precast", function ()
 
     rift_extensions = nil
 
-    if talent.power_surge.enabled and query_time - action.halo.lastCast < 10 then
-        applyBuff( "power_surge", ( 10 + 5 * floor( tww3_archon_4pc_helper_stacks / 2 ) ) - ( query_time - action.halo.lastCast ) )
-        if buff.power_surge.remains > 5 then
-            state:QueueAuraEvent( "power_surge", PowerSurge, buff.power_surge.expires - 5, "TICK" )
+    if buff.power_surge.up then
+        local tick, expires = buff.power_surge.applied, buff.power_surge.expires
+        local final_tick = ( 2 + tww3_archon_halo_extensions )
+        for i = 1, final_tick do
+            tick = tick + 5
+            if tick > query_time and tick <= expires then
+                state:QueueAuraEvent( "create_additional_halo", PowerSurge, tick, "AURA_TICK" )
+            end
         end
-        state:QueueAuraExpiration( "power_surge", PowerSurge, buff.power_surge.expires )
     end
 
     local vwRemains = cooldown.voidwraith.true_remains
@@ -1218,10 +1231,10 @@ local InescapableTorment = setfenv( function ()
 end, state )
 
 local TWW3ArchonTrigger = setfenv( function()
-    if tww3_archon_4pc_helper_stacks >= 6 then
+    if tww3_archon_4pc_helper_stacks >= 4 then
         return
     else
-        tww3_archon_4pc_helper_stacks = min( 6, tww3_archon_4pc_helper_stacks + 1 )
+        tww3_archon_4pc_helper_stacks = min( 4, tww3_archon_4pc_helper_stacks + 1 )
         if tww3_archon_4pc_helper_stacks % 2 == 0 then
             buff.power_surge.expires = buff.power_surge.expires + 5
         end
@@ -1480,7 +1493,7 @@ spec:RegisterAbilities( {
     halo = {
         id = 120644,
         cast = 1.5,
-        cooldown = 40,
+        cooldown = 60,
         gcd = "spell",
         school = "shadow",
 
@@ -1492,7 +1505,25 @@ spec:RegisterAbilities( {
 
         handler = function ()
             gain( 10, "insanity" )
-            if talent.power_surge.enabled then applyBuff( "power_surge" ) end
+            if talent.power_surge.enabled then
+                if buff.power_surge.down then
+                    -- Don't repeatedly run these during "additional Halos", only run during initial cast
+                    applyBuff( "power_surge", nil, 10 )
+                    for i = 5, 10, 5 do
+                        -- Queue the additional Halos, one every 5 seconds until expiry
+                        -- Further halos beyond base duration from TWW3 set will be added during reset_precast
+                        state:QueueAuraEvent( "create_additional_halo", PowerSurge, query_time + i, "AURA_TICK" )
+                    end
+                end
+                if talent.manifested_power.enabled then addStack( "mind_flay_insanity" ) end
+                if talent.sustained_potency.enabled then
+                    if buff.voidform.up then
+                        buff.voidform.expires = buff.voidform.expires + 1
+                    else
+                        addStack( "sustained_potency" )
+                    end
+                end
+            end
         end,
     },
 
@@ -2158,9 +2189,9 @@ spec:RegisterAbilities( {
             end
         end,
 
-        readyTime = function() 
+        readyTime = function()
             local holdCount = settings.hold_crash
-            if holdCount > 0 and active_enemies < holdCount then return action.shadow_crash.full_recharge_time end 
+            if holdCount > 0 and active_enemies < holdCount then return action.shadow_crash.full_recharge_time end
         end,
 
         copy = { 205385, 457042 }
@@ -2400,7 +2431,7 @@ spec:RegisterAbilities( {
                 spend( spec.abilities.void_bolt.spend, spec.abilities.void_bolt.spendType )
                 applyBuff( "power_infusion", buff.power_infusion.remains + 5 )
             end
-            applyBuff( "voidform" )
+            applyBuff( "voidform", nil, ( 20 + ( buff.sustained_potency.stack ) ) )
             if talent.ancient_madness.enabled then applyBuff( "ancient_madness", nil, 20 ) end
         end,
     },