Merge branch 'thewarwithin' of https://github.com/Hekili/hekili into …

…thewarwithin

Options.lua

@@ -8741,7 +8741,15 @@ do
                                     width = 2,
                                     order = 2,
                                         },
-                                    },
+
+                                supportedSpecs = {
+                                    type = "description",
+                                    name = "Supported Specs: Subtlety, Assassination, Enhancement, Destruction",
+                                    desc = "",
+                                    width = "full",
+                                    order = 3,
+                                        },
+                                },
                         },
 
                                 --[[ potLineBreak1 = {

TheWarWithin/DruidGuardian.lua

@@ -2300,4 +2300,4 @@ spec:RegisterSetting( "owlweave_bear", false, {
 } ) ]]
 
 
-spec:RegisterPack( "Guardian", 20240825, [[Hekili:vZ1sZjUow4FlEdf0DAA)asspfWIzwm1Tx0Zc6QMDymgb4kgBkB5KPtrXV95ij)qwpSfK0pUvDRoj2shDE(Dos6C9kNvFF1YTby0QV5A7oX(rpNXotSN48LvlX)4eA1YtbHpfSh(LKGJW)(VlcY2gfK4FkUi3)yeoAFaoknHmWFeNgSLqW80ISqyWhW4t5)Jp)59r4dfBghME8Z5rhlIPZimlyhM83HFE1YnfrX4)kz1gzUXBYdRwguGpKMTA5YOJ)lGUrB3IydgLhUAjzWFY(Xp5o5UlRj)C6)4YAYqVSU4eHEx(6LVYg0dFY1dE53pGUS()gKb)dWBra7hhLJZjmpNm99vFJQGqjbBIrBx9pxTmmlcJYIca1tqYtrj7VSEWL1wxw)Ca8uyuJJ25tKMT0xeLacnmk)TbhbTO)08lRxapolnzxrw1tXhYq5hslNZMID7gxoIXzOJbrjWSMDzT3L1F4Y6db5GajnWCmyOOdBkOUcz2KYxUcdkuTcYbuqm(W4tHy60VNB(zO9zPVGpqiG3TrGe0lbXK5pXinzh0AhqSxJqB9bUciBgZgbuE6Tq5hM2LbYESdtzZM0XG)xdFSji7PCGSKL(ETln14KxK9C0ZbX(GjedlfoF820xsASEv0Q5XIka7Uzt3PA5t5fh4ymWzOGSUDTPSwwWZWknU4eLbie9zKpO3pgHylUtZsDmOiUBNSHxwJdIrj4XaRMH9t3bE9i)xGaLXLtOksQCCzrNAEZOlRpF2qsq5(DO4OeK)PummHiqjeMwKa8svCYCq1QuWiXzncM0kPksOwlKcrBrzijvjrJ7Vln7yL2Cy1)re3OWAFuCq2EeEmo6iakK6VncX00U1AayozODe4cYYBWKgPtkFOCYunkas8dIyMeGlYqs69)e43jc(hAzzq9)JWyG201jN4O3j8tl(RKN3Mcm4HSG8d(eJhp6Al1wmmcsyzyCWl5qitcZ1YLri9uzIjuXPpQ4jQsAtiEvsLpkhHmh6mmfYnbauaRbypLrd5Xi0jexgkWg(ihkzgKqnMWmLjG6bQKpgrnw7decu9I4Iey8WKoYtuyupAaeejq(u6lOmFaJCpsg9ima3kEvjKc9LLU5w9r7gopmn550NqmD4PiG9i4YF7l8s3guwok7jbrZXMFmaIEqwszXxThNEK96azwTdnKWFFvHDG5TilpnSjLuT5V7XZ7iqsBvQAkTUubI5aZimlqN4rrNXe7kKXgDPcvLkOjdKfIPsnZuAeFNyfdhT4QXfGQieJAt7m1QAXQwG7x3msY3dICPRR(Y(mOkbaJYvUkbh9yXvYconfFWpizlfkRcYBrnMOQbXxQmmSpEz9(WTKsIQu5kkrNHY2B9nzbVIOCUE8sjcmxixbdXkmiMakkdliam7icxkwsp3sdEPBrQ0iLwflHTku(4ApWP2vdRos)uqroYNTMnkwT6q7wRJQSev(J1l6xS7MELOQ)nqWuxVHZdADvAihFSddxweeQlFwJtl7X7hQAW1ytAquVo8t3FBSUzExovg1QYMiBnGq3CmSfZ9W(OutuhN(PQzK8xHkUZqrd1PJALzG70eC0xM17L3TLzS4Vk15Fpzh9gWV0BoyZlcEG6Trxz4VjLHfBJpKtbO1g04eNDOS0WO0IC)naVtp)b7FDsLvhcMvhYMqDRVB8ZnPL1PAb1ovFQFNe9c98CeZ2WsosQ9J7Sx8ukolu5DtrrKkxQQImx91ft5I9PzDvDQJZvvMSo7J4PlnR60LmDtHhds2hZei9fC3vjkd1Pn591uufL6JBrOq7B2uosHbtFX)MvuWmsH1UMBlQpPplnrCvinbpHglEwvAd4QpXLIOTmQjztZpKHONxOR(Dn8BsKFlIfrprLQEoqhX10asZffOV65UaEAF8g)u2ePKQREFE8GwVQ7mu)1XyILK(hbtzK2AKIlwqF9M9Gk2b23TYF9aPEl2cvICNvOD9m(Go2JBJqDDCUb08wtG0NajRW80x8Nu2P5TUMuHZEXRZZpvzDwAeGjs(lkMyPWLNwexLbaGhr54w6zn6NwXXSnqaXIp(O2aqwnpAMMxptZmUDKkeDp9fQPQ2b9ghD3(2PI4Nb69ks95X4nH)WZ5jA7dp3tFYAwbLbXeIewxHyRcdLUPVs11gib92yuEUp5scJJ2FaRWrU6(djSH(SRxDnd123YDDRn7VLWHvceINt7ono9TanZ2)dQj8b2IjwrvnEbSfJxqbptVJP5cN2kRcdp9fb83lDqFhmQzQL66j90NmSZcCHTsZF5TAvbgWlL7p0tFokvRyy6XnPqzRrjywy(K3mJiFgat0NgOc7cqgKV4VApexBoDE1qPuUZ8c961OaMRj)qVUDKbD1lr77Fj)LOtOAG0jM0SgMVuLB4tnuOsmomP9T2bjVXRQ6gLAo9PI4y)naeTa6SBRrrQ9cjIFRj9aolk5jegCDYJtXC)nwU3aeMJRWCCjZrFAIH6oYLR4Gg4sHc7YJ8tS8nOxncYDkvELg(K2yJ1mB(Sg2JRD2WL3HUcsKvKOLcLomWdpLHiHWbYgSJbGGY3MmkmBClBk4rKJWnZVksN(BLRBvbLkIGjndysozbjhPPkS5muuc48fI2s6)GMCTphexaETX5Wcyx(NRw6OYZXiMSbzsbBEkl6iS7CsNQCf5p67mJ6qe6Qh7Oe9gA(Qg5xzZqnL3nOoMVT9N68afNLtguzRD6c1F)cefaAU8vl)RJNsZWe2ycdAjn5YAAlzo(YxjoEP7IikE2RYhx7j(X5Fw037YxvnQkJ3De728kFR7OAV5o31OuNBFx0U5D6OnOtNmtw)g3M(4af(qd06)mOBFh1CMKzLB116VmWs2trn5R9jinHB5aGh3aX36PuiD(NqUUwWj(4Dei45vO29ocx(rWGqjI1qviZNpBeQ8iEskI5YmRnGT8JvaCLnuYAZPrOPlPoZfXegTSEXYRqBq7STlCKMNsJ4WBXko685ENMbNc587fy6zEYcBzXa31AdBqSqLcGVgIbdho0QSAYbY9q4chxGZhYTDdndAKiF9qD8KYokKq1FsR8KA9VMLwsJXTVvIsIBnboqzJcoBAdCHuBgo398z1ZAsxZYr3S8AeiLTIOSa1Qnbzap0(oCGj7WBXJY0RSHbv6cjn6MUiu6vkAHl(qkniSde3aM6qfcAY5ZwMIwxjBCWwsVKd9s6DkuHuzz4qda(igHbxxlaU4E7rLGQsn(3ObeUzXe7bdRK)o6wosGLb8yngUaY(1VygmQkAQWzUU15E)Y1CvjgM5QW2)kQHBuDi)lCkzk1hU)mNpUpeKAPd6DUt)PLeWReg)8ASjLnhNSpoR)fuLUWsxJInWIPWRBrmM5BQ9aRoBkmfYRDjTuFmoNptj8xSvntiy)3odQvDsuFcUvdhwf4OYSBe2SxDvY6Bqffr39fl7(tNL0BgDAsVPR)UkNUJJ653)0FVuiD4iyGwyKma0n7Ty1)Y9(j2)PTykuKTpYYgSztQAqQM6bxJSyPOJQK5pyaVzMYsjxzPKTQZXFJR1vOa6wUlZuQnAs3Tyo3tkriNRbF)lPiRo5(XQZRx2TsIcPJJHLnyYgZMDVXNsqVkgOUkrjVYykLNtC3p1LDCfQvzJg9srimNjjaMnFQRjQiyVRwsEKwQAsiz3rTNnJc16tOFjC(BGhf8p5P61qewPRQcSQ2dYBOWubXdkQSj4712BJ)9DPAYN)tEH0kt63MGYyvnrMMUAAdTntVONzhAgdOQIxctzYQRzUxhaKog7Q32thXzQsNjXgtuTVyUGs9DNHSer9xjqpZE8rjhphhUx7P419VI9EiwIG8sJVUZoe34xxuw)HnwNSvrNCmOSUbUJDSua7OdoE7i7u9lu(SesTvR9hlCpSDCpaiApiS4bB(sEgO4(0vOeV(uQ)ez)U2qRHYtz9SAsO30IcYSVz0xUEErcZ33dlMCRRtDViWoMuwyNyRmWSfU2YZU(Y)5pgt1ggHiYjCNvPYjuFJbMqofNrfFO5vXzoJKdyjxQsZk0CJmZ52aB1HmBjLvyqK0xAJf6(ATWwBHVulZ8(a9l0s7xwEu8Q4lIhA5NzfcR189)y296hp9RQIPdx5hofE1GjeH)G1vmVhMQsZzp25dnFAs0qz5Vtj1HRA((PuA05)2P0sgSvZlUt)a)3jLnb5OT)NKMVPrRwMFcfs()Z(j0RSE1)p]] )
+spec:RegisterPack( "Guardian", 20240904, [[Hekili:vZ1sZjoUw4FlEdf0DAABdKKEkGf37IBn9I(UGPQ7oaHraUIXMYwo52PO43(CKKFiRh2cs6htvt1jXw6OZZVZrsNXl9w(xlxSfrWl)MVR)y3V4oEO39(pozYYfKVFcVCXjuWtO9WVeJoc)7)jhLUneftFX3JsqBPeiljpnaE5bc5u2F85pVpKCiFZWGKJFol8yEeIeMehKI2rO)DWNxUytEye5pJxUPXQ)OpSSOCYHK0LlweE8FdKmC7wmFC4SGLlOJ7tUp(j)X3Dzn9Nt(JlRPd9Y68tusD5Rx(kFqp8j)rWl)Rd4lR)FOu4Fa2ke48OWmsgLVpgsc3Zyo4V(gtxGJrBIWBx(VwUiinKGtdrGMaf)uy8(lR7DzTZL1pJGNcJAy4Uvubzl7fHXG8cJA1w0rqHTAs2L1ZHhNMeVlpT8PKdP4SdjfZzt(UDdlgXWu8ruymmRPxwp6Y6pCz9bugiqkdmJa2e2WOQRag)VO4LljGU0OGCaJIihgEkGWM(9cZpfVpn5fYbkbgDBeig)ckIo)XwPjBHw7aI9AiE7kGRaYMYTraLNClu(HjTzGCh6Xv28jDe9)R5JnO0NYaYsx67nU0mJtwE6ZHpJIwbMqcSuKSHBtEjU26vsR6hlRaCBNn9NyKpvxCGJjaNHrPT7AZyTu0ZWknm)eJbOe9z8kqVFmeZxCV6L6ikpQDNS(xwtqr4yYqGvtjRs2bE94vVabkdlMqzKuX4sdpv)MbxwF(SLKGX97WrHX4vNsiWecbLqqsEmWlLXjZavRwbJgNvlykRKUiHkTqceTfMIvuLun(QDjPhl1M9l)pQ4ggu5JsqP7XKHKWJaOqYQTHyUM2VsdaZjfVJcxqxElM0ats5dftMPrbqIVtfZyejpfRO3)DGFhl5FyKLb1)3dIaAZwNmQJERWpn4VcEEBcWGhsrzhwrnEIORnuBrWiOHLbrOxYGqMyURLpNqMPYyBOIxxuzKSkPjHevjL(OceYEOZGei3eaqbSgG9uenKfHXNWczOaB4JcOKPqc1ikZuKaQdOsXye9yTpqjq5lIYJHXdt6OirHr9Ofqq0a5tjVGtxbyK7XQOhbisJ4vTqkSxw4M70fTR58GK4NtEcZ1HNcb2JIl)TVikDBWPz40NKenpxXXai6O0yEsqPXzgzVkqMx7qnjwTVOgoQ5npnljOoLuL5V9Xl6iqtBvOAkSUmbI7aZjmpqN6rXMXy3sKXADPgvLoOjlKfQPspZuyeFNyflhT8QjeGQjeJztBn1QEXQsG7w3mqX3dICzRR5Y(SOkbaJYxTkbpZyXLYcjjHCyfkEldkReYBEfMOUbjwQmmSpEz9(GT0sIkv5AkrNJY2z9nPOxXmo3mEPcbMjLRGJyfGIOGIQWcsaZEYWLYL0lS0Gx6wSonsHvXrARcfpUYdCIB5WQI0pHYZWR4RzTI1Oo0TX6OllrP)y1I(f32PxbQ6)aem91B49GrxLAYjg7WXLLbHAZN160YJe9d1n4kSjdiQxh(P)Vmw3oVlVsJAzzt0TgqPBgb2I5EyFu6jQNx3u1os(Zqf3AOOL60bnYmiCAcEMlZ69Y72Xow8NL68FMSJzd4x6mhS9fb3t)2Oln83KYWHVXh6Pa0ydAcIZoCAsqysE2QnaVZo)b3FEsLtlcMtlYMuDRVB8ZnPLnPAb1otFAENeDc98Ci32WtosR9t4SxgPvCMRZ7MHIOuUuzfz(MRlMXf7tsBR6upVRQmzt2h5txAA5Plz7McpII3hXfiZfC3wjk9nPnf910ufL(JBrQq7B2uoqJbZCX)2vuWuAH1(2BlQoPphdrCLinONWdLpRkJbCvN4sE4wo1uSPzhsXSZl038Ug(fjYVfXIQNysvhhOJ8AAbPfIcmx9CBapnpEJFiBIur1vTpprqRxnDgQ)8ym5ss)TGPSsBnqZflyUEZoqfBb77w5VoGuVfBHorU1k0UEgVxl7XTwOUoo3cAERjq6sGuvyJmx8Ns2PznUMuPZEzuRNFQ26SmiaJv8x0mXcHlljpQmdaapIZin0Zg0pnIJ5BGaIfF8rJbG8AEmmTrDmn742b6q0hzUqnD1oy24y623oLh9mqVxX6ppMrJfp8CrI28WZhzoznVGsueLibvvi2OWqLB6RqDTbsqVncNLTIEjHrH7pq04ixE)Hu2WC21RUMHk7BXUUnM93r6WkbcjYPTNgN9wGMP7)oZe(aFXKROQcVa2IXly0ZS7yAM0PTYRWyK5Ia(NLoORdg1o1sv9KJmNmS1cCHTslE5TgvbwWlf7pCK5Cu6wXGKJBsGYwdJj8W8XVzgr9magBonqj2fGmOEXFvEi(Uc68YHYOCR5f60RrdmxD(HoD7Od6QxIM3)s2lHNWvaPJTPznSFPk2WNEOqTyCeA7BTdsEtww2nkvC6t5rrR2aq0sOZ(ngfT2lSm(TH0dK0W4NWeW1jlkHi83e1EdqAo(sZXNohZPj6B6ixUIdAqifkSlp6pjQ3GE5iO3PuXvASI2gB8MzBfV38eANnsXDORHeP5XgPqHdd8WtPyAims1GDebcQyBYOXSjSSjGhrgMup)YiD2VvSULfuQjcM2mGXz0fKEKM6WMtXHXGZxaElT)dQZ1(mkkh8AJYGfWT4pxUWtNNJvmznYKg28uA4ry350ov5kYF01zg1Ii0wp2Xi6n08v1YV2MHAIOBqvmFt7pZ5bkolJoiHU68fika0Czlx8NhpLKsOSXyo0ss8L1SwYC4LVsD8s2fsv88xLnSYt8JZ(SSV3LVQBuLgV7O2TzL(w3X0EZ8URwPoZ9UWDZA1rRxRoz2S(1UnDXbA8H6z0)Px7(o65mfZQWQB0FPNJQNIEYx5tqBc3IbapUgIVXtzq6IpHEDTGt8X7OqWZkrT7Ce(IJGdHsfR(6qMpF2ku5bIKugZLBwRbBfhRe4kFO01wqJWsxYCMZJOmAr9IfxHwVMzBN7PmpTgX(3IvCW5ZDonlofYz3lX0thPkSffdCxJnSbXcLkaXAi61VFFNIQj7P2dHZ98boVVW2nmmObY81dvXtA7Oqkv)bTYJR0)gwAfnMW(wPkjH1e4aTnk40j1WfkTz4m)ZN1pRXTnlptZAuTaPTvevfOgTjih4H13H9SzhEZFuLEfnmOwxiLrx3fHkVstlCjgszaHTN8gW0hQqrtoF2Xw06szta2s5LcOxkVtJkKjl97BbWh1i076AbW537oOauvPX)g0JYnZh72RFP83s3YrdSSGhRWWLq2V(fZIrvstnoZvTo37xUMRkXWuFn2(xX1CJUd5FUxbtP)W9N69X9bGuRCqVZ86oTKeEL04NvHnPT54u9X59VGU0foMAuSEoCfEvlIXnFtC750AtHPrEDlOL(JX58zgH)IRUzcb7)YzqJQtQ6tYTQF)YahDMDRWMhvvLS5gurt0DxXY()WzjZMrV60BM6VRIP75PF(Dp93lfslocwOfgOcaDZEloDVCVFI9VBlMgfzZJSSgB2MQguQPU31iloA6Okv(dgWBMPC0YvoAzRQC834ADfkG2L7ImLgJMmDlMZgPKiuW1qS)L0KvNE)yv51l6wjzH0ZZYYgSzJztV36tjOtfduxLSKxAmvYZjV7NQYoUc1QQrJDPiuMZMeatNnX3gveS3vhfpshDnjKQ7OXZMrJA9j8pfo)nWJs(NIu9AicV0vDbwL7b5nuyQK4bfvwh89AZTX)(Uu15Z)bVqgLjZBtqBSQHitBxnJH22PxmZS9TJb0vXlLPSz1nm3RdaYeJD1B7PL4mDPZuyJX62xSqqP5UZqvIy(RuONPp(OIJNNNWRhP51DVIDEiwYG8kJVQZoK34xBu28HnwLSvtNC0ROUbHJDSqaBPdoE7i7m9lu(ScsTtJ9hlDpSTCpaywpim)bxXsE6P5(01OeV(uQ)az)22qRLYtr9SgsOx3IcQSVD0xTEEzcl23dZhFRRtvViWpMuEyNCRmWTf(UQZU6Y)fpgt9ggPiYXcNvP2juDJb2qonNrLyO5vXzEdudyPxQs9kuFJmZe2aB5Hm7OKvOxOYxAJ5M(ATWxBPVulth9b2xOLMVS4O41Xxup0IpZkuwR(7)X07npE2xvfBhU2pCkIQbBiI4bRRzEpmrNMZDO3hQ)0KyGYQFNsQcxn89tPWOl(TtPHm4QNx8N8bXVtkBqz4T)3yXpFrzNWb0))SFm7kRx(3p]] )

TheWarWithin/Priorities/MageArcane.simc

@@ -4,7 +4,6 @@ actions.precombat+=/variable,name=aoe_target_count,op=set,value=9,if=!talent.arc
 actions.precombat+=/variable,name=opener,op=set,if=action.touch_of_the_magi.time_since<time
 actions.precombat+=/variable,name=alt_rotation,op=set,if=talent.high_voltage,value=1
 # Variable indicates use of a trinket that boosts stats during burst
-actions.precombat+=/variable,name=sunfury_aoe_list,default=!toggle.funnel
 actions.precombat+=/variable,name=steroid_trinket_equipped,op=set,value=equipped.gladiators_badge|equipped.signet_of_the_priory|equipped.high_speakers_accretion|equipped.spymasters_web|equipped.treacherous_transmitter|equipped.imperfect_ascendancy_serum
 actions.precombat+=/mirror_image
 actions.precombat+=/arcane_blast,if=!talent.evocation
@@ -36,7 +35,6 @@ actions+=/use_item,name=aberrant_spellforge,if=!variable.steroid_trinket_equippe
 actions+=/arcane_barrage,if=fight_remains<2
 # Enter cooldowns, then action list depending on your hero talent choices
 actions+=/call_action_list,name=cd_opener
-actions+=/call_action_list,name=sunfury_aoe,strict=1,if=talent.spellfire_spheres&variable.sunfury_aoe_list
 actions+=/call_action_list,name=spellslinger_aoe,strict=1,if=active_enemies>=(variable.aoe_target_count+talent.impetus)&!talent.spellfire_spheres
 actions+=/call_action_list,name=sunfury,strict=1,if=talent.spellfire_spheres
 actions+=/call_action_list,name=spellslinger,strict=1,if=!talent.spellfire_spheres
@@ -82,20 +80,6 @@ actions.spellslinger+=/arcane_orb,if=buff.arcane_charge.stack<2
 actions.spellslinger+=/arcane_blast
 actions.spellslinger+=/arcane_barrage
 
-# This list is only used with a variable for extra information, it is not a default list called.
-actions.sunfury_aoe+=/arcane_barrage,if=(buff.arcane_soul.up&((buff.clearcasting.react<3)|buff.arcane_soul.remains<gcd.max))
-actions.sunfury_aoe+=/arcane_missiles,if=buff.arcane_soul.up,interrupt_if=tick_time>gcd.remains&buff.aether_attunement.down,interrupt_immediate=1,interrupt_global=1,chain=1
-actions.sunfury_aoe+=/cancel_buff,name=presence_of_mind,use_off_gcd=1,if=settings.cancel_pom&(debuff.magis_spark_arcane_blast.up)
-actions.sunfury_aoe+=/shifting_power,if=(buff.arcane_surge.down&buff.siphon_storm.down&debuff.touch_of_the_magi.down&cooldown.evocation.remains>15&cooldown.touch_of_the_magi.remains>15)&(cooldown.arcane_orb.remains&action.arcane_orb.charges=0)&fight_remains>10
-actions.sunfury_aoe+=/arcane_orb,if=buff.arcane_charge.stack<2&(!talent.high_voltage|!buff.clearcasting.react)
-actions.sunfury_aoe+=/arcane_blast,if=(debuff.magis_spark_arcane_blast.up)
-actions.sunfury_aoe+=/arcane_barrage,if=(buff.arcane_charge.stack=buff.arcane_charge.max_stack)
-actions.sunfury_aoe+=/arcane_missiles,if=buff.clearcasting.react&(buff.aether_attunement.up|talent.arcane_harmony),interrupt_if=tick_time>gcd.remains&buff.aether_attunement.down,interrupt_immediate=1,interrupt_global=1,chain=1
-actions.sunfury_aoe+=/presence_of_mind,if=buff.arcane_charge.stack=3|buff.arcane_charge.stack=2
-actions.sunfury_aoe+=/arcane_explosion,if=talent.reverberate|buff.arcane_charge.stack<1
-actions.sunfury_aoe+=/arcane_blast
-actions.sunfury_aoe+=/arcane_barrage
-
 # For Sunfury, Shifting Power only when you're not under the effect of any cooldowns
 actions.sunfury+=/shifting_power,if=((buff.arcane_surge.down&buff.siphon_storm.down&debuff.touch_of_the_magi.down&cooldown.evocation.remains>15&cooldown.touch_of_the_magi.remains>10)&fight_remains>10)&buff.arcane_soul.down
 actions.sunfury+=/cancel_buff,name=presence_of_mind,use_off_gcd=1,if=settings.cancel_pom&(debuff.magis_spark_arcane_blast.up)|((prev_gcd.1.arcane_blast&buff.presence_of_mind.stack=1)|active_enemies<4)
@@ -113,4 +97,4 @@ actions.sunfury+=/presence_of_mind,if=(buff.arcane_charge.stack=3|buff.arcane_ch
 # Explosion to build the first charge if you have 0
 actions.sunfury+=/arcane_explosion,if=(talent.reverberate|buff.arcane_charge.stack<1)&active_enemies>=4
 actions.sunfury+=/arcane_blast
-actions.sunfury+=/arcane_barrage
+actions.sunfury+=/arcane_barrage

TheWarWithin/Priorities/RogueAssassination.simc

@@ -1,4 +1,5 @@
 actions.precombat+=/apply_poison
+actions.precombat+=/variable,name=priority_rotation,value=toggle.funnel
 # Check which trinket slots have Stat Values
 actions.precombat+=/variable,name=trinket_sync_slot,value=1,if=trinket.1.has_stat.any_dps&(!trinket.2.has_stat.any_dps|trinket.1.cooldown.duration>=trinket.2.cooldown.duration)&!trinket.2.is.witherbarks_branch|trinket.1.is.witherbarks_branch
 actions.precombat+=/variable,name=trinket_sync_slot,value=2,if=trinket.2.has_stat.any_dps&(!trinket.1.has_stat.any_dps|trinket.2.cooldown.duration>trinket.1.cooldown.duration)&!trinket.1.is.witherbarks_branch|trinket.2.is.witherbarks_branch
@@ -170,4 +171,4 @@ actions.vanish+=/vanish,if=!talent.master_assassin&talent.indiscriminate_carnage
 # Vanish fallback for Master Assassin
 actions.vanish+=/vanish,if=!talent.improved_garrote&talent.master_assassin&!dot.rupture.refreshable&dot.garrote.remains>3&debuff.deathmark.up&(debuff.shiv.up|debuff.deathmark.remains<4)
 # Vanish fallback for Improved Garrote during Deathmark if no add waves are expected
-actions.vanish+=/vanish,if=talent.improved_garrote&cooldown.garrote.up&(dot.garrote.pmultiplier<=1|dot.garrote.refreshable)&(debuff.deathmark.up|cooldown.deathmark.remains<4)&raid_event.adds.in>30
+actions.vanish+=/vanish,if=talent.improved_garrote&cooldown.garrote.up&(dot.garrote.pmultiplier<=1|dot.garrote.refreshable)&(debuff.deathmark.up|cooldown.deathmark.remains<4)&raid_event.adds.in>30

TheWarWithin/Priorities/ShamanEnhancement.simc

@@ -33,8 +33,8 @@ actions+=/feral_spirit,if=talent.elemental_spirits.enabled|(talent.alpha_wolf.en
 actions+=/surging_totem
 actions+=/ascendance,if=dot.flame_shock.ticking&((ti_lightning_bolt&active_enemies=1&raid_event.adds.in>=action.ascendance.cooldown%2)|(ti_chain_lightning&active_enemies>1))
 actions+=/call_action_list,name=single,strict=1,if=active_enemies=1
-actions+=/call_action_list,name=aoe,strict=1,if=active_enemies>1&(rotation.standard|rotation.simple)
-actions+=/call_action_list,name=funnel,strict=1,if=active_enemies>1&rotation.funnel
+actions+=/call_action_list,name=aoe,strict=1,if=active_enemies>1&(!toggle.funnel)
+actions+=/call_action_list,name=funnel,strict=1,if=active_enemies>1&toggle.funnel
 
 actions.single+=/windstrike,if=talent.thorims_invocation.enabled&buff.maelstrom_weapon.stack>1&ti_lightning_bolt&!talent.elemental_spirits.enabled
 actions.single+=/feral_spirit