From f148e8781be2e4f5f249de847e2596004ea13bfe Mon Sep 17 00:00:00 2001 From: syrifgit <139663837+syrifgit@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:07:31 -0300 Subject: [PATCH 1/7] Rogue Spec Options UI update --- TheWarWithin/RogueAssassination.lua | 88 +++++++++++++++++++++-------- TheWarWithin/RogueOutlaw.lua | 21 ++++--- TheWarWithin/RogueSubtlety.lua | 82 +++++++++++++-------------- 3 files changed, 115 insertions(+), 76 deletions(-) diff --git a/TheWarWithin/RogueAssassination.lua b/TheWarWithin/RogueAssassination.lua index 812a42f96..c226f6b45 100644 --- a/TheWarWithin/RogueAssassination.lua +++ b/TheWarWithin/RogueAssassination.lua @@ -2108,11 +2108,12 @@ spec:RegisterAbilities( { cp_gain = function() local fanCP = buff.clear_the_witnesses.up and 2 or 1 - + -- Predict crit gains - if talent.seal_fate.enabled then + if talent.seal_fate.enabled and settings.fok_critical_cp_prediction ~= "do_not_predict" then -- calculate the crit chance of Fan of Knives then estimate - fanCP = fanCP + floor( true_active_enemies * ( 0.01 * ( crit_pct_current + ( talent.deadly_precision.enabled and 5 or 0 ) + ( talent.thrown_precision.enabled and 5 or 0 ) + ( buff.momentum_of_despair.up and 10 or 0 ) + ( buff.master_assassin_any.up and 20 or 0 ) ) ) ) + fanCP = fanCP + max(0, floor( true_active_enemies * ( 0.01 * ( crit_pct_current + ( talent.deadly_precision.enabled and 5 or 0 ) + ( talent.thrown_precision.enabled and 5 or 0 ) + ( buff.momentum_of_despair.up and 10 or 0 ) + ( buff.master_assassin_any.up and 20 or 0 ) ) ) ) - ( settings.fok_critical_cp_prediction == "predict_conservatively" and 1 or 0 ) ) + end return fanCP @@ -2173,6 +2174,12 @@ spec:RegisterAbilities( { aura = "garrote", cycle = "garrote", + usable = function () + if settings.max_garrote_spread > 0 and buff.indiscriminate_carnage_any.up then + return ( active_dot.garrote < settings.max_garrote_spread ), strformat( "active Garrote DoTs higher than or equal to the user specified maximum of (%d)", settings.max_garrote_spread ) end + return true + end, + cp_gain = function() return ( stealthed.rogue or stealthed.improved_garrote ) and talent.shrouded_suffocation.enabled and 3 or 1 end, handler = function () @@ -2907,9 +2914,29 @@ spec:RegisterStateExpr( "envenom_at_5cp", function () return settings.envenom_pool_5_points and 1 or 0 end )--]] +spec:RegisterSetting( "fok_critical_cp_prediction", "predict", { + name = strformat( "%s Critical Combo Point Prediction", Hekili:GetSpellLinkWithTexture( 51723 ) ), -- Fan of Knives + desc = strformat( "%sThis setting controls how %s predicts critical strikes for combo point generation.%s " .. + "|n|n%sThis option only works if the %s talent is selected.%s\n\n" .. + "• Predict: Assumes a certain number of critical hits will occur based on your current critical strike chance and number of nearby enemies.\n" .. + "• Predict Conservatively: The predicted number of combo points is reduced by 1 in order to prevent more jarring rotation changes from unlucky critical strikes.\n" .. + "• Do Not Predict: Disables critical prediction, using only guaranteed combo points from casting %s.", + "|cFFFFD100", Hekili:GetSpellLinkWithTexture( 51723 ), "|r", + "|cFFFF0000", Hekili:GetSpellLinkWithTexture( 14190 ), "|r", + Hekili:GetSpellLinkWithTexture( 51723 ) + ), + type = "select", + values = { + ["predict"] = "Predict", + ["predict_conservatively"] = "Predict Conservatively", + ["do_not_predict"] = "Do Not Predict" + }, + width = 1.5, +} ) + spec:RegisterSetting( "envenom_pool_pct", 0, { - name = "Energy % for |T132287:0|t Envenom", - desc = "If set above 0, |T132287:0|t Envenom will ONLY be used when you have at least this percentage of your Energy.", + name = strformat( "Minimum Energy %% to Cast %s", Hekili:GetSpellLinkWithTexture( 32645 ) ), + desc = strformat( "If set above 0, %s will ONLY be used when you have at least this percentage of your Energy.", Hekili:GetSpellLinkWithTexture( 32645 ) ), type = "range", min = 0, max = 100, @@ -2917,51 +2944,48 @@ spec:RegisterSetting( "envenom_pool_pct", 0, { width = 1.5 } ) -spec:RegisterStateExpr( "envenom_pool_deficit", function () - return energy.max * ( ( 100 - ( settings.envenom_pool_pct or 100 ) ) / 100 ) -end ) - spec:RegisterSetting( "dot_threshold", 7, { - name = "Remaining Time DoT Threshold", - desc = "If set above 0, the DoT priority will not be used if your enemy or enemies will not survive longer than the specified time.", + name = "Remaining Time |cff4ec9b0DoT|r Threshold", + desc = "If set above 0, the |cff4ec9b0DoT|r priority will not be used if your enemy or enemies will not survive longer than the specified time.", type = "range", min = 0, max = 10, step = 0.1, - width = "full" + width = 1.5 } ) -spec:RegisterSetting( "mfd_points", 3, { - name = "|T236340:0|t Marked for Death Combo Points", - desc = "The addon will only recommend |T236364:0|t Marked for Death when you have the specified number of combo points or fewer.", +--[[spec:RegisterSetting( "mfd_points", 3, { + name = "|T236340:0|t |cff4ec9b0Marked for Death|r Combo Points", + desc = "The addon will only recommend |T236364:0|t |cff4ec9b0Marked for Death|r when you have the specified number of combo points or fewer.", type = "range", min = 0, max = 5, step = 1, width = "full" -} ) +} )--]] spec:RegisterSetting( "vanish_charges_reserved", 0, { name = strformat( "Reserve %s Charges", Hekili:GetSpellLinkWithTexture( 1856 ) ), - desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this many (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), type = "range", min = 0, max = 2, step = 0.1, - width = "full" + width = 1.5 } ) spec:RegisterSetting( "solo_vanish", true, { - name = "Allow |T132331:0|t Vanish when Solo", - desc = "If unchecked, the addon will not recommend |T132331:0|t Vanish when you are alone (to avoid resetting combat).", + name = strformat( "Allow %s When Solo", Hekili:GetSpellLinkWithTexture( 1856 ) ), -- Vanish + desc = strformat( "If enabled, %s can be recommended even when you are alone, |cFFFF0000which may reset combat|r.", Hekili:GetSpellLinkWithTexture( 1856 ) ), type = "toggle", width = "full" } ) spec:RegisterSetting( "allow_shadowmeld", nil, { - name = "Allow |T132089:0|t Shadowmeld", - desc = "If checked, |T132089:0|t Shadowmeld can be recommended for Night Elves when its conditions are met. Your stealth-based abilities can be used in Shadowmeld, even if your action bar does not change. " .. - "Shadowmeld can only be recommended in boss fights or when you are in a group (to avoid resetting combat).", + name = strformat( "Allow %s", Hekili:GetSpellLinkWithTexture( 58984 ) ), -- Shadowmeld + desc = strformat( "If checked, %s can be recommended for Night Elves when its conditions are met. Your stealth-based abilities can be used in Shadowmeld, even if your action bar does not change. " .. + "%s can only be recommended in boss fights or when you are in a group (to avoid resetting combat).", + Hekili:GetSpellLinkWithTexture( 58984 ), Hekili:GetSpellLinkWithTexture( 58984 ) ), type = "toggle", width = "full", get = function () return not Hekili.DB.profile.specs[ 259 ].abilities.shadowmeld.disabled end, @@ -2970,5 +2994,23 @@ spec:RegisterSetting( "allow_shadowmeld", nil, { end, } ) +spec:RegisterSetting( "max_garrote_spread", 10, { + name = strformat( "Maximum %s DoTs During %s", Hekili:GetSpellLinkWithTexture( 703 ), Hekili:GetSpellLinkWithTexture( 381802 ) ), + desc = strformat( "This setting controls the maximum number of %s the priority will guide you to apply while the %s buff is active." .. + "|n|n|cFFFFD100Set to 0 for no limit.|r\n\n" .. + "|cFF00FF00Maximum:|r This number will be used as the maximum number of %s, and can go as high as 20.", + Hekili:GetSpellLinkWithTexture( 703 ), Hekili:GetSpellLinkWithTexture( 381802 ), + Hekili:GetSpellLinkWithTexture( 703 ) + ), + type = "range", + min = 0, + max = 20, + step = 1, + width = "full" +} ) + +spec:RegisterStateExpr( "envenom_pool_deficit", function () + return energy.max * ( ( 100 - ( settings.envenom_pool_pct or 100 ) ) / 100 ) +end ) spec:RegisterPack( "Assassination", 20241031, [[Hekili:v3tAZTTrw(BrvQIH0wsMKsYhzfvkp2jZMmBoklVt(MaHabfXksao4qYAkv83((E9f6UXRBasr5KjoXsHOr3V7(D1nVA0vF(QlNfwgF1VoE44thnA4OJhn(0XNE6vxw(W64RUCDy0TH3a)sA4k4VFFrryrrsAyzswk(0hwMfodNLISQ8iyelklxx8DV6v3KuUO66JJYw9QIKvvlzVruE48s8)p6vxD51vjll)P0RUMgeo5QldRkxKLF1LxMS6dWmNmBwmF4XfrxDjo8Jgn8OXV572m9xclkJZ3mvcGBMgLLNhhHR6MFEZpRg8Od3mf)5zWlHZ7MPvRXLxnOHV7OXVfE4pMb4ZMPRZYwMKEZMPZZGP)hsVlonB1MP3dOxwv5MPFmm)24c4x(1KBwa)izU2Osk2mDw29Pgt(PWK)57JdVLAYH3sBSJ8bLJgbp8tX3LuaG58KLlJ1aqTXn8maLXF(wXpFNZj9ThngF47xUm7EpZ5B5iH(C8FTzAE8YWVSzACAC(npG)V3eNI)4FvLKhVkoTSWygg)D4mhE9sa6xLLd)97)TFqFeJW14htGPSicE7GIWYQCMy0MP3fMNWEvTXp8Dmwl8s)VmqcO9ZZrUadovd8nCbMpVawX)ieqV)ayLjGW8YKIYcMOCzC4YYfXOC9VYurIzW5SR(BGmzKq0hyDb5XsXEuKmpzn)zxkNaaNydV4QlboCqA8xkXze(RXoM2WvxxvSWA(E)61lbk6hJdlxuugU8248cuKp)wU8wci3TieX3qGJbKNS5ZV6s49bvIKWRU8aqkm(6Q5ZpEM(ueScMHJRwVzAVntHpdiYudqaLSr1FZuesVloywg1G3mDciJTz6JpUzkFb5QhbPO2XXmDHPdqcWjoiaflsUZc9)LWBbEvrfkJuMHO6DWVb2dUdL(aCRkNPe9pG)U46Wu4HiXieLGtdxcMcwehDRobrGS3kFbdCeXS6NuMeDlB27PiIiiEmishMKclZ5Gqh7PSNfZ1vaQkIKN6ajfJYcpvMnqKeN9Yq0qwjkPItEnMEz11aMmVcnmxJvXZNhZzoGv3RZcwNLGkDtVysTcZX1dQyDC6SGO1TG0gOvnwdZ5jsrc)cxkzHOSLZcUEzw2m2NZedoB3OqscrtZ(4)b)YnOzLYW8BIl3xKigoSITGbHI1liemjjvHeAgGbWvjO1NjsjJNgj61oir5vRbdIOeWdrlJd4iBbAFzFIWjPZsqoWkCtFywcZtb)bKOCF0a)CWm4cUHCeraRnfXLLOW0XmqdWd5GpqBvzBqiTQJ6EIxwnGMM9fJafwfyFTO6aHzmKkaF6kGIKfmlbw9la(WzwssFI)61ss)KbEUz6h4ikYaEJdgWnH55zLTWayuintfJ5yXAWLOYK1ltqP3Z5sk4N3N9VDJYBAmwanSvHdqkbXbQ52X4TLC75IlQ)Ves8xiL4PydhPrjGbo2IJ8tRwNNDhkh835qg6icFJp05OpXfZ4EEXPqAJT4qeyIYQslR9NYdl9TwS0A(LAZ)JteauGIsXj7UyDuSzNeOwnM4Ea6RZjsoHU2nyLzEse6uWfCO7La1EZ0xO2KVyrEw1maZkGfjlIPCj3cSP4Dj8NlVlmnb8lHWHikpFaAn4EeUBpaM4F(NSxh246H0ij3XMFlzTm3CqtJMonDj8Z8WGWvit(Qlp9mx(I5X7kbwycZsyd31Do73yW3pcYmZRwIoPodKPS8NIXEMdd5AaCMfSSk62hatSjPs(3tXWB)gZpoZGbMKLfhd7EeDlFEotBNdRXUioCM9y963vRKMI15WCQXTKwov8lTOICP6zsefIJws5goJvpkhMd1hSCKwkUgJjsiykT)PzpvZQ4XUuY1hJXoFdO2P3ydE1kx)iDv5tBxvUpYfIxUuUvdW0tdYMhCBkicHYwFpFA856PvClnvQScuXLdAELxykqWEgH3XKqKgPLA47nPJ)ts0WpNJzHMVwDyVZrcn)8WKzbX3Hyw4mqFhD(fNQHT46OFMhee51m7gm2OTl20CjVe2oWjT8QZG(1ZM2wti4HGqQYzOnYcztQi2y42QH(C6BBiDeBXry0eJGpfmWcCqqbjKjpeIUMg)L1WUd4wYnIC9pr549HjohYTNmK7SruwoZhvF5Fr58TbJ4dSejnlCfO)d(nEhIAOIeqrVozzsjZjSQcKqblF(d3VigFHFrfS9Fx5tVIK711k3UekWulb5UOCp2NlmQO(SsrIebub2uLUmUaZ)OmbLPIeuIuG17Rye33iFFMuYlfgc5PKke0EtVjOaDVFwE8YAH9xW9Rr(cUdTeg4R1IBHhjkrcQKcYILokSQacWeq5WsGy1WIfxpWEuYi3lfzZIqkodyafyQjQnRWbD83wwfRNZoLTll7GgzMQzeX2EMZsxwugSvj(bfSLmGNvFCfcupIs6RD41Bk1Ssng7ZQdZ3C1THl1mAcHBr(d5OoZICyMkmJ3NZe)bh8)984OKc2qByOnumQG1YbzGyoqIoSH)eMGUG1H(UuKbE4hVAnimQyHE8JZjEgfwWs9nIUQmIsVP9suM)(y8VdyszUrncUG(EkoYxQXt03j4Tg5YH(TvBMqmfi5J5LJM6SuN1IwQWjQ4Xn31ZbBWrQkBiR8Sson2ELIOkm8AjH4XjqcjOFu5)sHMoJsrr68YS6i03NkmeUv4ZtmVWV0PkqjmIb7c1IqmJs0Ad0MUQF(taZ(6iGANulpeQpwTATSekimoN7BaSXUoT56ScEYazpoWqwlAbAyRGT16B5B2TcccliAwH)YMX)PP3lWlc2kbsFwvHrUJ(DXW1GjueHLH8LWUUG8pmZI0G4cArhlD45pxcZLVwSLjyEv(dn83ppHbQkXR8q8Nf8uLCnSjtXdPritLVzJuZTqhvCan27S5)fQb248I4CxBB0XjzEsEmdR9BWZqE2rv0CetMTtn15ME3MUDBZhnZKHaFQOmh0RJaRhCjzWnbxXF0UNqphUtBj)9FhVCn(4)PSm4mXowzobPVWIKiwTpHysXrr70hGFbYX435pjMAz9Xo0l(t3m9Z8hZnSmg8m)ZCxG4gLVpwwaxWzWQBwy1WagPIx3bkXE(MMAPXHDn2Jx7ZVYovSN9AOIERvw3WOr2fzrLhIQ13ghVgRAYYImwiXf8(iaJH89z)axIcTUQXHQlfNppt7uDj3fwyFFom6SeQAVQxYzTfiEDhbN15ZsEykVVggBeBi5OoxNv3wv84tw7mXZml6whEfyXFZZFu0UcH2vPw3jzo0dugPg7QfybrITTKORCuxlj(NLCNxjo)16UBC6rVRfwrdLqpreqNtnLndrt1O855gKhfwICiwGcSgvzziA6)d)o6f0Cw24c13lInW4zy25qpYX9csNTmXS(A2mGD0SQzrzNGzcm62aE6a71H4ZprZ6HR55fY9K2QzRng7agVLNFa7AaRgemNI8Lc0TvKED3UZkKTsrVwZK746ysQhGPoHNyhgBVT0LsrQpWKj(meM5TO4QM7kGxnaTI)GU5UcyWlUa5cGCzq8k0)4SQLxDjy3b(05b3enJTPeF(DnAdNE3EVnrjXrkVCBHO4X9JWLGadeYvW6Q)9)guOVo7loXeQHsyb0nf11o7LmBZX5qOpWlgMwSkbt4PlaX5W3kGXLX9vHZc(xvXXPyFuLY6GydpXCl)Y0ghkTBUJYWNiXsc4WJj2eW34C01FqHgm5pdI(4HaiUTQvUOI(EJTIq6kpk7prRNMXK2voStWHJC)W3yHTttvbdgkkdHnmkvMvmuQvKojvddDpOyzwP7w4ZSZ98b4d1dXTLLASM7gIrCC54JvKpSbmEGWCJHq7bUdw2RsbhwDp3duiYb(reiyv8xkqdaShos3cI4taU57CALHnMXBhBA8xp20ik20O)JNnnM7mb4Fvi4lfL7eMU1hxiB2lmU(1a1nH5WwFmVR3vTeDoK9bQKzYpwgRUoSupn18zHANCZ(dmfKfqRl8elijs8Ggc5NyHIKvRyuHeCW8vOqMdoWWLMNq3cemQnCB3LjEKjcp6r0jjfDONQlt)G6P)GiCMpXpvePXXZWpM1yvIGcak3N)Tp(BFhqWkapdzFc4ZBrgmbqGfWBuGovJBHoq3ZiRqlO2aVDKQFlEW(c)X9YDdEaVfKgp0ImWIT7J(lk)h4jV6(fml1yKeRc)sYQk88Buh(3Fte(h2xBf8AzhvLNdphZQVwLdzazDs2G5kG)suUu0o5HNZstmxR56ScJJCDnjj)rSOjpei3L1rgE)c2r4OkxGNOSEvQOY9lsk5D4QojQjMBgFSTZiTJV996xKhZAUtVlvnGn(SgLYI)Qc1T1r1nb3Pdz5Qa9HRwUedKezoyJqwNBJJ45pPEy3bbpIoKYwZI6b2fp0TLRfYSY0AwSaIyygp9)chpyCrogOZKsZkdeN9lkpZAN)Spyo6aucAjtwIccpTAhI2s2R(IhTmzDG8aFq4yq7l(BgY40McefHP3ubwFb11qGTzktm0JmbAsth(QwdEGhSmbcFjqWlbOC0WTgmL506cLi8zIFSfqt4DzjZcGnnzaX2hXV3IiZsWhpUiYXbo2yW5MfuKXTXmA7BzeLvtDPVM(UiwegCP(qfvOwqJUtE2YzQESAcLMgIIZ5MSnm83ugH)somJ40uWi3v)R(KjKNDtvmF(9DCfWN7m7rxGzpcMZ8KOsweEQQ8a(sfW)FcWJej)Grk3DrD0iXxYvEc8ofybIXx2vC9(FzzNbIZG92A1KQWOMh7IThzLvbeFfxbp7DcMLGNaz277(aNieRmtR5zmZcKEAQf4EEe2bjLzmhGyldZ0P1ZxxTSiwFXrpThQpqwJRue8)vn7g8C6Ap2r6J96WByzjdiLOtn6JeErS1iyo4RcFqbmyJxeW9N1Eb2AlhLz3CdO0nVknnEPU2068KmGY(qaObOC)zRCXxotnIysNNPf13IWc0dVYJdtFiy26c6q4BokwXFicECMQaaOGavwaQhHQmmAdlP4ymCN48RbZHfbxdBFGLtXA5ihfT3n3VibNaXldwCWGgvhcxwIv(NixPqXDgTBHGmMKctr7OI(Ufkmj97I2ybnjWoiDnwnheyFYx7uGjrR5XyGnraZZgimSZ)ElpkOCn2UHGIbcpe7CSOAlSqpXD54LUrRjc0rIMDXav4ggl0VNhFueRgrGzh8cwieb8pY(v98iqMGaNTcgovbiwolbpvlUlL0bTvwwnBybfXiwxWLOlv2ZjYmsJTEqVWvEpWQuJVdZMWqpWjFr)HhF6lhE8jVGI3H(cE0WJhD2lC7R4GJ4ufLJ3rzfAsqD(SYrFcS)iJeuhn)7RJGh)J6aAJMfqt(jrCsp2Fl8EYRuDTxCiMQwWVPz8m6eUcg(8hyrRW3NqgO)HIbW(VKvH8EpBgwMXd5vigZSeSD9Xxz2zFo8lSNzjf7CR5OgIMtBgrwvJcID60tsWyrtOr5CIDj15NYehneMFoKQwAkEHSeRICIBEJLCLDV1rsU81tt6MG2nl)oQVlJUCKxV7DZrODbCldFNv6A8sqXiCWI4aXNUtMS7WzlWvHu632Xoqtw0(XMXGif48r671jQy9rp5d8veSSZxsBIMeIQjEU9GVoWQMVOI0UQQmzPOGB2BnSLtL4ExHi1hYryKq0g1EkLNFY)HiDPO5VtEPSq)KNoDeSy9qAD3qu4eSLxfpCten8YvkC0LMq4i9UcAvg6WF1kCCagTomjN6K7vUihCmIQXNLPnJjXTmg43y9ZbxFsJlaesA)4G2Z)gvMF2jApREa8loaUr4cXTKtkxAwUzYds2dqqy95o(jxJ5zNNGvzFhYREGKMVzQKOpqWM)SJT)NfhotfYd(jS8R4LfPuXj4WYC7144)iFGJBedxYr)jiRqM2mlnqRkhW(qoh7Vbg3NvKml(v1x)nhdBNLj8QOcR6R8f438tQkurCfb1t7qyECxu8K5W(AjCOS42iZm6nDy75JTorU8cAPuOmxPbKj8RHTWU12LBJWWKMxwhFo86J(fXkAOX9rMqp24(Ch4qnKXkLjYef2edCux)6fSV6Ig4684qobv5UJWnGbTG3Cx6DCCfAFx8AlAopwZo0yBuJqTBkJ)imruFtTdimB7cRljJF59IiNen9T9X9QENxL0f4L2t9q(5TP)r0TTtO0yAitnA)NXVobGnugL5h2mirJsQFMxVUOkTHNY3RK1OP8UgdfnWogDLiH8uMWpkZQaRu4(HAhey(b(9qH8cOnbcyLSMXKZl1pGaIIswa75umpbZsaf7YBZIzaY)VfH3OonIkpEeDq6rrgD7NaafW2hctlHPrS3DDOKx1TuVYBjsc)ZLVT2zyZuDKLBcRJNpRyRsNfUpbjHfv53XCMyzgkMWpmdUAzfcsNylZM9bkl)Vd7AbjBlDlFqZ8W71IhxC75vWU2nCtrJA2qDIB)owLG0RmG40g62p8(nRoSHjJgxREVwUrkLcy)w6tMj8IRjTbtuS0oqGhPDjdP0p9fKq5cGIG7(ghA7jdwMjE3pit6bpRphk8CHBxhjcICAmJDg9uNZovFrWY0h6WBOaMPs6HgGOrXiVadfhfzMJmT5tO4il7AAED7Kuftthc1pmHV2rSaMzrKDUaF1N4N6Ux9BCBg4bq04S21jtfQJTiL3Pgu26Twywr71wZz3T1xCJIq5CNHYdJM79kHID1B2JEKMxiuSroGQRa6KYvTUvThbjPX3LuID0dMVGzgHgSZhjUbn7evfnvDElA4qfMfhrNcXVyDzryZ7TCTBX3I64cewV4x1zX5Slda(9r8Wta(49H5PO6p44lQbMSADwEPyY)wLuX3QUTBXwukJ1GtvLzR4T1diJNcY4hV5N)FyPzhV)B)qgaj5Sh)TYZPdsUnUHi)w(29UhGKuddS)OVmqTcNqVckdzwtCdx6SNV3spFu3MCwtTVlCU6vzZptqD5AhBhP1bIBPSAbJoCJVJev66jyTe(VNQ66kzvNF71WXndK9SF2ZinYXC)mqJCTs7hA0R)Zy23lCG38mb5KQOYMYy7usDz)Z(CkAB(Z15y0Me4y(TslU1S7iP8TqaWDp2li)oBA2HTIMxzfwtS770IokTUhxbhYS7mnXX8TxGysXaPJKBNOGdty7mAV)MpsKu0uuBhoE6ZMUojmYc(F7GWg(2iALd7tFJccDD8CSzh7VjwnLVZXuAFeuAmLedWaw3FtSloJ4WLSD8ghME07mclbhQgEPJg0mRpL18sx8QwjJ8x2QFKTMAhDRCls6QEvz7OOn2UqXOTBJkcwnXq8VxKsIV1jNCiDAYjAFlFsPAJ5zD6BDIj6lnFwc2w4ExN(omXKD4gXK7ACDc(D0UDe0(oTmn2hAFkA6AY3lkvUH8DJb)mp9ToX7QcvhH7DD67We)vsGSBlthvVC4t4oVdk9E7SwdC72iYbG9edsZHNx83MOngSMFpn6qhxd7EGWAbC1IeDC2F(CrzVsBCSgpzAdDoi22WU23rGZ(2yJyctmtlU10MqN0CDK9Ny4joL4fjcp73BMY(YkdE(v4TKw0v)64ZEh25YzZtQlrAXXk3dF5KxPFam28ZuJqMj(dX6smPrliDiRg7tmo7fB(5VzZ0T9Gc0Lvxml1ThVy1hDyY8jU3zTx)dCVN(Jp6z7HlM4zpVb9oOflZ6Zn9je4jG0J1r6M4Lgs3KIudye41fEiiA4SdusFQDGZFdwk9YoEYc6cjQzrIe0i9Uq(OXN)9Nr1a9maQRNabAWr2sz0p0OftoSXjjGl(QDMe6DG)tJaAa4BWBnGNYDTGcw1b)Vb)A4O8PFJkOp54DQa3IWZ19EG(QzkyyDliiKkipbDxm6mgu(15AjWni7(Ycqa999upEP4nX1XWlgp4IVF8qgoUxVNbAdvQV1beiGZRnHlMOk7RBQG(MlD7m27ga1oFasIlzBH84JK9Rj8XgvjFWJp23QRu6rDA3pFYiyO1xHbxmP)PdF5jdPmoDKRJ1dmdyhv0ZOBkoFcYHDHU6NOAb((uqx3lK(XKwNP3oDX9C28SulM53m8OAsNvcZoA0qphkk3lM64FByX4cGlDg8V70ukoM5YnMKBS2OLip)19oG8P41h0wijRuL056p(4bQpxaq9uFGcP7rE2A647wpgnHGAPD(5KxttVjF9Xh9ktB32mcBnQMCKFGU5BQA12Np(O7tg)Jp6OTDUOdRoeOrhgKOIOTpsr5umqLWi9dDZfJAFw4HERpoZZgooRMNZ8lMm6SxsFtg1CwyNGC9p36aJR)iJZhUW9LNJwCU2bmGJ0qjHU1Bf6lhiJLLUw6CBI2hZIoUCeDXR1QQgXJp6X0WKXcNN)Q3YVDftBGFwAG98001xCwpIMTUN9ohhq0I19AP9QPEobtHrD3)DNSnXJwDLvFsacy(GFxg(TB9p8fqumv9niqnFNnkZjnH9obXIxjaPrIy2ZUheOtsNxHPob16P79vMs5tPrNTXt1sGRzFF99CVM98mylAOhFCQDc0xxm3nkpR9AbquP5v3nZ2tGsOHHsM(dPP6Q3eSN)6bnKH7xhyTDJuEXKZgYn20Gd5GCidC55RxITPcADPlshoGO5I71NOFGVyYPWwWUdFbEEpYx710yUIks02WV41d4b23LMcUBYjYw5OBJM3JIm6Jrlc3ZHFgtes1z7wJQ2aOYKDc7HAnll3xI(T01WxmSxlDl8fOUPP4VxHAuM(a60B2JUpG1CrSz6DgO8Hy)8n7NgXt4KgqbfB2ZTm08ardgO61x7gghJQRNEwCAAt7ij5yeFJ8T(lOps4uSHjZDUTNuUZ4q)tFzFbhTrl58IZg8YAd(wzHb0mh0R)bocYGUCoQD9BE(2LYc76x)j10uHB3nDVH8BfazOH7bsoxwEV8vLcf2ez(v0clWiDJWxmzSMdsKiBxfkEndv2xFHIqHmsTsJd0k3S2oPLEGlX0oO)(8(Lybf2l11jW(THd2)ahz4HRJLP9LwbQQ6Ke13D(gNmwPlt80Zr2I)SCJVUBgWzdaJi(So9MNI1jAJt)vHH4KDuZOSt9QxH535eF11LFw)I(WNMUvXr6Ow(JpQCtejMSVzo6513Ztar9MVZlg3(B5M4o4It95VxnAZtwdG1gxfthkVEOajk9lhQjp73nuAPCAw9TwLWh1)IFFprqvLjJwfTITSEVTy3B1d1Y6QYByh32tWESGlWckQkjEslnQB2jg5DlVSM8JU0yRlVwmU546wLwuxhseWHPFu1xZcQSGtOkp6ihEgst2TjPwowBF9d1jG08(as2Id0oMsLYQ(U9wvjN44My68jJhqBIBuVMOAdCrEDzyS)ttuI4n530kT(EaXDFDVgraeg2wBalCyO3bnAcLE(QjkyI(O(UBuPEoAXObY9EjV)I6DaDr5OjqSsN)18YhQlKwnR7nUuIo3d9eKUBWaiZoo)dT0n08ErJL(mW(45e7R0nfu31Neim33x9RYh9AtXsv(a3ofsEfbjKx1NtoryhVwE8zDXN3UDJTkkLXoFp(Sn2(K2Um3C18BvS65JLh(gBlq)nOKwv0T3dWDYWoFSJ876iB3JBcBiwH)UOCHKFlLrK2psXPEMFADALh5k97Tdqn)gHQj0Oyr0K22wdhFpIT3xNMFtEzuQaI83FYWEhSf83tmRMJekMLf4afbfQIBBINKlPLpdyyrmReWmVm5g86ladVaM)iwtQcX0fbBjKi)vvNA01XxlKi3(m)H1O)dWhwMxjWr5Ss(WgtrCoG7Li1pe8L4guepPG1fWQ(iX5i0NmIYM4N17(lzT9UuwN0y2EZmUuFnS8223mAUH9IdzTZRSluhzwNVgnUkgKorXBDvKpSDQ8mzJnARxfDGv2UEo24KS2XE0LhpKEMgmqVByAaBd6mjBCBKSX7ts2iJMc(VAKmEKBT8T(FnLvwnowotyBglJ2LLPSLqCliMfvssSoziHBuI4V39Vi)jHog4emVk)bMsm1Is9wQV5(3M3s9v1)28sMFz3ZKiB0xk9OedA2(JD712c3qERuWGxvFQY2GlFd)1WpSz3OyvXsIGwOINVllLcYBSOnij8TSQBgG6K2AaZAynZ2CyMQg(VpNFzeWABDE8onGrztniw(M3FbUwx)bJDkJazvrjJwirWOyr47S9SSasP4gRfYUpMPPYysIUVYcwji292kNBFlAxJC8U7(kmdEymzY8azrcu9jwtpU8qXg0gFBVtr83GzJgy5CqHMaOsQtgo8S6gsAVj95YOCniXZGSM1zHSgpQ22eXQ1dpy7bU9p3hZMoRnC4Qnyy48wUH1foUqgYMHr03lVvAWuMobWErKTjt5ZEP7coWtGIktb1xVyy6vLTggwJZfyLHMdSh2jhy(C6LPoFigEuyENLbwdLfTRXd71xqBvb6y84jdfHlyM4yuqFGiNWyl1vWQxlUnU4iOXi74nChroEeL8AEsktmJLkCsKZsCxB7pAJsn7XPZhzVVadOv59aH4vQSAZQ1go(AWUoPw0GOwjb2LwwGgrma56iAn9z1MftwuttSvIu)cR0zGyOO2z8A8GbPW6VdEUsFoqxgeAx4UWQCwRTzRJVRORQ9bKO7pzulCmfvSIHtJHEQ88oJXolgpwzuvjyHnplIzNeOIJzRUVEeq3RF7Qsl2fUrkIj6gurto(tIU2xvx6VtzJc3I6tCGu6NeItAJLSYeBfn3tZNOkD8iiUB7sr3VLEDOxFDJBIv5C(QieZqVRjgJPSypBgd(pnQBKVMbySErPPq9e9tvH9HOWDr4rQsd4WRwM7hQIHZrLYMm6LJvhiiIlzsef13I06SiGbaYpeQxcr5jftSf8KYyFSPpq8Q56zRvZA5F6zIOo5lkAPFo73yl8pcskZRyfdMvfOMRIwJMYOz1DT5YQOBFG17Mh7PMV(Sk0ANIo5mH9np9k6KZg0adlwJzDqJAkTbQ175Q6a0QokfTOK88C0RUluP0fLUF0qWw50SmErwloRf)OTGV(Z0SDoWr(C8KhVtDjM7TQNF)Pd2xsKm5qSoO3X4qsRPsnG9j35pBMJpk6yFn6dSbfySlmzwq8DSGkMbI)jPxaXmAslvHXWOQnCWPleTg4VlrD9nx1BHkt0Nd)NqMQMghXHgdQwk1hEsy(KqHxgzhq8aHRqEZfGoif)fiwVs9JHeb555x6yxuDjKjozi7oL(Q))d]] ) diff --git a/TheWarWithin/RogueOutlaw.lua b/TheWarWithin/RogueOutlaw.lua index 11e4f6fcb..811235eeb 100644 --- a/TheWarWithin/RogueOutlaw.lua +++ b/TheWarWithin/RogueOutlaw.lua @@ -1396,7 +1396,7 @@ spec:RegisterOptions( { damage = true, damageExpiration = 6, - potion = "phantom_fire", + potion = "tempered_potion", package = "Outlaw", } ) @@ -1422,22 +1422,21 @@ spec:RegisterSetting( "allow_shadowmeld", false, { end, } ) +spec:RegisterSetting( "solo_vanish", true, { + name = strformat( "Allow %s When Solo", Hekili:GetSpellLinkWithTexture( 1856 ) ), -- Vanish + desc = strformat( "If enabled, %s can be recommended even when you are alone, |cFFFF0000which may reset combat|r.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + type = "toggle", + width = "full" +} ) + spec:RegisterSetting( "vanish_charges_reserved", 0, { name = strformat( "Reserve %s Charges", Hekili:GetSpellLinkWithTexture( 1856 ) ), - desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this many (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), type = "range", min = 0, max = 2, step = 0.1, - width = "full" -} ) - -spec:RegisterSetting( "solo_vanish", true, { - name = strformat( "%s: Solo", Hekili:GetSpellLinkWithTexture( 1856 ) ), - desc = strformat( "If unchecked, %s will not be recommended if you are playing alone, to avoid resetting combat.", - Hekili:GetSpellLinkWithTexture( 1856 ) ), - type = "toggle", - width = "full" + width = 1.5 } ) spec:RegisterSetting( "sinister_clash", -0.5, { diff --git a/TheWarWithin/RogueSubtlety.lua b/TheWarWithin/RogueSubtlety.lua index c3d2193a6..e792ac529 100644 --- a/TheWarWithin/RogueSubtlety.lua +++ b/TheWarWithin/RogueSubtlety.lua @@ -1502,7 +1502,7 @@ spec:RegisterOptions( { damage = true, damageExpiration = 6, - potion = "phantom_fire", + potion = "tempered_potion", package = "Subtlety", } ) @@ -1516,25 +1516,34 @@ spec:RegisterSetting( "priority_rotation", false, { width = "full" }) ---[[ -spec:RegisterStateExpr( "priority_rotation", function () - local prio = settings.priority_rotation - if prio == nil then return true end - return prio -end ) ---]] +spec:RegisterSetting( "allow_shadowmeld", nil, { + name = "Allow |T132089:0|t Shadowmeld", + desc = "If checked, |T132089:0|t Shadowmeld can be recommended for Night Elves when its conditions are met. Your stealth-based abilities can be used in Shadowmeld, even if your action bar does not change. " .. + "Shadowmeld can only be recommended in boss fights or when you are in a group (to avoid resetting combat).", + type = "toggle", + width = "full", + get = function () return not Hekili.DB.profile.specs[ 261 ].abilities.shadowmeld.disabled end, + set = function ( _, val ) + Hekili.DB.profile.specs[ 261 ].abilities.shadowmeld.disabled = not val + end, +} ) -spec:RegisterSetting( "mfd_points", 3, { - name = "|T236340:0|t Marked for Death Combo Points", - desc = "The addon will only recommend |T236364:0|t Marked for Death when you have the specified number of combo points or fewer.", - type = "range", - min = 0, - max = 5, - step = 1, +spec:RegisterSetting( "solo_vanish", true, { + name = strformat( "Allow %s When Solo", Hekili:GetSpellLinkWithTexture( 1856 ) ), -- Vanish + desc = strformat( "If enabled, %s can be recommended even when you are alone, |cFFFF0000which may reset combat|r.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + type = "toggle", width = "full" } ) - +spec:RegisterSetting( "vanish_charges_reserved", 0, { + name = strformat( "Reserve %s Charges", Hekili:GetSpellLinkWithTexture( 1856 ) ), + desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this many (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + type = "range", + min = 0, + max = 2, + step = 0.1, + width = 1.5 +} ) spec:RegisterSetting( "rupture_duration", 12, { name = strformat( "%s Duration", Hekili:GetSpellLinkWithTexture( 1943 ) ), @@ -1545,37 +1554,26 @@ spec:RegisterSetting( "rupture_duration", 12, { min = 0, max = 18, step = 0.1, - width = "full", + width = 1.5, } ) -spec:RegisterSetting( "vanish_charges_reserved", 0, { - name = strformat( "Reserve %s Charges", Hekili:GetSpellLinkWithTexture( 1856 ) ), - desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), +--[[ +spec:RegisterStateExpr( "priority_rotation", function () + local prio = settings.priority_rotation + if prio == nil then return true end + return prio +end ) + + +spec:RegisterSetting( "mfd_points", 3, { + name = "|T236340:0|t Marked for Death Combo Points", + desc = "The addon will only recommend |T236364:0|t Marked for Death when you have the specified number of combo points or fewer.", type = "range", min = 0, - max = 2, - step = 0.1, - width = "full" -} ) - -spec:RegisterSetting( "solo_vanish", true, { - name = "Allow |T132331:0|t Vanish when Solo", - desc = "If unchecked, the addon will not recommend |T132331:0|t Vanish when you are alone (to avoid resetting combat).", - type = "toggle", + max = 5, + step = 1, width = "full" } ) - -spec:RegisterSetting( "allow_shadowmeld", nil, { - name = "Allow |T132089:0|t Shadowmeld", - desc = "If checked, |T132089:0|t Shadowmeld can be recommended for Night Elves when its conditions are met. Your stealth-based abilities can be used in Shadowmeld, even if your action bar does not change. " .. - "Shadowmeld can only be recommended in boss fights or when you are in a group (to avoid resetting combat).", - type = "toggle", - width = "full", - get = function () return not Hekili.DB.profile.specs[ 261 ].abilities.shadowmeld.disabled end, - set = function ( _, val ) - Hekili.DB.profile.specs[ 261 ].abilities.shadowmeld.disabled = not val - end, -} ) - +--]] spec:RegisterPack( "Subtlety", 20241101, [[Hekili:nZ16tUTTr8)wUXZqFY2NQECVsQ19HK02jEAZ0jYt73efefKe7rrYqa6lQZn6V9Ul4laWfKsNpNPF5IfjWID)Hf7lSmlgV4ZlMVMj5l(LjJMC94XJgpC80j3n97wmxEiLVyEkl4r2w4FeZ2d)DE(kzexEaFXHOe2AKaIK8Sa4LlMVkpms(ZXlwrt17HXMYdGhF74fZ3fUEnVySCrWI54yVA8ORgD73FC58W9)4XL5PizeFa(D8pDCzsU8QKnxfKSFftc)mo6WXLHBoUmJVjJl2XwfX)Zhx(34SSRyx9RS4TQ5a)bgJqYzrYDh)0XpPwPrF3vtMaR0FzZMWGqECWH61tFmJMcRo8Fhp2MRAg19xn(gyukY5yi3D1K7H3(5D8Jl)3Sm4pHYDHXlMhfkKcefrSdHZFrTPWJrHz9IFyXCwGmmbgjiFRtEsiZcFea7GdbrCFjlBlhMpmP5bzHsEwidXZv5B2mCty8A)N4ShJ5cXWm(EwyS44Ypody1Jl9oUeP8x4(8y((qGzxw)cjlIhlhMhl48y)vrS18HLC0XLp)8XLxaIOGV2FtsM)Agmm10UOEMPWQXxhkziRxn1In6SW0c55hHTXKJl)NjHXWw0pGIppBHe0oSaGgbRK6R5m5ob8Jh5zc)9SShB4Uc2qj)MmrEkPm)ai0xQK73FC50JlFx5KlqBu4c4Q5oOqYvVeGEwMVCh3)PqjIUCrf9RwCXbq6Ie(jB8vSR691eyte7PiyEiaUVlwBAfr)cdqaqehwQhRRxKJQeX(cjqmeaN6eavlEuy8w4NXBbPlRq5OI5onaoijjcaN4kqsPGOPHPyCAvShk0X0wlALmVUGrh09AcmbGKyGhru5AevOpm1GvW4UXj6HgEs8trfwbGrODdzP02q5Tjio8KWFfmnKE3QVUBJsaIGYQ1QEN(OwbwDb4FL5yK4bOnS8izTzIAXPsPWGMt0hYJHbpA9EB9KKuGsCzZCQu6W)vuoVu)P1rJA16s2W8HFHfhkWNPONFHJKkgUAF5vIlQp9ffgW9zG9V1H2mjQ0Zfs)4WT7K1VIsH6ElRAz8uGUG5e4OtPcKHgBhA0gY(JHP(z5PY8moLcx)aayWADcWpf0yOe2AdrNDOG0yOqBzuMV8Cbo6mhEewcmdGQ1kVNfV5EZ5snlhGbWT8OOctZnUMGdXJmnXqpWhaRiJ0XCLXb)uoeisQUphqWnGEEqgxwFE7SeSlBSDxZr(QNuAtQt)gnArMgnpnlEkL3eHqnSnOIRVoOnzKUqMXcczr(IdXbOKE)zlP625kIxyCNNFu7x6tbp8CxXu4B2WloA1Ei3EwNA2T2piffOVZsGSIQOqXr0iFbSOi)IF4JHBve0vjzdwlqAoEKJOUwbgSH4CYZoyTq)QcLf6(hQp6zTdm2oKUEMsZIdUF5z4zBfzChyefzCQt2q)nHzCLaQiV7Wg6MlrYcEsHNJiTIu220nqUFwY3dAax(zigKhHOxhuLDHmJZc2XZsYf(a9If7dLahy6cUBdinHx484cQoFtd37ArrXW2YC1Cc3dwAq9AFMiGhJa7bFyNkF)I5qCXWz3n(BdwRclVq06AgAbUtzu3Rd7okU02gDfxUNT2)3YHdvyiCXQeY0wRl1TjresixpE)(IBK)B5HPP81dDGMv(Fkw0(hnsZ6TAhJQL3GbN2gFLFUwGdIL2UfA0su6QJTqW6dgLVxDYWxeLivztnUsO1pgwA4VxZ6ZmKQ(xSjAiC5igkNmSggbuC9bZCuAXqNsW91SvJNTU4m40n(peAyic02ELSa6jNhqp5psGEmfqp())a6jkG(08wcOscCUBUDYLT9D2STqMvQMR1YN5x6IDITlwdo5VgIzjOm49R5qQXNml4oMKEc94CcObMrqkyO439fPG1BdXCJIZvsOTF(tOEhNwukffhcxc7yaSaXOiEgwUSuWtHOOinfLi7qsoidSy1ZoUmorwa28ibF4jd2DUFVju59hMtAgVOiDTsuLLMgDaHvb(R2zREwXPkt2Uf4Ln5XX8ilOy(tmyJucaEAwycidWjYSKIAbvGisSwCv0eEeaxeHDwnB)Qj)YsC2WXHMrJDmHpKPVCil(G)6ubTn82JsvafcBpRZZkfrulNYnqZimYmQLbLxwQ5tiLtkjGYeApYjPu8qFar)I55NaURTZqHROv6Ljo)mTDH1FfmXD9wujzTbpIsvtKXqzg3nev9BFjpyxCieag1j)QXwvJeZt2)JMkuCCzHBdZCeUWzrqQ15Cw9eTBsOkM1IASddBp3xM4VoeEZv4iB8tFlLrHwsXjYH6VSL1hNCutDSFNTZRcXWqY8Cuz2fTVxbcZan5gZcEewMNuoYm2K(jiZYaWn3pX2dzT0)(eTGw)69675UyEJqUiRWURWfOmce066uy)xiLf90N5FjesMlJruNxTxzF8bdhQJR5jamG5xKuUZkBqKpS95QUlkfzfBU1eZBQvM76oOOUIzJYfY(d1(4YPJmVgK2P0wJePjU83AKAaDvZmcVFA3At9wzp3OSUODVDL(mQrr78PnwUuEMiuuh(zV3axFfiDwbuFfMZRYMWfNqTsF5IAh1FT)SVqoCGMlcR9sktqeEAS3vBuKvvoS7tdUUZqnUsplTUny0EvmsQZybHWWfs0IlNzSCApNk6GaYlLQyF)M(r8jAfatxbQWcLEIB9EH0fsOD03QxHM)H3b5J8Vu3beMyI6f75q2mKrl0Sv5CF9u0qrr8AJZ2UnqyNoi5Xs7rFkA1J622j48kB7HYRUCKHsHiFfmOn5B59Ll7hnV8XI7ARBtMeR7jDXMIMTUYWaH096q9GLbPBIbOKLbwiSuq(8omFlm5rmH0CiRZdiBellWpT6s8uOChKVkhY0lqwe9s4(uggCHCh2gibmiJwyGBJswXIA0peTfAtzdn78EmPp1RY4B5X17ywcrAoKMSv(Qt1hxeU)l8)p5R3UxjTgd14QNxX2IAHq83bpkSJoaM5xqvoyGfnpZOj3UaYLnlgcrvG4wH8NKjllzZBlVt43IH49B5qCxGrxrYEyCSCzYEiee4bb7yXB5IHh)0FpmgE11FpcYXWAPE9BDFdNVTil6ogrLTEyKxo(3h03AO7tZI4uU7SP6T0u12bKfLD5FYM63rtDdJ)wKM8(8SP79FtWIXoaJ2vQ3I4UR3F)lrvIMoQkVwzqvgdRw5tTC(VTzPBTzuU02f1Uw4Cv17wc1RhLBOzRT4Y5yxz4w0KyaMC7RhLhIDKgHnK6c2DEwrM6KXSRKdbRrmedX2fXBxmjIDPxkXjQGuxOQ2y(Ms(EjmrPX6s39C57xk5D7l41CZ0fXFvudDZ5Vmi5Bm57LWVuvWtKVFPKVMW34KWURRjXk05G7oGI6DGZyb7zWLliPTxilRVsRUTR2WBnD3tviIEp6)QeHIdQ(kfT23kQtUpPUdUZBNA83em1bvnkDHfzj7hBB6oPd00OzGPWtYUf(C2V(MUcVye)4N(zLsasS7kQ7mwBAvx7dVgVFWeiryEv6DIH1Hs9(z)j9B784NEZXLFn3k5XprTevd9d4T6mRvz0)G6UIMzCtPNcHknS1C7qLeA8hc3mZT)vVlVWTN9NFUdNepmRdpFd(Ay5j6SCBUsJLBlpnSmbx9qhIZxfhBbYU9S81SiwWY5UiAFon1dq)XnpcB8C9FBYELtOKPOQp7Zpx806ElV8b19vEhex7U16CfUO4X2ngD5kzFDrp)S59p9WS79Uq6S(iEewACZZAL7SKLVK42kF(zYlqCGhTG0bePkIANGZL1A3u31WhVEKxNd4HjJ8C45DGB(sRttRGbN3rJhfFpa2vPQqJhD5GvB2jcHNrLC)4KrDaDQIvxYD6Lq9JZg7qZXtFypm7UNFMUWUpm7wATM3GU3kaBHoNz33ofCieAPAkL9QS(eA6Rz0oqTYKE)dRp66gr(ugDDBf7AWKBy6uWSLIDVMV5nv(KXzfg)LKhHtL)oy1kggdUkL(ftEIN5hgVjhlTkspAoaixRUtwNVWM7negqLPvsdMi57(iZSjKkBZgFJTiToX3XQ4lzIhDjjUjVlzXDdk)bToAUW1eH9ip3xGQZLSDl4Ie)YlCwJYYdvK9HmCsQNUkEa4PVVX04V)ulVjyDBW5G2IpOAsZkpVk88YAL7woRNn27s9n46wiLEnvmtxKBIreAMvh07cYvQX6ozJQIaaAR19IsEcYchM0hom51fhgBe23Fy4GLbCJMUTFZ5A3llcxnlvDuxVPQtBAAK2(jBr)CPOiTtlN(OofVCZ0BC2s5NOry7Nnv5FxkIVS2CT)1aVtthq7jW6dvSigfCrGFs8Rl9dgDuvPb0o(aTbLxpZWlHhqelaOQz(jyxhcQrY(umN(3lSklaxzzxEsWUPi8Sd)9YjVF67CeeM6X0FW0vh0iJfR0FIrtC1AHN6rSt5uGl)yGRDA6WrIB4OhlaZMAV19a6PNyZZzqOTM)1DRD1(TgF)XfHI0(Y9bwLyM1FBYTFx1xKClty1JemkHhRsQ6EnJOGi6onYya9Sdc2QB0SxUIweREdvVt0iDmmDuJML7ivkjU92JYff9gx9z3PEu9TIxh5U4gJQi69nzYOtbkjPPlYOnz0DIAZMo6QX38UlCKT25XQTY1ZvusdAH76hUmI9xhsT6ziA1jA7x2lOwVwrhqDTl(scA20w2KthBTpa(WSBCeXYnLhT(JOZyA4y0HhMVLrV6GmTzdZ8aSp9E9gLXffunktRxA1DmTEVrlXOvqPHfHMG6ewACgQfv2ga0JS5WjOxvrHm91Rvjfi(qYYUO1g1d8A3i2xvPQCBhlkreboyIMh3QYUelo6i(D6ABd80y32UMuiMRo1MG)173BtMUn3rEMTfhuEEQLFE6arjyPGK8uWgS)2mwaxp0QYM1MyknTMD5jUtOzfBiJwm4nMQuwjmvjlmkrIc9BgD2KR962tttW3D1UIWOCz2DKlrQOSQnMaGqqgvfOMEBj6iRGpQhzbfyHWPf1DeHYI5SC5UKSfZX)NQKQ54w8)c]] ) From 37794e52eb36365d28853fe39b85539892ba8533 Mon Sep 17 00:00:00 2001 From: syrifgit <139663837+syrifgit@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:14:40 -0300 Subject: [PATCH 2/7] final tweak --- TheWarWithin/RogueAssassination.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/TheWarWithin/RogueAssassination.lua b/TheWarWithin/RogueAssassination.lua index c226f6b45..5e56b1a02 100644 --- a/TheWarWithin/RogueAssassination.lua +++ b/TheWarWithin/RogueAssassination.lua @@ -2110,9 +2110,9 @@ spec:RegisterAbilities( { local fanCP = buff.clear_the_witnesses.up and 2 or 1 -- Predict crit gains - if talent.seal_fate.enabled and settings.fok_critical_cp_prediction ~= "do_not_predict" then + if talent.seal_fate.enabled and settings.fan_knives_critical_prediction ~= "do_not_predict" then -- calculate the crit chance of Fan of Knives then estimate - fanCP = fanCP + max(0, floor( true_active_enemies * ( 0.01 * ( crit_pct_current + ( talent.deadly_precision.enabled and 5 or 0 ) + ( talent.thrown_precision.enabled and 5 or 0 ) + ( buff.momentum_of_despair.up and 10 or 0 ) + ( buff.master_assassin_any.up and 20 or 0 ) ) ) ) - ( settings.fok_critical_cp_prediction == "predict_conservatively" and 1 or 0 ) ) + fanCP = fanCP + max(0, floor( true_active_enemies * ( 0.01 * ( crit_pct_current + ( talent.deadly_precision.enabled and 5 or 0 ) + ( talent.thrown_precision.enabled and 5 or 0 ) + ( buff.momentum_of_despair.up and 10 or 0 ) + ( buff.master_assassin_any.up and 20 or 0 ) ) ) ) - ( settings.fan_knives_critical_prediction == "predict_conservatively" and 1 or 0 ) ) end @@ -2175,8 +2175,10 @@ spec:RegisterAbilities( { cycle = "garrote", usable = function () - if settings.max_garrote_spread > 0 and buff.indiscriminate_carnage_any.up then - return ( active_dot.garrote < settings.max_garrote_spread ), strformat( "active Garrote DoTs higher than or equal to the user specified maximum of (%d)", settings.max_garrote_spread ) end + if debuff.garrote.refreshable then return true end + if settings.max_garrote_spread > 0 and buff.indiscriminate_carnage_any.up then + return ( active_dot.garrote < settings.max_garrote_spread ), strformat( "active Garrote DoTs higher than or equal to the user specified maximum of (%d)", settings.max_garrote_spread ) + end return true end, @@ -2914,7 +2916,7 @@ spec:RegisterStateExpr( "envenom_at_5cp", function () return settings.envenom_pool_5_points and 1 or 0 end )--]] -spec:RegisterSetting( "fok_critical_cp_prediction", "predict", { +spec:RegisterSetting( "fan_knives_critical_prediction", "predict", { name = strformat( "%s Critical Combo Point Prediction", Hekili:GetSpellLinkWithTexture( 51723 ) ), -- Fan of Knives desc = strformat( "%sThis setting controls how %s predicts critical strikes for combo point generation.%s " .. "|n|n%sThis option only works if the %s talent is selected.%s\n\n" .. From f18b0b47c1f5a3cb0879b1300c9aa036e5b547b2 Mon Sep 17 00:00:00 2001 From: syrifgit <139663837+syrifgit@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:19:51 -0300 Subject: [PATCH 3/7] Sub shadowmeld spell link --- TheWarWithin/RogueSubtlety.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/TheWarWithin/RogueSubtlety.lua b/TheWarWithin/RogueSubtlety.lua index e792ac529..a4d3e1df5 100644 --- a/TheWarWithin/RogueSubtlety.lua +++ b/TheWarWithin/RogueSubtlety.lua @@ -1517,9 +1517,11 @@ spec:RegisterSetting( "priority_rotation", false, { }) spec:RegisterSetting( "allow_shadowmeld", nil, { - name = "Allow |T132089:0|t Shadowmeld", - desc = "If checked, |T132089:0|t Shadowmeld can be recommended for Night Elves when its conditions are met. Your stealth-based abilities can be used in Shadowmeld, even if your action bar does not change. " .. - "Shadowmeld can only be recommended in boss fights or when you are in a group (to avoid resetting combat).", + name = strformat( "Allow %s", Hekili:GetSpellLinkWithTexture( 58984 ) ), -- Shadowmeld + desc = strformat( "If checked, %s can be recommended for Night Elves when its conditions are met. Your stealth-based abilities can be used in Shadowmeld, even if your action bar does not change. " .. + "%s can only be recommended in boss fights or when you are in a group (to avoid resetting combat).", + Hekili:GetSpellLinkWithTexture( 58984 ), Hekili:GetSpellLinkWithTexture( 58984 ) + ), type = "toggle", width = "full", get = function () return not Hekili.DB.profile.specs[ 261 ].abilities.shadowmeld.disabled end, From a3f3158a87e8ee3a8d000bfca4a4356320c96590 Mon Sep 17 00:00:00 2001 From: syrifgit <139663837+syrifgit@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:25:18 -0300 Subject: [PATCH 4/7] Emphasis for prediction option --- TheWarWithin/RogueAssassination.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TheWarWithin/RogueAssassination.lua b/TheWarWithin/RogueAssassination.lua index 5e56b1a02..178e71079 100644 --- a/TheWarWithin/RogueAssassination.lua +++ b/TheWarWithin/RogueAssassination.lua @@ -2920,9 +2920,9 @@ spec:RegisterSetting( "fan_knives_critical_prediction", "predict", { name = strformat( "%s Critical Combo Point Prediction", Hekili:GetSpellLinkWithTexture( 51723 ) ), -- Fan of Knives desc = strformat( "%sThis setting controls how %s predicts critical strikes for combo point generation.%s " .. "|n|n%sThis option only works if the %s talent is selected.%s\n\n" .. - "• Predict: Assumes a certain number of critical hits will occur based on your current critical strike chance and number of nearby enemies.\n" .. - "• Predict Conservatively: The predicted number of combo points is reduced by 1 in order to prevent more jarring rotation changes from unlucky critical strikes.\n" .. - "• Do Not Predict: Disables critical prediction, using only guaranteed combo points from casting %s.", + "|cFF00FF00• Predict:|r Assumes a certain number of critical hits will occur based on your current critical strike chance and number of nearby enemies.\n\n" .. + "|cFF00FF00• Predict Conservatively:|r The predicted number of combo points is reduced by 1 in order to prevent more jarring rotation changes from unlucky critical strikes.\n\n" .. + "|cFF00FF00• Do Not Predict:|r Disables critical prediction, using only guaranteed combo points from casting %s.", "|cFFFFD100", Hekili:GetSpellLinkWithTexture( 51723 ), "|r", "|cFFFF0000", Hekili:GetSpellLinkWithTexture( 14190 ), "|r", Hekili:GetSpellLinkWithTexture( 51723 ) From 61869ed82fe3ba78948228075cfe3bc83f80d87b Mon Sep 17 00:00:00 2001 From: syrifgit <139663837+syrifgit@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:32:27 -0300 Subject: [PATCH 5/7] pack strings with commentary this time! --- TheWarWithin/Priorities/RogueAssassination.simc | 2 +- TheWarWithin/RogueAssassination.lua | 2 +- TheWarWithin/RogueSubtlety.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TheWarWithin/Priorities/RogueAssassination.simc b/TheWarWithin/Priorities/RogueAssassination.simc index 0c8802bca..e112527d8 100644 --- a/TheWarWithin/Priorities/RogueAssassination.simc +++ b/TheWarWithin/Priorities/RogueAssassination.simc @@ -7,7 +7,7 @@ actions.precombat+=/variable,name=trinket_sync_slot,value=2,if=trinket.2.has_sta actions.precombat+=/variable,name=effective_spend_cp,value=cp_max_spend-2 Date: Sat, 2 Nov 2024 02:34:26 -0300 Subject: [PATCH 6/7] accidental revert --- TheWarWithin/RogueAssassination.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TheWarWithin/RogueAssassination.lua b/TheWarWithin/RogueAssassination.lua index 8f139db02..dc3160398 100644 --- a/TheWarWithin/RogueAssassination.lua +++ b/TheWarWithin/RogueAssassination.lua @@ -2110,9 +2110,9 @@ spec:RegisterAbilities( { local fanCP = buff.clear_the_witnesses.up and 2 or 1 -- Predict crit gains - if talent.seal_fate.enabled and settings.fan_knives_critical_prediction ~= "do_not_predict" then + if talent.seal_fate.enabled and settings.fok_critical_cp_prediction ~= "do_not_predict" then -- calculate the crit chance of Fan of Knives then estimate - fanCP = fanCP + max(0, floor( true_active_enemies * ( 0.01 * ( crit_pct_current + ( talent.deadly_precision.enabled and 5 or 0 ) + ( talent.thrown_precision.enabled and 5 or 0 ) + ( buff.momentum_of_despair.up and 10 or 0 ) + ( buff.master_assassin_any.up and 20 or 0 ) ) ) ) - ( settings.fan_knives_critical_prediction == "predict_conservatively" and 1 or 0 ) ) + fanCP = fanCP + max(0, floor( true_active_enemies * ( 0.01 * ( crit_pct_current + ( talent.deadly_precision.enabled and 5 or 0 ) + ( talent.thrown_precision.enabled and 5 or 0 ) + ( buff.momentum_of_despair.up and 10 or 0 ) + ( buff.master_assassin_any.up and 20 or 0 ) ) ) ) - ( settings.fok_critical_cp_prediction == "predict_conservatively" and 1 or 0 ) ) end @@ -2916,7 +2916,7 @@ spec:RegisterStateExpr( "envenom_at_5cp", function () return settings.envenom_pool_5_points and 1 or 0 end )--]] -spec:RegisterSetting( "fan_knives_critical_prediction", "predict", { +spec:RegisterSetting( "fok_critical_cp_prediction", "predict", { name = strformat( "%s Critical Combo Point Prediction", Hekili:GetSpellLinkWithTexture( 51723 ) ), -- Fan of Knives desc = strformat( "%sThis setting controls how %s predicts critical strikes for combo point generation.%s " .. "|n|n%sThis option only works if the %s talent is selected.%s\n\n" .. From 9c250304e7ab2f259b9f8dfa844622264b4b882e Mon Sep 17 00:00:00 2001 From: syrifgit <139663837+syrifgit@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:05:11 -0300 Subject: [PATCH 7/7] review notes --- TheWarWithin/RogueAssassination.lua | 21 +++++++++++---------- TheWarWithin/RogueOutlaw.lua | 2 +- TheWarWithin/RogueSubtlety.lua | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/TheWarWithin/RogueAssassination.lua b/TheWarWithin/RogueAssassination.lua index dc3160398..b6e343f31 100644 --- a/TheWarWithin/RogueAssassination.lua +++ b/TheWarWithin/RogueAssassination.lua @@ -2175,9 +2175,8 @@ spec:RegisterAbilities( { cycle = "garrote", usable = function () - if debuff.garrote.refreshable then return true end - if settings.max_garrote_spread > 0 and buff.indiscriminate_carnage_any.up then - return ( active_dot.garrote < settings.max_garrote_spread ), strformat( "active Garrote DoTs higher than or equal to the user specified maximum of (%d)", settings.max_garrote_spread ) + if not debuff.garrote.refreshable and settings.max_garrote_spread > 0 and buff.indiscriminate_carnage_any.up then + return ( active_dot.garrote < settings.max_garrote_spread ), strformat( "Active Garrotes [%d] >= Max Garrote Setting [%d]", active_dot.garrote, settings.max_garrote_spread ) end return true end, @@ -2937,7 +2936,7 @@ spec:RegisterSetting( "fok_critical_cp_prediction", "predict", { } ) spec:RegisterSetting( "envenom_pool_pct", 0, { - name = strformat( "Minimum Energy %% to Cast %s", Hekili:GetSpellLinkWithTexture( 32645 ) ), + name = strformat( "Minimum Energy %% for %s", Hekili:GetSpellLinkWithTexture( 32645 ) ), desc = strformat( "If set above 0, %s will ONLY be used when you have at least this percentage of your Energy.", Hekili:GetSpellLinkWithTexture( 32645 ) ), type = "range", min = 0, @@ -2946,7 +2945,12 @@ spec:RegisterSetting( "envenom_pool_pct", 0, { width = 1.5 } ) -spec:RegisterSetting( "dot_threshold", 7, { +spec:RegisterStateExpr( "envenom_pool_deficit", function () + return energy.max * ( ( 100 - ( settings.envenom_pool_pct or 100 ) ) / 100 ) +end ) + +-- Not currently used, but could be investigated as per review comments on PR #4133 +--[[spec:RegisterSetting( "dot_threshold", 7, { name = "Remaining Time |cff4ec9b0DoT|r Threshold", desc = "If set above 0, the |cff4ec9b0DoT|r priority will not be used if your enemy or enemies will not survive longer than the specified time.", type = "range", @@ -2954,7 +2958,7 @@ spec:RegisterSetting( "dot_threshold", 7, { max = 10, step = 0.1, width = 1.5 -} ) +} )--]] --[[spec:RegisterSetting( "mfd_points", 3, { name = "|T236340:0|t |cff4ec9b0Marked for Death|r Combo Points", @@ -2968,7 +2972,7 @@ spec:RegisterSetting( "dot_threshold", 7, { spec:RegisterSetting( "vanish_charges_reserved", 0, { name = strformat( "Reserve %s Charges", Hekili:GetSpellLinkWithTexture( 1856 ) ), - desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this many (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this number of (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), type = "range", min = 0, max = 2, @@ -3011,8 +3015,5 @@ spec:RegisterSetting( "max_garrote_spread", 10, { width = "full" } ) -spec:RegisterStateExpr( "envenom_pool_deficit", function () - return energy.max * ( ( 100 - ( settings.envenom_pool_pct or 100 ) ) / 100 ) -end ) spec:RegisterPack( "Assassination", 20241102, [[Hekili:v3tAZTTrw(BrvQIH0wsMKsYhzfvkh7KzTN1jPI8o5BceceueRib4GdjRPuXF7771xO7gVUbinLZm5WsMOr3V7(D1nVA0vF(QlNfwgF1VoE44thnA44Jho(KrN(QRUS8H1XxD56WOBdVb(L0WvWF(2IIWIIK0WYKSu8PpSmlCgolfzv5rWiwuwUU4hEXlUjPCr11hhLT6ffjRQwYEJO8W5L4Fp6fxD51vjll)q6vxtccJFZvxgwvUil)QlVmz17Gzoz2Sy(WJlIU6sC4hnA0rdh)dBM(RzBMUklpEZ0OWIYK0B2m9Y03FWMPhb)Yd5jZ38XnFK)gdp6KrWB8tXLLX5BMwuTEDwE5MPZZG)wvrCEXMP3VaMVzW)NMbpjon86LWuxgMFtm83lUpC9A2Aqn7JFfm7FcGcC2LemaUYYZJJqQGXGhD4MP4ppdEjepbqynsoudA4BoA8RHh(lza9DZ01zzlzlndC)507ItZwbamqUZQay79H53gxa)YVMCZc4haSvpQKceRUp1yYpfM8pFFC4Tuto8wAJDKpOCesv)J47skaWCEYYLXAaO24gEgGY4pFT4NVX5K(6JgJp8TlxMDVN581CKqFo(V2mnpEz4xqMxC(npG)1BItXF8pRsYJxfNwwymdOu0ply0CjP3(B)S(igHRXVKatzre82bfHLv5mX6ntVlmpH9QAJF4BySw4L(FzGeq7NNJCbgCQg4R4cmFEbSI)ziGE)jWktaLRLjfLfmvRY4WLLlIr9SFLPYYfiND1pb6ircvrG1fKhlvdrvK8K18NDPCcaCIn8IRUe4WbPXFPeNr4pg7yAdxDDvXcR57TRxVeOOVpoSCrrz4YBz6mFcK84YBjGC3IqeFdbogqEYMp)QlH3hujscV6sqTCw81vZNF8m9PiyfmdhxTEZ0EOUg8MLudqaLSr1FZuesVloywg1G3mDciJTz6JpUzkFb5QhbPO2XXmDHPdqcWjoiaflsUZc9)u4TXODdugPmdr17GFdSpDhk9b4wvotj6Vd)zX1HPWdrIrikbNgUemfSio6wDcIazVv(cg4iIz1pPmj6w2S3trerq8yqKomjfwMZbHo2tzplMRRauvejp1bskgLfEQmBGijo7LHOHSsusfN8Am9YQRbmzEfUrrnwfpFEmN5a7cCDwW6SeuPB6ftQvyoUEqfRJtNfeTUfK2aTQXAyoprks4x4sjleLTCwW1lZYMX(CMyWz7gfssiAA2h)F4xUPE)J9fjIHdRylyqOy9ccbtssviHMbyaCvcA9zIuY4RJe9shKO8Q1Gbruc4HOLXbCKTaTVSpr4K0zjihyf6ecmlH5PG)jsuUpAGFoygCb3qoIiG1McyVEuy6ygOb4HCWhOTQSniKw1rDpXlRgqtZ(IrGcRcSVwuDGWmgsfGpDfqrYcMLaR(faF4mljP)G)61ssFWap3m9DCefzaVYbd4MW88SYwyamkKMPIXCSyn4IwzY6LjO075Cjf8Z7Z(VUr5nnglGg2QWbiLG4a1C7y82sU9CXf1)pcj(lKs8uSHJ0OeWahBXr(WQ15z3HYb)noKHoIW34dDo6p4IzCpV4uiTXwCicmrzvPL1(t5HL(AlwAn)sT5)XjcakqrP4KDxSok2StcuRgtCpa915ejNqx7gSYmpjcDk4co09CGAVz6ZuBYxSipRAgGzfWIKfXuUKBb2u8Ue(3lVlmnb8lHWHikpFaAn4EeUBpaM4)(pyVo68EAKK7yZVLSwMBoOPrtNMUe(zEyq4kKjF1LNEMlFX84DLalmHzjSH76oN9Bm47xazM5vlrNuNbYuw(tXypZHHCnaoZcwwfD7dGj2Kuj)7RXWB)gZpoZGbMKLfhd7EeDlFEotBNdRXUioCM9y963vRKMI15WCQXTKwov8lTOICP6zsefIJws5goJvpkhMd1hSCKwkUgJjsiykT)PzpvZQ4XUuY1hJXoFdO2P3ydE1kx)iDv5tBxvUpYfIxUuUvdW0tdYMhCBkicHYw)iFA856PvClnvQScuXLdAELxykqWEgH3XKqKgPLA47nPJ)ts0WpNJzHMVwDyVZrcn)8WKzbX3Hyw4mqFhD(fNQHT46OFMhee51m7gm2OTl20CjVe2oWjT8QZG(1ZM2wti4HGqQYzOnYcztQi2y42QH(C6BBiDeBXry0eJGpfmWcCqqbjKjpeIUMg)L1WUd4wYnIC9Vq549HjohYTNmK7SruwoZhvF5Fr58TbJ4DSejnlCfO)d(nEhIAOIeqrVozzsjZjSQcKqblF(d3VigFHpPc2(VP8PxrY96ALBxcfyQLGCxuUh7ZfgvuFwPirIaQaBQsxgxG5FuMGYurckrkW69vmI7BKVptk55cdH8usfcAVP3euGU3plpEzTW(Z4(1iFb3Hwcd8LAXTWJeLibvsbzXshfwvabycOCiM86gwS46b2Jsg5EPiBwesXzadOatnrTzfoOJ)2YQy9C2PSDzzh0iZunJi22ZCw6YIYGTkXpOGTKb8QmGRqG6rusFTdVEtPMvQXyFwDy(MRUnCPMrtiClYFih1zwKdZuHz82CM4p4G)VNhhLuWgAddTHIrfSwoideZbs0Hn8NWe0fSo03LImWd)4vRbHrfl0JFCoXZOWcwQVr0vLru6nTxIY83hJ)zatkZnQrWf03tXr(snEI(obV2ixo0VTAZeIPajFmVC0uNL6Sw0sforfpU5UEoydosvzdzLNuYPX2RuevHHxljepobsib9lk)xk00zukksNxMvhH((uHHWTcFEI5f(LovbkHrmyxOweIzuIwBG20v9Z)kWSVncO2j1YdH69vRwllHccJZ5(gaBSRtBUoRGNmq2JdmK1IwGg2kyBT(A(MDRGGWcIMv4VSz8FA69c8IGTsG0NvvyK7OFxmCnycfryziFjSRli)dZSiniUGw0XshE(ZLWC5RfBzcMxL)qd)9ZtyGQs8kpe)zbpvjxdBYu8qAeYu5B2i1Cl0rfhqJ9oB(FHAGnoVio312gDCsMNKhZWA)g8mKNDufnhXKz7utDUP3TPB328rZmziWNkkZb96iW6bxsgCtWv8hT7j0tH70wYF)3XlxJp(FildotSJvMtq6lSijIv7tiMuCu0o9b4xGCm(D(tIPwwFSd9I)0nt)m)XCdlJbpZ)m3fiUr57JLfWfCgS6MfwnmGrQ41DGsSNVPPwACyxJ94L(8RStf7zVgQO3AL1nmAKDrwu5HOA9TXXRXQMSSiJfsCbVpcWyiFB2pZLOqRRACO6sX5ZZ0ovxYDHf23NdJolHQ2R6LCwBbIx3rWzD(SKhMY7RHXgXgsoQZ1z1Tvfp(K1ot8mZIU1Hxbw8x90hfTRqODvQ1DsMd9aLrQXUAbwqKyBlj6kh11sI)vj35vIZFTU7gNE0BAHv0qj0teb05utzZq0unkFEUb5rHLihIfOaRrvwgIM(F3VJEbnNLnUq99IydmEgMDo0JCCVG0zltmRVMndyhnRAwu2jyMaJUnGNoWEDi(8t0SE4AEEMCpPTA2AJXoGXB55hWUgWQbbZPiFPaDBfPx3T7SczRu0R1m5oUoMK6byQt4j2HX2BlDPuK6DmzIpdHzElkUQ5Uc4vdqR4pOBURag8IlqUaixgeVc9poRA5vxc2DGpDEWnrZyBkXNFxJ2WP3T3BtusCKYl3wikEC)iCjiWaHCfSU6F9Vaf6RZ(ItmHAOewaDtrDTZEjZ2CCoe6d8IHPfRsWeE6cqCo8TcyCzCFv4SG)zvCCk2hvPSoA2Wtm3YVmTXHs7M7Om8jsSKao8yInb8nohD9huObt(ZGOpEiaIBRALlQOV3yRiKUYJY(t06RZys7kh2j4WrUF4BSiAVCgmuugcByuQmRyOuRiDsQgg6EqXsSt0N4Of(m7CpFa(q9qCBzPgR5UHyehxo(yf5dBaJhim3yi0EG7GL9QuWHv3Z9afICGFebcwf)Lc0aa7HJ0TGi(eGB(gNwzyJz82XMg)TJnnIInn6)4ztJ5ota(xfc(sr5oHPB9XfYM9cJRFnqDtyoS1hZ76DvlrNdzFGkzM8JLXQRdl1ttnFwO2j3S)atbzb06cpXcsIepOHq(jwOiz1kgvibhmFfkK5GdmCP5j0TabJAd32DzIhzIWJEeDssrh6P6Y03PE6plcN5p4NkI044z4hZASkrqbaL7Z)27)TFaiyfGNHSpb85TidMaiWc4nkqNQXTqhO7zKvOfuBG3os1VfpyFM)4E5UbpG3csJhArgyX29E)fL)D8KxD)cMLAmsIvHFjzvfE(nQd)7NeH)H91wbVw2rv55WZXS6Rv5qgqwNKnyUc4VeLlfTtE45S0eZ1AUoRW4ixxtsYFglAYdbYDzDKH3VGDeoQYf4jkRxLkQC)IKsEhUQtIAI5MXhB7ms74BFV(f5XSM707svdyJpRrPS4VQqDBDuDtWD6qwUkqF4QLlXajrMd2iK1524iE(tQh2DqWJOdPS1SOEGDXdDB5AHmRmTMflGigMXt)VWXdgxKJb6mP0SYaXz)IYZS25p7dMJoaLGwYKLOGWtR2HOTK9QV4rltwhipWheog0(I)QHmoTParry6nvG1xqDneyBMYed9itGM00HVQ1Gh4bltGWxce8sakhnCRbtzoTUqjcFM4hBb0eExwYSayttgqS9r87TiYSe8XJlICCGJngCUzbfzCBmJ2(wgrz1ux6RPVlIfHbxQpurfQf0O7KNTCMQhRMqPPHO4CUjBdd)nLr4VKdZionfmYD1)Qpzc5z3ufZNFFhxb85oZE0fy2JG5mpjQKfHNQkpGVub8)saEKi5hms5UlQJgj(sUYtG3Palqm(YUIR3)ll7mqCgS3wRMufg18yxS9iRSkG4R4k4zVtWSe8eiZEF3h4eHyLzAnpJzwG0ttTa3ZJWoiPmJ5aeBzyMoTE(6QLfX6lo6P9q9bYACLIG)VQz3GNtx7XosFSxhEdllzaPeDQrFKWlITgbZbFv4dkGbB8IaU)S2lWwB5Om7MBaLU5vPPXl11MwNNKbu2hcanaL7pBLl(YzQret68mTO(wewGE4vECy6dbZwxqhcFZrXk(drWJZufaafeOYcq9iuLHrByjfhJH7eNFnyoSi4Ay7dSCkwlh5OO9U5(fj4eiEzWIdg0O6q4YsSY)a5kfkUZODleKXKuykAhv03TqHjPFx0glOjb2bPRXQ5Ga7t(ANcmjAnpgdSjcyE2aHHD(pA5rbLRX2neumq4HyNJfvBHf6jUlhV0nAnrGos0SlgOc3WyH(984JIy1icm7GxWcHiG)E2VQNhbQeeuQmPsKCIgw)rhHvBGZkwIVZtMWwlqmFw)HhF6ZhE8jpJI8HUJD0WJhD2ZC7U2GJ4WUY33OScnMyNpUA0hc63Zib1bu)26GOX)vDgPrnt0QBseoXahCTST4kv38ehIzlfCDzgpPkHRGHp)bwadCt1YyTpuma2)NSkK3(xZWk9DiViTyYDGDmp(kZMRZHRz9mRQxN7og1q08BYi4MAuqSzJEC6Jf9bgL)b2v1MFqpC0tw(5qQYzP4fYQCkslT5LgYv2T3gj5YxBfPBfy3m(6OeRm6YrEDW2nhH2lSTmcAw1JX7HeJiYkIdeF6oz1SdT3VRAz0VTo)xtw0(XMHbif48r671jQy9P)4D8vemUYxsBIMeIQjEUDIUo2MMVOI0UQQmzPOMx2(iVLtL4QpHi7dYryKtYgL)jLNIW)UiJLO5VtEUSw7KhqCeSyTXzDdju4eSL3goCtenC0ukC0L(a4i9gZzvg6ZD1kCCagTomjN6WZvUih8nHQ3JLzUIjXTmg43yjSbVpsJlaesA)4G2tbgvYx2jAplL88ZUp3iCH4IQjLlnl3m5bj7biiSwnh)KRXuDZZXPS1)4jWxsZ3mvs0hiyZF2X2)ZIdNPI6a)ewko8YIuQ4eCyz61ACcCKpWXLsHl5O)cKviZCLLgOvY7zFiNJ9tGX9zfjZIFr9nqZXW2zYlURkSWRYxGF5lPkseXT0tpTZb5XDrXtMg5RLWHYIBJKJO33FTNs06CPYRPKsHYCLgqMZTg2c7wNpUncdtAEFz85WRp6tIv0qJ79mHES355oWHAiJvktK5QRjg4O061lyF1z9)684qobv5UJWnGbTG3Cx6DCIbAFx8AlAopzXo0yBuMoTlRI)mmruIrTZOlB7cR7PIp9wrWlI(U2(exvVZRs6c8s7R9C25TV7r0TTdj0yAitnA)hZUobGnugLPOTad5ladNAg8lgv1(mVEDrvDbpvqxjRrt5DngkAGDyYkrc5b9GFAIvbwPW9d1olU8ZC7Hc5fqBceWkz9djNxQ3J(I6cwa75umpbduNID5TFTma5)3IWBuhiqLhpIM48OiJgUtaGcy7DHPLW0i27UouYR6w2p5DLiH)5Y3w7yKzQoYspG1jKNvVtPZc3NGKWIQ87yotSmdft4NNaxDncbPtSLzZwXKLc2HDTMGTLXJ3PzE4TAXJlUa7ky38fUPOrn7PnXfqhRym6jNxCG)C7hE)MfO1WKrJB2Uxk3iLsbSFlTQYeE9TK2GjQxzhiWJ0UNFu6N(csOCbqrWDFJdT9KbR0dVbeKj9GN1NdfEUWTRJebronMXoMCQJ6MQ1eyjBdD4nuaZuj9qdq0OyK3HGItdmZrM28juCQHDnnVSDsQIPPdH6NNVx6iwaZe5XoAEV4p4h8Tx8BCBg4za044U1jtfQtoiL3Pgu26Twywr71w)r3T1xCPEq5CNHYdJM79wzID7x2JEKM3jtSroGQW8Ds5Qw3Q2JGK047skXMQbZxWmJqd25tL2GMndQIMQoYdnCOcZIJOzD43TTSiS5T3T2fPBrDCbcRx8BBS4C25XNFffp8eynVpmpfv)bhFrnWKvAxIWFVsQ47vx4SyxcLX6XOQYSv8oRbKXtbz8J38X)hwMUXRG23Lbqso7XFV8OYGKBJlPXVNVDV7bij1Wa7p6lduRWj0RGYqM1e3WLo75710Zh1f6M1u77oFREv28rcQlx7y7iToqClLvly0HB8DKOsFsRSwc)xvuDDLSk1U9A44Y5XE2p7jKg5yUFcOrUwP9dn6L)vm77foWREIGCsvuzFrSDkPUS)zFubTn)56OeAtcCm)wPf3A2DKu(wia4Uh7fKFNnn7WwrZBncRj291krhLw3JRGdz2DMM4y(2lqmPyG0rYTtuWHjSDgT3FZhjsk6lPTdhp9jtxNegzb)VDqydFBeDtH9bGrbHUoHm2SJ93eRMY34ykTpfinMsIbyaR7Vj2fNrC(o2oEJdtp6DgHLGdvpN0rdAM1NYAEPlEvRKr(lB1sWwtTJggUfjDvlVTDu0gBxOy02DYebRMyi(3lsjX36KtoKon5eDqLpPuTX8Ko9ToXeTgMplbBlCVRtFhMyYMmJyYDnUob)o64ncAFNwMg7dTpfnDn57fLk3q(UXGFIN(wN4DvHQJW9Uo9DyI)gjq2TLPJQxo8jCN3bLEVDwRbUDBe5aW(kdsZHNx83MOngSMFpn6qhxd7EGWAbC1IeDC2F6CrzVsBCSgF10g6CqSTHDTVJaN9fIgXeMyMwCRPnHoP56i7hy4joL4D5bp73BMY((cdEoEQdYMNuxx0IJv(e(8jVq)GpS5JuJqM(9dXIrmPrFhDiRW6tmoZdB(43Tz622G(Dz1fZsDBPlw9rhMmFI7Tt71)a3BK)4JE2t4IjE2OBqVdAXCS(Ct3z(Ffi9yDKUjEPH0nPi1agbEDHhcIgo7aL0NAh483H1pVSJD0FxirnRmKGgP36Xhn(8F8mQUMNbqDTZ)PbhzFK9XV77KQGwdWO3sou9OGIyetl4IWAxTu9oGv0n3xqBFKb2FD3ZbkKXafWVcmk)6Vnd0NC8(mGBv4P6ohqF1mfoSUbcesgKNETlgDgdk)2CLa4gKDFq9fqFFpfIxkItCvi8SXdU4hhpKHJ71Z4FBOs9j(xGaoVYcUyIQEVUPc6BW0TZ3UBau7GbijUK9dYJps2OMWhBuE8bp(yFR2rPh1jn)8jJGHwF9bCXK(No85NmKYa1rUoppWmGTsrpJ2O48jih2f6QFAMf47xd66EH0pIY6m92PlUNZMNJzXm)QHhvt6SYu2rJg650q5EXuh9AdlgxaCPZG)BNMsXr8wU5KCZ1g9c55VS3bKpfV6E2cjzLQKox)Xhpq95caQN6duiDpYdvthF36XOjeulTZpJ6AA6n5Rp(OxzA7(LryRr1DJ8dtnFtvR(98XhDFQ0F8rh9RZfDy1Him6WGeLcT9rkQJIbQegPFABUyu7ZcpMB9XzEUSXz18mEFXKrN9C6BrOMZc70BR)5whwB9hzC2SfUV8u0BZ1EObCKgkj09CRqF5azqS0frNBt0(8v0XLJO9DTwv1iE8rpMgMmw4a938E9TRyAd8ZsdSNNUT(IZ6r0L19S354aIERUxl9vn1ZjykmQ7(VTKTjE0QRSctYJI4dP3LHFZs)ZFbeftv3E)18DJyn4tAc7DcIfVsasJeXTNDpiqNKoVcZzcQ1t30RmLYVMoC2gpvlbUM991WZ9A2SZGTOHE8XP2jqFTVC3O8S(QfarLMxDBmBpbkHggkz6pKMQRE3VE(lh0qgUFDW12Dq5ftoBi3ytdoKdYHmWLNUMi2MkO1EUiD4aIUkUxFIgb(IjNcBb7o8f459iFTxsJ5kQir)c)SxoGhCFx6g4UjNi7HJUnAEZjYOpg9gCph(zmrivNTBDOAdGkt2cShQ1LSCFj63s7cFXWET0MWxG6MMI)EfQrz6dOZRzp6gawZfXMP4zGYhI9Z3QEAepHtAafuSzp3YqZtcnyGQxFTB3BmQUE6zXPPnTJKKJr8nY36VC8iHtXgMm352Es5oJd9p959fC0g9IZZoBWZRn4BLfgqZCqV(h4iid664O21V5bBxklSRF1JuttfUD309gYBKFzOH7bsoxwEV81ucf2ez(1JclWiDJWxmzSMdsKiBxfkEjdv2xFzEqHmsTsJtYk3S2oPLEGlX0oO)(0(fibf2l11jW(THd2)ahz4HRJLP9fgbQQ6Ke13D(gNmwPlt80Zr2I)SCJVUBgWzdaJi(So9QVgRt0gN(3fgIt2rnJYo1REfMFJt8vxx(j9lzdFA6wfhPJA5p(OYnrKyY(wXONxFppbe1B(opBC7VLBI7Glo1N)E1OnpznawBChmDO8EHcKO0VvOM8KFPqPLYPz1xxvcFu)38l6jcQQmz0QOvSL17Tf7EREOwwxvEd74AEc2JfCbwqrvjXtAPrDLoXiVB5T0KF0LgBD51IXT2w3Q0I6EqIaom9JQ((vqLfCcv5rh5WZqAYUnj1YXA77DOobKMxeqY2CG2XuQuw13T3Qk5ehxbtNpz8aAtCJ61evBGlY7jdJ9FAIseVj)kwP13diU7Rl0icGWW2AdyHdd9oOrJO0Zxnrbt0h13Dhk1ZrVfnqU3l5fxuVdOlkhnbIv68VL36qDH0QzDVXTr05EONG0Ddgaz2X5FOLUHM3lAS0Na2hpNyFJUIG6U(KaH5((QFh(OxBkwQYh42PqY7giH8Q(CYjc749XJpRl(82TBSvrPm25lWNTX2N02L5MRMFJEvpFS8W3yBb6V9I0QIU9EaUtg25JDKFxhz7ECtydXk83fLlK8BimI0(rko1Z8tRtR8ixPFVDaQ53gtnHgflIM022A447WR9(608BrlJsfqK)(tg27GTG)EIz1CKqXSSahOiOqvCBt8KCjT8zadlIzLaM5Lj3G3Bby4fW8hX6oviMUiylHe5VQ6uJUo(AHe52N5pSg9Fa(WY8kbokNvYh2ykIZbCVeP(HGVe3GI4jfS2)v1hjohH(Kru2e)SE3FbNT3LY6KgZ2BMXL6RHL32(wjZnSxCiRLELDI6iZ681O5vXG0jkERRI8HTtLNjBSrR9QOdSY21ZXgNK1o2JU84H0Z0Gb6DdtdyBqNjzJBJKnEFsYgz0yW)7gjJh5wlFJ7xtzLvJJLZe2MXYODT(s4NKyDYqc3OeXFV7Fj6tcD1Fz9ZuIPwuQ3s9TM)28wQVM83MxY8lAEMezJ(sPhLyqZ2FSBV2w4gYRLcg8Q6tv2gC5B4Vg(Hn7gfRkwse0cv88DzPuqEJfTbjHVLvDZauN0wdywdRz2MdZu1W)T58BHawRRZJ3PbmkBQbXY38IlW166pyStzeiRkkz0cjcgflcFNTNLfqkf3yTq29Xmnvgts09vwWkbXU3w5C7Rr7AKJ3D3xHzWdJjtMhilsGQpXA6XLhk2G24B7DkI)gmB0alNdk0eavsDYWHNv3qs7nPpxgLRbjEgK1SolK14r12MiwTE4bBpWT)5(y20zTHdxTbddN3YnSUWXfYq2mmI(E51sdMY0ja2lISnzkF2ZDxWbEcuuzkO(EfdtVQS1WWACUaRm0CG9Wo5aZNtVm15dXWJcZlRmWAOSODnEyV(cARkqhJhpzOiCbZehJc6de5egBPUcw9AXTXfhdngzhVA7iYXJOKxZtszIzSuHtICwI7AB)rBuQzpoD(i79fyaTkVhieVsLvBwT2WXxd21j1Ige1kjWU0Yc0iIbixhrRPpR2SyYIAAITsK6tSsNbIHIANXRXdgKcR)o45k9PaDzqODH7cRYzT2MTo(UIUQ2hqIUFWOw4ykQyfdNgd9u55DgJDwmESYOQsWcBEweZojqfhZwDF9iGUx)2vLwSlCJuet0nOIMC8dIU2xvx6FqzJc3I6p4aP0pjeN0glzLj2kAUNMprv64rqC32LIUFl96qV(6g3eRY58vriMHExtmgtzXE2mg8FAu3iFndWy)iEI(zQW(iu4Ue8inPbu4vhZ9dvrW5Ooztg98XQJdeXDljU9O(gKwNebm8p(Xq9sigpPqITyNuc79n9aIxlxpBSAwj)tpteZjFrr78Zz)gBH)fqozEfRuWSAa1Cv0AZugnRUNnxwfD7dSo38ypv81NnHw7t0jNjSU5PtrNC2GgyyXAmNdAutPfqTopxvfGw1qPOfLKNMJE19GkLMO05Jgc2kxMLrlYAWzTOhTf81FMMLZboYMJNS4DQlXCV188hpDW(sIKjhIvb9oghsAlvQbSp5o)vZC8rrh7RnFGTNaJDHjZcIVJfsXmq8pj9ciIrtAPkiggvTH7nDHO1a)DjQRV1QEduzI(C4)eYe104ao0yq1sP(WtcZNek8Y46aIhiCfYBTa09O4Var6vQFiKiipp9sh7IQlHmXj43UTacD1Vo(S3WUvPV6))d]] ) diff --git a/TheWarWithin/RogueOutlaw.lua b/TheWarWithin/RogueOutlaw.lua index 811235eeb..77b1b294d 100644 --- a/TheWarWithin/RogueOutlaw.lua +++ b/TheWarWithin/RogueOutlaw.lua @@ -1431,7 +1431,7 @@ spec:RegisterSetting( "solo_vanish", true, { spec:RegisterSetting( "vanish_charges_reserved", 0, { name = strformat( "Reserve %s Charges", Hekili:GetSpellLinkWithTexture( 1856 ) ), - desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this many (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this number of (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), type = "range", min = 0, max = 2, diff --git a/TheWarWithin/RogueSubtlety.lua b/TheWarWithin/RogueSubtlety.lua index adfbbd3bd..304bfe5e1 100644 --- a/TheWarWithin/RogueSubtlety.lua +++ b/TheWarWithin/RogueSubtlety.lua @@ -1539,7 +1539,7 @@ spec:RegisterSetting( "solo_vanish", true, { spec:RegisterSetting( "vanish_charges_reserved", 0, { name = strformat( "Reserve %s Charges", Hekili:GetSpellLinkWithTexture( 1856 ) ), - desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this many (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), + desc = strformat( "If set above zero, %s will not be recommended if it would leave you with fewer than this number of (fractional) charges.", Hekili:GetSpellLinkWithTexture( 1856 ) ), type = "range", min = 0, max = 2,