Reword some options.

Hekili · Dec 21, 2023 · b9c804d · b9c804d
1 parent a9c9df3
commit b9c804d
Showing 1 changed file with 68 additions and 51 deletions.
diff --git a/Dragonflight/RogueOutlaw.lua b/Dragonflight/RogueOutlaw.lua
@@ -931,7 +931,10 @@ spec:RegisterAbilities( {
         startsCombat = true,
         texture = 135610,
 
-        usable = function() return combo_points.current > 0, "requires combo points" end,
+        usable = function()
+            if talent.crackshot.enabled and not stealthed.all then return false, "userpref requires stealth" end
+            return combo_points.current > 0, "requires combo points"
+        end,
 
         handler = function ()
             if talent.alacrity.enabled and effective_combo_points > 4 then
@@ -1362,28 +1365,32 @@ spec:RegisterOptions( {
 } )
 
 
-spec:RegisterSetting( "mfd_points", 3, {
-    name = strformat( "%s: Combo Points", Hekili:GetSpellLinkWithTexture( spec.talents.marked_for_death[2] ) ),
-    desc = strformat( "%s will only be recommended if when you have the specified number of combo points or fewer.",
-        Hekili:GetSpellLinkWithTexture( spec.talents.marked_for_death[2] ) ),
-    type = "range",
-    min = 0,
-    max = 5,
-    step = 1,
-    width = "full"
-} )
-
+--[[ Retired 12/21/23:
 spec:RegisterSetting( "ambush_anyway", false, {
-    name = strformat( "%s Regardless of Talents", Hekili:GetSpellLinkWithTexture( 1752 ) ),
+    name = strformat( "%s: Regardless of Talents", Hekili:GetSpellLinkWithTexture( 1752 ) ),
     desc = strformat( "If checked, %s may be recommended even without %s talented.", Hekili:GetSpellLinkWithTexture( 1752 ),
         Hekili:GetSpellLinkWithTexture( spec.talents.hidden_opportunity[2] ) ),
     type = "toggle",
     width = "full",
+} ) ]]
+
+
+spec:RegisterSetting( "use_ld_opener", false, {
+    name = strformat( "%s: Use Before %s (Opener)", Hekili:GetSpellLinkWithTexture( spec.abilities.adrenaline_rush.id ), Hekili:GetSpellLinkWithTexture( spec.abilities.roll_the_bones.id ) ),
+    desc = function()
+        return strformat( "If checked, %s will be recommended before %s during the opener to guarantee at least 2 buffs from %s.\n\n"
+            .. ( state.talent.loaded_dice.enabled and "|cFF00FF00" or "|cFFFF0000" ) .. "Requires %s|r",
+            Hekili:GetSpellLinkWithTexture( spec.abilities.adrenaline_rush.id ), Hekili:GetSpellLinkWithTexture( spec.abilities.roll_the_bones.id ),
+            Hekili:GetSpellLinkWithTexture( spec.talents.loaded_dice[2] ), Hekili:GetSpellLinkWithTexture( spec.talents.loaded_dice[2] ) )
+    end,
+    type = "toggle",
+    width = "full"
 } )
+
 local assassin = class.specs[ 259 ]
 
 spec:RegisterSetting( "stealth_padding", 0.1, {
-    name = strformat( "%s Padding", Hekili:GetSpellLinkWithTexture( assassin.abilities.stealth.id ) ),
+    name = strformat( "%s: %s Padding", Hekili:GetSpellLinkWithTexture( spec.abilities.between_the_eyes.id ), Hekili:GetSpellLinkWithTexture( assassin.abilities.stealth.id ) ),
     desc = strformat( "If set above zero, abilities recommended during %s effects will assume that %s ends earlier than it actually does.\n\n"
         .. "This setting can be used to prevent a late %s from occurring after %s expires, putting %s on a long cooldown despite %s.", Hekili:GetSpellLinkWithTexture( assassin.abilities.stealth.id ),
         assassin.abilities.stealth.name, Hekili:GetSpellLinkWithTexture( spec.abilities.between_the_eyes.id ), assassin.abilities.stealth.name, spec.abilities.between_the_eyes.name,
@@ -1395,22 +1402,32 @@ spec:RegisterSetting( "stealth_padding", 0.1, {
     width = "full",
 } )
 
-spec:RegisterSetting( "sinister_clash", -0.5, {
-    name = strformat( "%s: Clash Offset", Hekili:GetSpellLinkWithTexture( spec.abilities.sinister_strike.id ) ),
-    desc = strformat( "If set below zero, %s will not be recommended if a higher priority ability is available within the time specified.\n\n"
-        .. "Example: %s is ready in 0.3 seconds.  |W%s|w is ready immediately.  Clash Offset is set to |cFFFFD100-0.5|rs.  |W%s|w will not "
-        .. "be recommended, as it pretends to be unavailable for 0.5 seconds.\n\n"
-        .. "Recommended:  |cffffd100-0.5|rs", Hekili:GetSpellLinkWithTexture( spec.abilities.sinister_strike.id ),
-        Hekili:GetSpellLinkWithTexture( 1752 ), spec.abilities.sinister_strike.name, spec.abilities.sinister_strike.name ),
+spec:RegisterSetting( "crackshot_lock", false, {
+    name = strformat( "%s: %s |cFFFF0000Only|r", Hekili:GetSpellLinkWithTexture( spec.abilities.between_the_eyes.id ), Hekili:GetSpellLinkWithTexture( assassin.abilities.stealth.id ) ),
+    desc = strformat( "If checked and %s is talented, %s will never be recommended outside of %s.\n\nThis is |cFFFF0000NOT|r the default simulation behavior, "
+        .. "but can prevent %s from being placed on a long cooldown.", Hekili:GetSpellLinkWithTexture( spec.talents.crackshot[2] ),
+        Hekili:GetSpellLinkWithTexture( spec.abilities.between_the_eyes.id ), Hekili:GetSpellLinkWithTexture( assassin.abilities.stealth.id ),
+        Hekili:GetSpellLinkWithTexture( spec.abilities.between_the_eyes.id ), assassin.abilities.stealth.name ),
+    type = "toggle",
+    width = "full"
+} )
+
+spec:RegisterSetting( "check_blade_rush_range", true, {
+    name = strformat( "%s: Melee Only", Hekili:GetSpellLinkWithTexture( spec.abilities.blade_rush.id ) ),
+    desc = strformat( "If checked, %s will not be recommended out of melee range.", Hekili:GetSpellLinkWithTexture( spec.abilities.blade_rush.id ) ),
+    type = "toggle",
+    width = "full"
+} )
+
+spec:RegisterSetting( "mfd_points", 3, {
+    name = strformat( "%s: Combo Points", Hekili:GetSpellLinkWithTexture( spec.talents.marked_for_death[2] ) ),
+    desc = strformat( "%s will only be recommended if when you have the specified number of combo points or fewer.",
+        Hekili:GetSpellLinkWithTexture( spec.talents.marked_for_death[2] ) ),
     type = "range",
-    min = -3,
-    max = 3,
-    step = 0.1,
-    get = function () return Hekili.DB.profile.specs[ 260 ].abilities.sinister_strike.clash end,
-    set = function ( _, val )
-        Hekili.DB.profile.specs[ 260 ].abilities.sinister_strike.clash = val
-    end,
-    width = "full",
+    min = 0,
+    max = 5,
+    step = 1,
+    width = "full"
 } )
 
 --[[ spec:RegisterSetting( "no_rtb_in_dance_cto", true, {
@@ -1424,17 +1441,6 @@ spec:RegisterSetting( "sinister_clash", -0.5, {
     width = "full"
 } ) ]]
 
-spec:RegisterSetting( "use_ld_opener", false, {
-    name = "Use |T136206:0|t Adrenaline Rush before |T1373910:0|t Roll the Bones (Opener)",
-    desc = function()
-        return "If checked, the addon will recommend |T136206:0|t Adrenaline Rush before |T1373910:0|t Roll the Bones during the opener to guarantee "
-            .. "at least 2 buffs from |T236279:0|t Loaded Dice.\n\n"
-            .. ( state.talent.loaded_dice.enabled and "|cFF00FF00" or "|cFFFF0000" ) .. "Requires |T236279:0|t Loaded Dice|r"
-    end,
-    type = "toggle",
-    width = "full"
-} )
-
 spec:RegisterSetting( "never_roll_in_window", false, {
     name = strformat( "%s: Never Reroll in %s", Hekili:GetSpellLinkWithTexture( spec.abilities.roll_the_bones.id ), Hekili:GetSpellLinkWithTexture( 1784 ) ),
     desc = strformat( "If checked, %s will never be recommended while %s or %s is active.\n\n"
@@ -1446,14 +1452,6 @@ spec:RegisterSetting( "never_roll_in_window", false, {
     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"
-} )
-
 spec:RegisterSetting( "allow_shadowmeld", false, {
     name = strformat( "%s: Use in Groups", Hekili:GetSpellLinkWithTexture( 58984 ) ),
     desc = strformat( "If checked, %s may be recommended for Night Elves when its conditions are met.  Your stealth-based abilities can be used in %s, even if your action bar does not change.  " ..
@@ -1466,9 +1464,28 @@ spec:RegisterSetting( "allow_shadowmeld", false, {
     end,
 } )
 
-spec:RegisterSetting( "check_blade_rush_range", true, {
-    name = strformat( "%s: Range Check", Hekili:GetSpellLinkWithTexture( spec.abilities.blade_rush.id ) ),
-    desc = strformat( "If checked, %s will not be recommended out of melee range.", Hekili:GetSpellLinkWithTexture( spec.abilities.blade_rush.id ) ),
+spec:RegisterSetting( "sinister_clash", -0.5, {
+    name = strformat( "%s: Clash Buffer", Hekili:GetSpellLinkWithTexture( spec.abilities.sinister_strike.id ) ),
+    desc = strformat( "If set below zero, %s will not be recommended when a higher priority ability is available within the time specified.\n\n"
+        .. "Example: %s is ready in 0.3 seconds.  |W%s|w is ready immediately.  Clash Offset is set to |cFFFFD100-0.5|rs.  |W%s|w will not "
+        .. "be recommended, as it pretends to be unavailable for 0.5 seconds.\n\n"
+        .. "Recommended:  |cffffd100-0.5|rs", Hekili:GetSpellLinkWithTexture( spec.abilities.sinister_strike.id ),
+        Hekili:GetSpellLinkWithTexture( 1752 ), spec.abilities.sinister_strike.name, spec.abilities.sinister_strike.name ),
+    type = "range",
+    min = -3,
+    max = 3,
+    step = 0.1,
+    get = function () return Hekili.DB.profile.specs[ 260 ].abilities.sinister_strike.clash end,
+    set = function ( _, val )
+        Hekili.DB.profile.specs[ 260 ].abilities.sinister_strike.clash = val
+    end,
+    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"
 } )