Add option to automatically bind action bar abilities, fixes #257

Author: Snakybo

CHANGELOG.md

@@ -18,6 +18,7 @@ The format of this changelog is based on [Keep a Changelog](https://keepachangel
 * Add option to import class-wide abilities per specialization [#267]
 * Add option to prevent toggling an ability off [#248]
 * Make key options respect macro condtions where able [#251]
+* Add option to automatically fall back to action bar abilities when no other macro conditions are met [#257]
 
 ### Fixed
 
@@ -1735,6 +1736,7 @@ The format of this changelog is based on [Keep a Changelog](https://keepachangel
 [#267]: https://github.com/Snakybo/Clicked/pull/267
 [#265]: https://github.com/Snakybo/Clicked/pull/265
 [#263]: https://github.com/Snakybo/Clicked/pull/263
+[#257]: https://github.com/Snakybo/Clicked/pull/257
 [#251]: https://github.com/Snakybo/Clicked/pull/251
 [#248]: https://github.com/Snakybo/Clicked/pull/248
 [#247]: https://github.com/Snakybo/Clicked/pull/247

Clicked/Config/Addon.lua

@@ -123,6 +123,20 @@ function AddonOptions:CreateOptionsTable()
 				get = function ()
 					return Addon.db.profile.options.bindUnassignedModifiers
 				end
+			},
+			autoBindActionBar = {
+				name = Addon.L["Automatically bind all action bar abilities"],
+				desc = Addon.L["If enabled, all abilities on the action bar will automatically be appended to a binding on the same key, this will make Clicked fall back to the action bar when all other macro conditions are not met.\n\nNote that this only supports spells and items, not macros."],
+				type = "toggle",
+				order = 500,
+				width = "full",
+				set = function (_, val)
+					Addon.db.profile.options.autoBindActionBar = val
+					Clicked:ProcessActiveBindings()
+				end,
+				get = function ()
+					return Addon.db.profile.options.autoBindActionBar
+				end
 			}
 		}
 	}

Clicked/Config/SpellLibrary.lua

@@ -355,7 +355,7 @@ end
 --- - Items
 --- - Macros
 ---
---- @return table<integer, SpellLibraryResult>
+--- @return SpellLibraryResult[]
 function Addon.SpellLibrary:GetActionBarSpells()
 	--- @type table<integer, SpellLibraryResult>
 	local result = {}

Clicked/Core/BindingProcessor.lua

@@ -207,7 +207,7 @@ local function GetMacroSegmentFromAction(action, interactionType, isLast)
 		table.insert(flags, "exists")
 	end
 
-	if #action.forms.value > 0 then
+	if  action.forms ~= nil and #action.forms.value > 0 then
 		ParseNegatableStringCondition(action.forms, "form", "noform")
 	end
 
@@ -308,8 +308,9 @@ end
 
 --- @param binding Binding
 --- @param interactionType number
+--- @param actionBarItems SpellLibraryResult[]
 --- @return Action[]
-local function ConstructActions(binding, interactionType)
+local function ConstructActions(binding, interactionType, actionBarItems)
 	--- @type Action[]
 	local actions = {}
 
@@ -323,6 +324,18 @@ local function ConstructActions(binding, interactionType)
 			local action = ConstructAction(binding, target)
 			table.insert(actions, action)
 		end
+
+		-- Create virtual actions for action bar items
+		for _, item in ipairs(actionBarItems) do
+			if item.key == binding.keybind and (item.type == "SPELL" or item.type == "ITEM") then
+				--- @cast item SpellLibrarySpellResult|SpellLibraryItemResult
+
+				table.insert(actions, {
+					ability = C_Spell.GetSpellName(item.spellId) or C_Item.GetItemNameByID(item.itemId),
+					type = binding.actionType
+				})
+			end
+		end
 	end
 
 	return actions
@@ -1332,6 +1345,12 @@ function Addon:GetMacroForBindings(bindings, interactionType)
 
 		-- Generate actions for SPELL and ITEM bindings, and insert macro values
 		do
+			local actionBar = {}
+
+			if Addon.db.profile.options.autoBindActionBar and interactionType == Addon.InteractionType.REGULAR then
+				actionBar = Addon.SpellLibrary:GetActionBarSpells()
+			end
+
 			for order, group in pairs(bindingGroups) do
 				actions[order] = {}
 				macros[order] = {}
@@ -1341,7 +1360,7 @@ function Addon:GetMacroForBindings(bindings, interactionType)
 
 				for _, binding in ipairs(group) do
 					if binding.actionType == Clicked.ActionType.SPELL or binding.actionType == Clicked.ActionType.ITEM then
-						for _, action in ipairs(ConstructActions(binding, interactionType)) do
+						for _, action in ipairs(ConstructActions(binding, interactionType, actionBar)) do
 							table.insert(actions[order], action)
 
 							actionsSequence[action] = nextActionIndex

Clicked/Core/Clicked.lua

@@ -221,6 +221,12 @@ local function PLAYER_LEVEL_CHANGED()
 	Addon:ReloadBindings("PLAYER_LEVEL_CHANGED")
 end
 
+local function ACTIONBAR_SLOT_CHANGED()
+	if Addon.db.profile.options.autoBindActionBar then
+		Addon:ReloadBindings("ACTIONBAR_SLOT_CHANGED")
+	end
+end
+
 local function LEARNED_SPELL_IN_TAB()
 	Addon:ReloadBindings("LEARNED_SPELL_IN_TAB")
 end
@@ -303,6 +309,7 @@ local function UpdateEventHooks(self, method)
 	method(self, "MODIFIER_STATE_CHANGED", MODIFIER_STATE_CHANGED)
 	method(self, "UNIT_TARGET", UNIT_TARGET)
 	method(self, "ITEM_DATA_LOAD_RESULT", ITEM_DATA_LOAD_RESULT)
+	method(self, "ACTIONBAR_SLOT_CHANGED", ACTIONBAR_SLOT_CHANGED)
 end
 
 -- Public addon API

Clicked/Core/Database.lua

@@ -146,6 +146,7 @@ function Clicked:GetDatabaseDefaults()
 				onKeyDown = false,
 				tooltips = false,
 				bindUnassignedModifiers = false,
+				autoBindActionBar = false,
 				minimap = {
 					hide = false
 				},

Clicked/Definitions.lua

@@ -36,6 +36,9 @@
 --- @field public onKeyDown boolean
 --- @field public tooltips boolean
 --- @field public minimap Profile.Options.Minimap
+--- @field public bindUnassignedModifiers boolean
+--- @field public autoBindActionBar boolean
+--- @field public ignoreSelfCastWarning boolean
 
 --- @class Profile.Options.Minimap
 --- @field public hide boolean

Clicked/Locales/enUS.lua

@@ -323,3 +323,5 @@ L["Rune equipped"] = true
 L["Import class abilities per specialization"] = true
 L["Prevent toggle"] = true
 L["Prevent the ability from being toggled off by repeatetly pressing the keybind."] = true
+L["Automatically bind all action bar abilities"] = true
+L["If enabled, all abilities on the action bar will automatically be appended to a binding on the same key, this will make Clicked fall back to the action bar when all other macro conditions are not met.\n\nNote that this only supports spells and items, not macros."] = true