diff --git a/TheWarWithin/HunterBeastMastery.lua b/TheWarWithin/HunterBeastMastery.lua index 79b0b8388..691f64e5a 100644 --- a/TheWarWithin/HunterBeastMastery.lua +++ b/TheWarWithin/HunterBeastMastery.lua @@ -382,7 +382,7 @@ spec:RegisterAuras( { }, barbed_shot_2 = { id = 246851, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -390,7 +390,7 @@ spec:RegisterAuras( { }, barbed_shot_3 = { id = 246852, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -398,7 +398,7 @@ spec:RegisterAuras( { }, barbed_shot_4 = { id = 246853, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -406,7 +406,7 @@ spec:RegisterAuras( { }, barbed_shot_5 = { id = 246854, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -414,7 +414,7 @@ spec:RegisterAuras( { }, barbed_shot_6 = { id = 284255, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -422,7 +422,7 @@ spec:RegisterAuras( { }, barbed_shot_7 = { id = 284257, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -430,7 +430,7 @@ spec:RegisterAuras( { }, barbed_shot_8 = { id = 284258, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -438,7 +438,7 @@ spec:RegisterAuras( { }, barbed_shot_dot = { id = 217200, - duration = function() return 8 + ( talent.savagery.enabled and 2 or 0 ) end, + duration = function () return spec.auras.barbed_shot.duration end, tick_time = 2, mechanic = "bleed", type = "Ranged", @@ -731,7 +731,7 @@ spec:RegisterAuras( { -- https://wowhead.com/beta/spell=272790 frenzy = { id = 272790, - duration = function () return azerite.feeding_frenzy.enabled and 9 or 8 end, + duration = function () return azerite.feeding_frenzy.enabled and 9 or spec.auras.barbed_shot.duration end, max_stack = 3, generate = function () local fr = buff.frenzy @@ -1047,7 +1047,7 @@ spec:RegisterAuras( { -- https://wowhead.com/beta/spell=257946 thrill_of_the_hunt = { id = 257946, - duration = 8, + duration = function () return spec.auras.barbed_shot.duration end, max_stack = 3, copy = 312365 }, @@ -1215,12 +1215,18 @@ spec:RegisterAura( "lethal_command", { } ) +local CallOfTheWildCDR = setfenv( function() + reduceCooldown( "kill_command", spec.abilities.kill_command.cooldown/2 ) + reduceCooldown( "barbed_shot", spec.abilities.barbed_shot.cooldown/2 ) +end, state ) + + spec:RegisterHook( "reset_precast", function() if debuff.tar_trap.up then debuff.tar_trap.expires = debuff.tar_trap.applied + 30 end - if talent.blood_frenzy.enabled and buff.call_of_the_wild.up then + if talent.bloody_frenzy.enabled and buff.call_of_the_wild.up then applyBuff( "beast_cleave", max( buff.beast_cleave.remains, buff.call_of_the_wild.remains ) ) end @@ -1228,6 +1234,17 @@ spec:RegisterHook( "reset_precast", function() state:QueueAuraExpiration( "nesingwarys_apparatus", ExpireNesingwarysTrappingApparatus, buff.nesingwarys_apparatus.expires ) end + if buff.call_of_the_wild.up then + local tick, expires = buff.call_of_the_wild.applied, buff.call_of_the_wild.expires + + for i = 1, 5 do + tick = tick + 4 + if tick > query_time and tick < expires then + state:QueueAuraEvent( "call_of_the_wild_cdr", CallOfTheWildCDR, tick, "AURA_TICK" ) + end + end + end + if now - action.resonating_arrow.lastCast < 6 then applyBuff( "resonating_arrow", 10 - ( now - action.resonating_arrow.lastCast ) ) end end ) @@ -1376,7 +1393,7 @@ spec:RegisterAbilities( { end applyDebuff( "target", "barbed_shot_dot" ) - addStack( "frenzy", 8, 1 ) + addStack( "frenzy", spec.auras.frenzy.duration, 1 ) if talent.barbed_wrath.enabled then reduceCooldown( "bestial_wrath", 12 ) end if talent.thrill_of_the_hunt.enabled then addStack( "thrill_of_the_hunt", nil, 1 ) end @@ -1518,6 +1535,13 @@ spec:RegisterAbilities( { handler = function () applyBuff( "call_of_the_wild" ) + reduceCooldown( "kill_command", spec.abilities.kill_command.cooldown/2 ) + reduceCooldown( "barbed_shot", spec.abilities.barbed_shot.cooldown/2 ) + state:QueueAuraEvent( "call_of_the_wild_cdr", CallOfTheWildCDR, query_time + 4, "AURA_TICK" ) + state:QueueAuraEvent( "call_of_the_wild_cdr", CallOfTheWildCDR, query_time + 8, "AURA_TICK" ) + state:QueueAuraEvent( "call_of_the_wild_cdr", CallOfTheWildCDR, query_time + 12, "AURA_TICK" ) + state:QueueAuraEvent( "call_of_the_wild_cdr", CallOfTheWildCDR, query_time + 16, "AURA_TICK" ) + state:QueueAuraEvent( "call_of_the_wild_cdr", CallOfTheWildCDR, query_time + 20, "AURA_TICK" ) if talent.bloody_frenzy.enabled then applyBuff( "beast_cleave", 20 ) end end, }, @@ -2412,9 +2436,22 @@ spec:RegisterSetting( "barbed_shot_grace_period", 0.5, { min = 0, max = 1, step = 0.01, - width = "full" + width = "normal" } ) +--[[ +spec:RegisterSetting( "pet_healing", 0, { + name = "|T132179:0|t Mend Pet Usage", + desc = "If set above zero, the addon will recommend |T132179:0|t Mend Pet when your pet falls below this HP, only when solo.", + icon = 132179, + iconCoords = { 0.1, 0.9, 0.1, 0.9 }, + type = "range", + min = 0, + max = 100, + step = 1, + width = "normal" +} ) ]]-- + spec:RegisterSetting( "avoid_bw_overlap", false, { name = "Avoid |T132127:0|t Bestial Wrath Overlap", desc = "If checked, the addon will not recommend |T132127:0|t Bestial Wrath if the buff is already applied.", diff --git a/TheWarWithin/MageArcane.lua b/TheWarWithin/MageArcane.lua index b86e9d465..26ad4b8d0 100644 --- a/TheWarWithin/MageArcane.lua +++ b/TheWarWithin/MageArcane.lua @@ -2211,4 +2211,4 @@ spec:RegisterSetting( "cancel_pom", false, { width = "full" } ) -spec:RegisterPack( "Arcane", 20240910.1, [[Hekili:TZ1EtUTns(plUCvYIjYJ1JzCSZknv51xUBTRlztvYBU)4QvuuKuJ4o8HcFmJNRMIF2VUbabbaba58YXjBQkvSTiiqJ(5VUrdUz2MpTzDGxz4MFA(05No9TZMEYSxV4nZoBZ6YBogUz9rp)l9Ua(lPEjW))D5(EPKF(M4mVa81lYQY9HF6qz5XIV)vV6IOYdv7oXpl5vfrjvXELrzP(5E7lX)T)R2SExvuC5hs3St3A)6PVbMZJH(B(PxphM1OGGq6qdl83Sgh6lN(2xoB63xV9txh6Dz92SJHPH51FS(JnpD6Sj1BX)Cb7pFdm61rjVVEB1rCnBh8BE583A8HF3lNJV5NoewV9)Xlh(FWMlkDZ64OIYcC37h4sxE4F8te2zyQ3U4WGn)v4H5rLH5rEBwpUE7X8WRCVWp4KzN4r4IU78YZbEB92r1BHb45JCkLhEsuQ7(4Olou6MhM4fLwuVD5kytDYz1BV926T4m29jont6UQ97BMYIQCycRosFr)SS4GSRtLFkFQoVE7IPKjYHoETBbYlrwlXfY)GhoxfLGYdqu1BpfMLnRRkcDZ2VhNbKxTMUHbnTSk)dWtClpe6M4DrevyNhDK(8pHpheZ7R3wIsIFegciRkcdQ3E9HW06Tu1Y6T)1goAeSdsIcEjL1bVli7IG3)MSQ6T)RQIYM3V5nxt3iEPbSbfKL(cyuh8UkKq)nd89K9wXegTCTxemkMIEyb7xlJsqIaEsP3LKFnRE7VwfwrwImyma9ak5XXW)EFj(VyBs6(HqbmskkfFzYJ3uc2kg1XisaqeveM6JmA3KO0aqC3YOBuTI9kkX5AHX5Q0lomT8Kda3Z9QS4sutKnWbiTr7d8bbBwpBANLplFNIa(Fua7Z)E(U6T7rbfDcleKyuPWFdOM6T)cLCOcaGxfEvMpXhd)x(XOIIOyCcit3pfs53)CEOFuH4aLe(id5uJmKESwwsSpqtJeVpxV9BaJNgJq(B2rn32RFgXIPHZX3JirEMcrQWEty7EGMp4H(QMjiowaIdqHkmpV6yPB0Eqsh5FPlQVEUGNKru5lHX56vwwLgMG6d4(qAcsscdIqF44Q0YTUYd(dG(oH5Ag5dmvQu6KESry0vTQZiux1lIZ25fJljWnED)ISEz8YEEPI2Wph6xvg6snL)2ocOX2mcwrD5r)VosOcM6wjAgS3RkUKh8OzK(zv42L4IqC714aOzCKbuug6PokZM2pdmz(1QOJhddoP44njGVayHCVoCNumJIOJhYsDlkZYt4XmGh(mUKKRukjcnzO4fCJy0e6AiT8sUQoM1OUB2MuB4nCTjesqi5HDf(8rGR1vHUGgAse6T4CqSnxsGrIEu4(VQcUa1)1z91tm(2aKDSjAJR2ZBcpEVccG6TVzk91lr9oWtnOcuE4KJ(LKNUGHoOvA147plbqweqSM5ITbhK3MUJSQ(o43dZVmk9c7gP)jttKPfNLf4UVk)gKP9D)jtBimT9r5HeghYZEZFYZgcpZdqiwuM7f767bbyag3BnaQaXSdSWKcvm55rPxgwsqX6hTpYNaOgC)7vGUsb25ntqFWKWBu84uy3xdzq1gLOquezCVH7DHhYd8qFsxU)8PC(lxUI8ISOa3skH72WPWnpasv)UxMlou1jZKRZxgngMUIAm28WJz5LIyuMsOhfIbY8B(PsP(TlROq3ijS6MsdOWRq2QA(WnSvsAfGIdKBemApF)8qgSNho)vk12wikI08P3HDLjsf3EsPITtl0trcGGaYwM38bmiklk5yy((q)sxVc)W0aWM(gxiMBvcH4ubaYt2gwhFaFDwvbyl4LwKevcuDNej1NNdOBmBrFgK9NR0SP3HnQjkg3LQGd5o4a8hWqlDjaKH0aXsyjHbUxhdmkSdwyk8rMjMnK0ASKpNAj70S10rM42YmitBCSUj6tlhczkvHGj5n)hWKne8kZZqMoH1BX6DHUZHGJbaMU6Tz0QuaVekzA8kH5UNf5JjFYZKbcW4s)hU4SyjnrAz1CPSM2cRHuVzSq6aXpwq86Lb5WrKeUKKQi5YX8HIMqLvfsHAhj6KLkwaagGac2NH8HcU7a9f)sP6y1DRkSFOzQbjIFbMsDgvOygUYtabuL2GSCMA0EjlJNGLwyVtsHDQyoSkkRs5Xwsqf4Jb56MKm7fXcdehdoc1LOSWMmdsVeRowz7m0OLq(BmIvvHPnj91Z1LznoTgN04k4pEREgmq(ahX1po07QWwMRfkrt2W9V6JTwckmZEoQe9oUBs(xxvsWQJ4webWjjUGoBqbaWGiNPBzBJwQSMTpONfuta)MvtKZ26zr1tB)8ZzdSoPssYyWvDwjVeEQoJ7Fv5bAUi2dR4wgeOzNxqdCO24qrxKc6lmr8X8OS8BugIbinQtKsanPhAiKSYOSGqro8ZVW2TyXUdI8PfsNKobwZFpWIPjBJYdELiSHSIsyiasw8pcQYjXK2vLJoEAz72W8)DIEssIYZZYDJs64aYsgLwQewxNBnLC3SN3(NlXQax26qxZbpXZF5q0(s0jZXSRX4RsC9)tS44RPtceWFnBS1B)zCWyi(4BeoqIxKdYJ0m8KtsdWNtoPJW9OaMjOsVXqMDJnCwu8sXzcM1GQJ3aS(hnS6WFofAQJH0IAFM6UjRkMrpo6c90gLeCCf7IVA3JdRLDbUcqjrXjSXFmlPzvhZziiLxa2XE5x6kQL14s3w1lidSLX35qJAtrCgFUubATKxJBAgdmBo15YEXOnkCLostED3hz6icW98i90yl3xhPzmbcfqjswoV7V)dkN1yg8KKO)pedj5mN2xLMgIhUxjZoXpRGzLuKHhOq2vH5E4X)bZ1eIdUMJjmb8ldJQcn3eo8R3dWeaAQGAIA7KXON2Pxk7i1ONmr9ws(L2nk1Digck7D46TdCEJHHb44Gj4lj)L5nhEYakJH(COyvdXP5)gzhqLGHZGoutFb(mMtoUKTwtQiBYY3jLylxtTlGjCO8t2eCMmvyp4ixZMUh8gt)(EVdgztqFoXmxNWJA)RdNKIDs3Z0LO7XvtLonDfTvYzU71rdpLyByQUeDo055D2KcoLPQapRhgipFFDCWvujMo0BdYNb3Dbgqn8kma6hslRIWN(QpKcVjo8qcWwch5N(zQRLQJyHuZQi4Jca8lChaZiiG8VCc1INwF1IMm0XUpqK)xQZtc8QEXfzcEZAatXpBCGlcdciK4m83X)MOi137iTAaYIVJ5z(ftAB8cw7nGBiBoIUiodGScOkJe5i80biJjQHTjyEoyVuIMzApOz72rRKTBLmAf06yMRcBmDt2YMUeGV1eNdTUvmUSMDDBf3dVKJnthGHoimfhfbYyZoXCuxgVq3bwjP)32ugueLO651uviipbc)at6bK9ckJ(zGYm((OQeVbaAcPEWJgKL3fciEvw70qgX)17)pqsVKHBvjO57y9fY74Uz74SXGR0X9QdjYsnOhTquuoih7MC9TOvkO6lQTzqm20g8MeXqdwy9i1SQcUORMDNXyf4Wc7y3mDMvS1k8ZhJZki)ICXoB(DkElSBedykm7JYlkBHmPOWmvzZZeA5O38DaCUsDXsmj0MzBJFA7PsPnrs5uuNPRQyMkNwN6qATVfjBbW6ipNKfzE2(i)iqoCJOywOfVkQGu(tZUY7PnlObLc0DoTKbL1mPx16KRCBq9orkFbIY)cYrLsq(34pgdegurwsXYP7hG(6cjhRkKGWncAHKjbak9jslj9U0Sep85yOwsb7jOfkQOV11z5xIjMGE)q18MMEKJnay6TeZM(o6nLEvvkALuvcnMrxN(ov)HZnFQcQEU0OamHcelwVU83gkArTiy7hNlZ8tgzhnzAgGvwcGypQ(cyhTgvov4Udt7vdqtDEFyVzzyYXmJHmOp1eII2kfOGVQfgtFqnWPOp41801ScMWkanH08f6uActJ2VEeT7UHbfoimRGuusbbyvHF2pgmAUIGTamkry0zcToAlSgU8NMpt81E3uiaAb5aIytOXyfDhaa3PlyicXHOfPdIIXi82WUibi9bb24uzeRgW)48u2MP3velgXqOKXkPENKYo)ZSrsRyZpgrKOLOJ9R5TN8e2ybIN8hzmh04F5uX(eNaaLgdZRk3Jj)XTUGV90qK5l0M4kT0(W8Snuqx2Re9aS3TAIPf4IaAmlisSJgzSHypFvxg5X9u1Oo(ZKkuepHZrwkinZN5V9rTDmcI6Pdo4dQ62kUa(qkExosVal1cT0Jt6XJaXwga(DdX)n9P6UVk8oQWGJa0YhORCEYTm(9KMRyseR8Wnx1e24cG56g6ADiQKHjvhTsd9OE5t8jWzUJ4K)sw(El9XXirihAZrPHMVtNaWdE3DFtxQpON6pkcgod9rnOyvikkfHyXuyvmKQz05IXOliqVf9xTY4glZuNQD8GHUQdJSHIoPTsODyakxum6OwWyAmdq0FdbgysvQ)HMAOsLc(XrhzzwrQ9uvkS4f9w1PbaPtBXKSwCogqmtL1wqH83sSAMBSlROqnM)2BgyntE7Wlzc2sbH5e7d(nvDZ6R9YtXWrBwtUDOrjyV1YGT)cEZR9cml)FTkkh1SP5)7vvcjUtYhaRGjeL)K6p(FhHwTl(Ea3ywkSAKh)cna1Fbvju3JAmHGHmE2ND4Z6z6NvvfgLz2090QD2R)OMDoRxPEu23COgkKwNwKyG74gXC7znQmXDhGPv41p5RW39KVcV5jFfixs7N4LyoSe)JuiqkQfIlsZnwOM38Q)VeLudTI0)8VGi3kraCbrfK1ODYniey9nQcrR0nPDOudtwN(SuzAn2hMDwadc0hVf4TpzlGwFj8o)8rXBINy3b0vFlQtNdmqVkpqVZgeA3BFFgKr3J5tRmH10z3njYPp5UbmVcpmzUH59bkZFAM1Ng9td6tch6LYKQ54W6tNs5iPUBkxgm3vo2avxs6pub1nV9W8Kut0RYkLtZaN1hOGYq4L79S2RO6rrmPlzzfY0wQ9d0g4ElWQ)4hsAaw86APRddU1GuhQkpKLVz9A(N6M3JFQBWsnael2a303P4eE0SVD1Rylk)Mlu)rDJQP2htWsZSsTaitYoUICDgMWWCVA(9DAWjH0N5RE7KO9REMopK1F85)ni7l8KfXcoHSWlddpYQUaMSBZnNTPr3jh(H3W2C03vMwgB9Al4mASPRRWT3kxqv1RQWYZU9wRxrHZNDM40lETe4ZTURKG0e3PqP4SoeEH4LfOHJasfngTmg1mq2uV9XSj6hczAQ56LfIgV3c3ER17SGWJnCFfeNaP7QGWdmCpfegH5ed0ZdeVPa6hHyrheTMAVKKAFT2pJnTYAHxH)sWqf)4Gi(7TFmqe)v6xsdcLyGHnAC3Znb10h3H0hz5QR64C7T05r9R6Hi1O8f1ajRX6pqNrwpXMrY1k(8vZDexM2p)eKvO7zeqwNrkxaryhm24yhlD8llFZ0BVTt3jVCb4b4zgrVISiJZVjPJJ8gJ)jI4pyBm(NXH)GTVK)ul8hIn3ZF(ZXMx(Qm8Ik8dFgEuQxCrNpTdT9YW7QkRssXUKkcpySIdzvyl35tWmsBmj25t1(YFexKw2yez5CdzRg50cPXHiNViaLAFvbZp3yJo6mSBrgXaEfUBqNHtD7WdaarrboWkQssaqoafAGoUFtRhH7ItB)Nn95NrWk8y917qurN)LcXYg82B1XoV9wzL55GY8Z6)(5RzTzitKKG2m50tpopgwxGkLA0qXV)gRoD6iPf585NoLecnROyKk)W8E1a4O7XM2g01LNENjmZaRK0uv(azygyo5H3rAWa8pKa6I5GJsFHjTuR5mSC2uJ0NSvDqMRbcdsmR4YjcTaXQz9tRdNDO5RnbbwyVMAna7uBSglUn7yUC(IZ642uM8s8cC)1QWW0cWLvk(Hy9HrD2xT9HE57Yz2nH(hYEkxmWTFyCGhSsLzuqapKvsaCbZTd9Glj6kA0ajU8F0)eFiLrIYx)b6UMFkOiHPaUP)3wTQGtOF1jOMeQO)hBSpr(wMhA2PZ4mQXLDNtLyaKe7YslsjpGztydknLdIcLf9ycIpxFNh9VLFPCBZXMRec8SoWI66RvtqtglE0y6uQ8ZD)anVC10taObc9ob5xCgPjrxmnB7LIAXuR40n1Lelpv2BReFafftkc9bYA6zwGRncLoVKTT7IPeRWHlQCSeMNzNnH9vMD1SZ0Z(ByCnvgrF35H1laO7Vk(MaBDFKLVZqD5SivAzst1p5s1bYoIJXSoH6Bw4mQFO)TdxSmKA2xnTFKgV2JyBw1MdzK5wqAIyVfT6o3Art00zrOLQs3eb)ePvJG)SHbVWadwKvoSKMwQy5tLcIFGG)woVDSjr)QtDWCNBPj14BaPXBhqU1H5EjuA)PzU8B7QwwEYkgAD99PPdBhnU)lRItR96F4Uxu2fxsT4CFrp0783sJxBnHS5tDgP)SmDSsZY(Um6NIIzS)B20qwlU)(HPlnGjSfU7ynNINK3xP2hDjZkLuznYOeVRtJSy72MPVOFEhhdo(Gnst()AE2ifGeY3FjQ50x)3ePHiPedLq4gkTV6OXJVBHpBoJbTHAC(shRHiP(Q(Adzvi1jIGfpcRwW486E28HOliA1Aji5qMk(DjYu8u9oNnDqt6ZZUNZFY658oa4yNpBQMJWw4MbP4Lq4wbTcEt5AhcZL2CeE6c(q9s9VL3xgJQCpsqU0igXieJ0NUe1UzMrIsNrEFxSLLRybkngEt54xxAS8l8YTOdjRCgQkeENKu1V)bAXadtB(OQEjerCFhzl9Gnh2zpQxohJ7bt(x1FZDwnhDv03T1bhZ9dAfzJ)7I7DtFmurWlJ1IEXcuew0YUx5Mvl(YJsX((Ca5c0JMxSnVIYQNScv(e)TNewJzVU1Ss8JglgxacLSdpHHOaCclJIjjlEeN4dWVhJ)fcQxpMfBb5JGfPuPEbIGQO7GFVa3OdObfGbnFW0C0TdFKIUnEizbQVZhgqyqhA)5jez6uhT7MVmHfpvjchF5FCdU9Cw(E)U8tsPoPJMqAwYzyupX760RyJp7LJN)nJnE29Dp9YLloZXHxXfpXgJ1woSD)0Fjf8TlO)MWOQTWQa6)ZbW3o8YlO7tf5O7a9ymx7ZNPY2MrJT)i9HD0IyV3asJ061A0yD1OrxGyYohYIIwKRVk)Wm(xQ)n6dZ4DYC04NRrgxx5t1OtpwQgRzwBCtTYrbZbbDcs5Lm8slx4ixpdXp5ICSSQtRQBN(qr386D)OkAUUHoQiO)69ZLOfvf7f(J65zSfHDdNtJ4EHqUj6UblMRE4cG5(qqpBf8GzffRvoRBWPf0214E)rk0IuHx3mXsNN3EFTmtOlN1Lqp1MRcLucm4kHC7638)p]] ) \ No newline at end of file +spec:RegisterPack( "Arcane", 20240911, [[Hekili:T31EpUnos(plbbWXAgNo(vNPZS2nq2CZDBcUj7a4SZ9hhwlllj3wBll5rp6o9Hg6Z(vfjffjfjL6xzYKDawSjXIISy98xvSOM1tw)P1Rc8kcx)XPJNoF8BMm5KjZND2KZwVQ4MJHRxD0Z)sVlG)sI3b4))Tz(EjKF(M4uVa81ZtlZ8HFAFrXX8F8vV6IOI9LBpXp9WRYJoug7veLM4N5TRa)3(VA9QTLrXfVpz9wDR9PNcRD(Xq)1F81tHznkiiKo0WC)1RWH(YXV5Ltg)JvB(01HExwTj9yysyw1hQ(q9thpzu1g8pNX(ZZGrVk6W7Q2uEexZMbF2lN(gJp8hE5u8n)0(WQn)pEzW)hS5IswVkokVih39(bU0Lh(hFKWodt82ghgS(VcpmlQimlYB9QHvBoMfEL7f(bNm5epcx0DRxwgWBR2mOAdmapFKtP8WtIsC3fhDX(c3SWdErj5vBwSe2uNCA1MBVTAdoJTFIt9KUTC3U6PmVmdMWYJ0x0pnnoi96e5NYNQZR2mBmzICOJx7wG8sK1sCH837HZvEbO8aev1M5WSSEvzEOB6UD4mG8Qv0nmOPLw6VhEIBX(q3dExerf2zrhPp)t4ZbX8UQnfOK4NHHaYQ8WGQnxVpmPAdvTSAZFTMJgb7GdrbVKY6G3fKDrW7FtAz1M)vzEr97x)MROBeVKa2GcstEbmQ9ExfsO)6b(oYElFeJwU2lcgftrpmN9RfrhqIaEsH3LKFnTAZVvgwswIuyma9ak5XXW)Exb(VyBs6(HqbmskkbFzYJxxa2kg1XisaqeLhM4JmA3drjbG4UHrxRAf7LxGZ1mJZvHxCysXj7bUN7vPXfOMiBG9qAJ2h4dcwVAY4wlFA2wfb8)ih2N)9STvB2Hck6eMliXOsH)gqnvB(vk5qfaaVk8QuFIpg(V8Zr55rX4eqMUpgs53)swOFuU4aLe(idzUrgshwlli2hOPXbVpxT57aJNAJq(B2sn32RFkXIPMZX3JirEQkrU3dDjnPfJ(aJpSEfOdfMLvESWnAhiCJ8V0fvrpxW5XaQiLWRC9kkktcpGQaiPlnbhoegeHUTXvSHbj4BGtTuhhT9Aq0aAMYlIt36fJZhS7ED3IGozKYEsPIQWph6xwe6snn)(wm8H2uQxsDHr)FT4Z5m1NcuTENxzCbpyq9i9tlXTlXKxC7vBqxpoYaYlc9uhLzt1NbMa)wz0XJHbNKF8MdGTnSqUxhUvkgqE0X9PjU5fPzh4XaGh(m0hfXyNl2KS0nP47fCJy0b6AiT8sUEoMwR(A2gtB4kCTjesqi5HTf(8rGR1vHUq04drO1)5GyBQKaJeni39FvgCbQCR1AYEm7MaEx5bJcERtyWpeIt2XBcpENse9QnNnM(6fOEh45fubk2FYr)cYtNXI23iTQ9LNEaqkeqmv5ITEh02MUJSQ(w43dZUmk5c7gP)jttKPfNMg4URm7gKP9d)jtRpmTDrzHeghYZo7p5z9HN5bi(YlY8ID99GamaJ7nkmU6rIyWbw4HCvm2zrjxgwqqL6hTlYNaqgC)7LJUsb25nJqFWKWBu81uy0xdze1eLi3aKa59McQaf8cT5(thZ5VC5kYlsJcClOeUBnNc38aOt97EzUyFvNmtUoFz0yy6kQXyZcpMMviIrzmHEuigitUPZLsLBBAEUUrsy11P6RWRq2QA(T1SvsAcGIdKRdmApF)SqgSNho)vkv1gikI0887WUYePIBpPuR2Qf6PibqqazltA(a6fLfD4yy2Uq)cxVC)WKaWM(gxiMB5bcXPcaKN8mSo(aM90YCWwWlj)qubq1TsmuFElGUXKzDzq2DUptgFh2OMOyCxQcoK7GdWFadTWLaqgsRdljLeg4oDmWOWwyHPWhzMy2qsRXs(CQLSt9wthzIBlZGmTXXAN4oT8gKPufcMK38Fct2qWRmpJx6ewTbRFf6ohcogay6Q2KsR6a8sOKP2ReMlEAKpMcjptgiaJl9F4IZI4MrjOlTmzUuwttHYqQ3mwiDG4hkiE9sHC4iscxssvKC5y(qrtOIYCPqTdeDYsflaadqab7Zq(qb3DG(IFHuDPAVvf2p0m1IbMhMVCkvOygUYtabuMuJSCIA0EjlJNGLwyVtsHDSyoSkkRs5Xwqqf4Jb5ANKm7fXcdehdoc1LOSWMmfsVeR2vrZmuRLq(BmIvvHPjj9vt1LznoTgN04s4pEJEgmq(ahX1po07QWgMRfkrt2WDV6dTwsjmZEoQe9oURt(xxvsWQJ4MhbWjjUGoTxbaWGiNQBzBIwQSMnpOJfuta)6vtKZ24zr1tB38Zj9SUNssYyWvDAbVKCQoJ7Ev5bAUi2dlNwkeOzRxqnCOM4qrxKa6lmr8XSO0SBugIbinQtKsanPhAiKSYOSGqro8ZVY2TyXRdI8PfgNKobwdFpWIPoBJI9EfiSH08cyiasw8pckZiXK2wMHoEAy72W8)dIEsoeLLLM5gDOLdilzuAPsyTDUvxcDZEE7EUeRQBrJdDnhKep)L9r7kqNmhtVgJVkX1)pXIDVIojqa)vSXwT5xWbJH4JVr4agErgipssXtcjjaFo5Klc3HcyMGk5gdz2n0WzlXlfNjyw9QoE9W6VN1v)Ck0uhdPf18m1DtAzmJEC0f6Pjkj44k2fF12hVvd7cCfGsI8tyJ)y6H6vDiNHGuEoyh7LDPROwwTlDBvVGmWggFRdbQjfXj85sfO1cEnUPzmWS5uNl7fJ2OWv6ik51DVMGtOh7WX6tOHSNhONgB4(6inJjqOakrYY5T)9Fs5SdtHNCi6)dXqsodPDLjjH4H1vWSt8tZzwj5P4bkKEvyMhECEWCnI4GR(y)oa(LHrvIMBchM17aycanLtnrTDsx0tV0lHDez0tMOAdj)s7gL6oedbL9wC9MboT2WWaCCWe8LK)Y06dpPhLXqFouSQH4u))gyhqLGHtVoKsFb(mMtoUKnwtQiBsZ2kLylxtTnGjCO8tQeCMmwyp4ixZM2NQgt)(EVdgytqFoXmxNWJA)RdNKIDs7ZOLO7XvtLoDCfTvYzO71sdpHyByQUeToe5PT2KcoLPQapRdgipFFDCWLujMo0B9YNb3Dbgqn8kma67tkkJWN(Q3NaVjo8qcWwch5J)c11s5rSqQPLe8rba(fUdGjeeq(xoIAXtRVAEDg6y3eiY)l05jbEvV48ubVz1GP4N1nWfHbbesCk(74FtuK67DKwnazX3XSu)8rnnsbRDfWnKnhrxeNcqwbuLrICeE6aKXevZ2emp7TxkrZSwJugoIfTaTgTcADmZvHnMUjBr9P(Z3AIZHw3kgxwZUUTI7HxYX6PdWqheMGJIazSENyoQlJxO7aRK0)BAYckIsu98AQkeKNaHFGj9aYEbLr)uqzgFFuvI3aa1Hu37rdYYBXaeVkR9yiJ4)6D)hiPxWWTQe08TS(84TC3STC2yWv6Wo1HezPg0JMjkk7LJDtU(M1ifu9fPTLoK7idE3GyOblSEKAwvbN1wZU1yScCyMDSBMoZk2Af(5JXP5KFrUyN1)ofVf2DHbmfMDrz5fnqMuuygRS5zcTm0B(waoxHUyjMeAtSTXN3CQuAtKuof1j6QkMPYP1QoKw7drYwaSoYYizrMLUlYpcKd3ikMfAzR8siL)K0R8EAZcQxPaDNtlPxznt69Sw5k3euVvKYxGO8VGCuPeK)1(JXaHbLKLuSC6(bOVUqYXQcjiCJGwizsaGsFI0ssVnj9Gh(CmulPG9e0c5L03660SlXetqVFOAEDtmYXgam9gIzDxh9MsVNkfTsQkHgZORvFKQ)W5MowbvpxAKdMqbIfRxx(B9fTOweSDJZLz(jJSJMmndWklbqSNtFbSJwHkNkC3(P9QbOPoVpS3Si8WXuJHmOp1eIIMkfOGVQbgtxqnWPOl41801ScMWkanH08f68zctJ2VEeT72HbfoimRGuusbbyvHF2pgmAUIGTamkry0PcTcAdSgU8NMpt81E3KlaAb5aIytOXyfDhaa3PlyicXHOfPdIIXi82WUibi9bb2yUmIvd4FCEk7H07kIfJyiuYyLuVtszN)f2iPvS5NJis0c0X(182nEeBSaXt(JuMdA8VmxSVVjaqPXW8kZ8yYFCRl4Bpjez(cT9TslQ3ppB9f0L9kr3d7DRMyAbUiGgZcIe7OrgAi2Zx1LrEyhvnQL)mPcfXt4CGLcsZ8z(7FuBhJGOE6Gd(GQUTIlG3NG3nJKlWsTql94Oo8iqSLbGF3q8FtFQU7FcVJkm4iaT8b6kJNClJFpQ(kJeXkpC9vhHnUayUUHUw7Jkyys1rR0qpQxMeFcCM7io5VKLV3sFCmqeYH2CuQP570ja8G3D330L6c6P(JIGHZqFudkwfIIsEiwmfwfdPAgTUOl6cc0zr)vRmUXYm1QAhpyOR6WiBOOtAReAlgGYf)IoQzmMgZae93qGbEOmXFFDnuPsb)4OJSmRi1EQmbw88oR6upG0PTyswlohdiMPYAlOq(7jwnZn2LvuOgZF7SEwZK30)sMGTuqygX(O(MNo(eyhDTxwcgqA9kY99m6a2DTmG7VG3(AVaZZ)3kJYqDBAfa8klGu3jzeG1WeIZFs1h(VJq72z)iGCmnbwpYJFHgO6VGQgQ7r1grWqgo5ZoNGxmvn0gRFMEuOmoCafYQvBm0qt057u9ZxTOO58avM42dW0k86N8v4hEYxHZEYxbYfJ(jEjMclX)ibc2HAH4IuFRcQ4ny6)lrj1q7c9p)li6QceKvquoznAMCdcbwVDQq0kD8zlk1WK1QxivMwJ9kzRfWGa9XBbEZt2cO1xcV7mFu8M4jEc(T13IAD6(90RY92)PvRW7TVpdYO7X8PvMWAmS7Mez(tUBaZRWdtMByEFGY8NMz9Pr)0G(KWbtPmPAoYQU0Puo2O7MYLbZDLs7R6ssFH)v382dZtsFqVkRuEh9CwFGckdHxU3ZANIQhfXKUeAvitBPF3tBG7TaR6dV)qnWIxxjDLvWTgM1pqtyVutFu(j8GwF)YxXMB(LiO6d6gvDzigHvjzPATigLECj5MfmIbTE50770GtcPLVx(Mrr7w(mDocR(WZ)BqIq4H8H1(b5uxggEKLOpM3z9LyTUNZjNdHx)2C03vMwgA9ge4myOPBoWT3kxBt1BnWItV9wR3wGZNCQ40lEdb4ZTUBhG0e3QML4S2hEHyF7xZraPIgBtgJAciBQ28y2p79Hmn1N7YcrJxHGBV161hq4XgU6aItG01gq4bgUYacJWm(F98aXM2x)ieZ)x0AQ5(kQ91A(cX0iRfEf(lbdv870H4V38D5q8xPFuliuIbg2GHTpcdutFylsFGLBrQJZT3sNh1pWgIuJYh3cKSgQ)Svgy9Wtgix22Zxo1rCzA(sqqwH2LRNSoduUlGWoyOXXou6KqwC24BVTvJcVyg4b4zgbPISiJZVjPJJ8gJ)1A4BSng)lQW3y7l5V6bFtS5E(ZFo2hXxLI3zGF6ZWJs8IZB9vwOPTcEBzr5HeSHLIWZOkFFAj29B(eOH0EeIDurnV8hWfPHngrwo3q2Qro4oACiYr9bqP2vMZ8Zn0OJod7wKr0JxH7g0P)u3wSw8ikkWbwE5HdaihGcnqh3VP1JWDXPT7Jj(8tjyfES(qAiQOZ)ODyzdE7T6yN3ERSY8uqz(zDFv51S2mKjssqBMC6PhNhdRlqLsnAO4NcJLZhpqAroF68XKqOP55du5hM3RgahDp202GUUy(DMWmdSsstv5BvHzG5KhEhPbdW)qcOnMdok9zM0sTMZWIjJnsFYw1bPUgimiXS8lhj0nclN0nT2F2HMp8deyHDAQvdStThxS42SL5Y5ZoTLBtzY7GxG7VvggMKdUSsWVXPpmQZ(QTl0lBBgZUj0FF6t5IbU9dJd8GvQiLcc4HSscGlyUDONHirxrJgiXL)J(xBdPmsu(qmq318JJejmfWnD)2Qf)Be9dab1Kqf9)qJTSX3Z8qZoegNb1USBD4d9GKy3Bzrk5bmBcBqPPSxuOSOhtq856BcO)T8JqBto2CLqGN1cwuBFTAcAYyXdgsNsLFU93(4flhFcanqOngi)IZanj6IPzBVuuZgBfNUPgwyXCzVTs8buumkp0hiRXNAbU2au68s22UnMsSchUOYXcyEMC6i23t3Ltovp7VMXvxze9nkhwVaGU)Q4ZTR19rA2wd1LZIuPHjnw)Klvhi7iogYAkPVBMZGUH(3mCXYqQzFv3jqkkgcaHARUq4fc9ZZY7C78mst38GMKkDWd8tK27bl6PL9aHr1VuIwOyxt5XIFjE)EoNBOjb7Y5oyMXn0KA0lG049Dhx33Ct7TC2yRZLFt7RYYcwXmQTNnnTY6GHDFRqCASg)M7cizxCj1lXDfBqVRDlD4S10TMo2zG(dK0Xknl7zYOxikIWUVcr9zT4EZ7NUupMWgWSd1CuCs(wL6tZfmRusDZiJs8sfnWITBtE8IEXDCORLMgh2Po7EnpBGcmb5lke1C6R)R8tFKuIbkiCdL(eDWWH3TGJ1NGG22k15lFagqs9v99ZXQqQveblEewoJX519SP9rxq0Q1sqY(mv8lTJP4P6DoB6yK0NfDhNUK1tXThGToFYynhqTWvWrXlHW1Vzj8MYvgeMlTza80f8H6L6FlVykgv5EKGCPrmIrigOpziQDZeJeLoJ8UUbjlwYcuAm8MYHRUWyXv4ftrhsw58pvi8wPGQF)d0IbgM2Snv9siI4(oYw6aBoSZEuVfmg3dM8VQ)kYSCk6QORRfdoM7h0kYg)pexWLUyOIGxgQf9IfOiSOLTVBllN9LhLI99zpYfOdnVyBEfLvpzLH8j(J8iSgtEDJzL4xNvmUaekzlE(brb4eweftsw8ioX7HFpg)leuVEml2CYxBksHq9cebvr3b)rbUrlqdkadQ)YK5OBh(ifDByFYcuFFn0JWGo0UVtiY0ChT7MVmHfNReHJV8pUb3EolFV)q(TFuN0rtinl5mmOJ4DT6eSHN(YHt)UHgpz(2Nn5IzN64WR4INyBVAlh22FJTKc(2g0FDyu1guva9)5a4BhE5f09nzCWDGEmMR95tuzBtOX2FK(ckArS3zaPbA9AnyOUA0OlqmzNdzrrlY1xLFbe)lv)o9fq8ozoA87IiJRR8nr0PdlvJ1mRjUPw5OG5GGobP8sgEPfZCKRNH432qoww1Pv1TtxOORF92F9cnx3qhve0F9(Dj0IQI9c)r98m0IWUMZPrCpti3eDxdfZvpCgWCFiONTcEWSII1kN1o40mAZyCV)AaArQWRBMyPZZAU0vMj0ftAtOZT5QqjLadUswVYRSyFA26vR4)3y53H)3yzY9BF9))p]] ) \ No newline at end of file diff --git a/TheWarWithin/Priorities/MageArcane.simc b/TheWarWithin/Priorities/MageArcane.simc index 877ca6374..7af9c8661 100644 --- a/TheWarWithin/Priorities/MageArcane.simc +++ b/TheWarWithin/Priorities/MageArcane.simc @@ -48,7 +48,7 @@ actions.cd_opener+=/arcane_blast,if=buff.presence_of_mind.up # Use Orb for charges if you have High Voltage, then evocation, then Missiles for Nether Precision, then Arcane Surge actions.cd_opener+=/arcane_orb,if=talent.high_voltage&buff.arcane_charge.stack<4,line_cd=10 actions.cd_opener+=/evocation,if=cooldown.arcane_surge.remains<(gcd.max*3)&cooldown.touch_of_the_magi.remains<(gcd.max*5) -actions.cd_opener+=/arcane_missiles,if=variable.opener&talent.nether_precision&buff.nether_precision.down,interrupt_if=tick_time>gcd.remains&buff.aether_attunement.down,interrupt_immediate=1,interrupt_global=1,chain=1,line_cd=30 +actions.cd_opener+=/arcane_missiles,if=prev_gcd.1.evocation|prev_gcd.1.arcane_orb,interrupt_if=tick_time>gcd.remains&buff.aether_attunement.down,interrupt_immediate=1,interrupt_global=1,chain=1 actions.cd_opener+=/arcane_surge,if=cooldown.touch_of_the_magi.remains<(action.arcane_surge.execute_time+(gcd.max*(buff.arcane_charge.stack=4))) actions.spellslinger_aoe+=/supernova,if=buff.unerring_proficiency.stack=30