wow/skeletonkey: SkeletonKey/ActionTemplates.lua comparison

comparison SkeletonKey/ActionTemplates.lua @ 62:04c23ceaf9e0

- fix taint caused by loading in combat

author	Nenue
date	Mon, 05 Sep 2016 14:56:38 -0400
parents	9eebce04e69b
children	2409fe9b81e1

comparison

equal deleted inserted replaced

-:b7be92f62b05
+:04c23ceaf9e0
 local target, attributeName, attributeValue  = atype[actionType](id, name)
 local command = target .. attributeName
 local baseName, iterative = attributeName, 1
 while (kb.macros[attributeName] and kb.macros[attributeName][1] ~= attributeValue) do
-print(' * cannot use|cFF00FF00', attributeName, '|r"'.. tostring(kb.macros[attributeName][1]) .. '"')
+--print(' * cannot use|cFF00FF00', attributeName, '|r"'.. tostring(kb.macros[attributeName][1]) .. '"')
 attributeName = baseName .. '_' .. iterative
 iterative = iterative + 1
 end
 if attributeName ~= baseName then
-print(' * Creating|cFF00FF00', attributeName)
+--print(' * Creating|cFF00FF00', attributeName)
 else
-print(' * Re-using|cFF00FF00', attributeName)
+--print(' * Re-using|cFF00FF00', attributeName)
 end
 kb.macros[attributeName] = {attributeValue, command}
-print('RegisterAction', actionType, id, '->', attributeName, attributeValue, target .. attributeName)
+--print('RegisterAction', actionType, id, '->', attributeName, attributeValue, target .. attributeName)
 return attributeName, attributeValue, command
 end
 kb.ApplyTalentBinding = function(talentInfo, cache)
 for i = 5, #talentInfo do
 local command = CLICK_KEYBINDER_KEY.. talentInfo[2]
 SetBinding(talentInfo[i], command)
-cprint(' **', talentInfo[i], '->', command)
+--cprint(' **', talentInfo[i], '->', command)
 tinsert(cache, talentInfo[i])
 end
 end
 kb.CacheTalentBinding = function(talentInfo, cache)
 do
 local bindings = kb.bindings
 local key, macro = KeyBinderKey, KeyBinderMacro
 kb.LoadBinding = function(command, name, icon, actionType, actionID, macroName, macroText )
+local buttonTypeKey, buttonTypeValue = "*type-"..name, actionType
+local buttonActionKey, buttonActionValue = "*"..actionType.."-"..name, actionID
+local button = key
 if actionType == 'spell' then
-key:SetAttribute("*type-"..name, actionType)
+buttonTypeKey = "*type-"..name
-key:SetAttribute("*"..actionType.."-"..name, name)
+buttonTypeValue = actionType
+buttonActionKey = "*"..actionType.."-"..name
+buttonActionValue = name
 elseif actionType == 'item' then
-key:SetAttribute("*type-"..name, actionType)
+buttonTypeKey = "*type-"..name
-key:SetAttribute("*"..actionType.."-"..name, name)
+buttonTypeValue = actionType
+buttonActionKey = "*"..actionType.."-"..name
+buttonActionValue = actionID
 elseif actionType == 'macro' then
-macro:SetAttribute("*macro-"..macroName, actionID)
+button = macro
+buttonTypeKey = "*macro-"..macroName
+buttonTypeValue = actionID
+buttonActionKey = nil
 else
-macro:SetAttribute("*macrotext-"..macroName, macroText)
+button = macro
-end
+buttonTypeKey = "*macrotext-"..macroName
+buttonTypeValue = macroText
+buttonActionKey = nil
+end
+--cprint(actionType, actionID, name)
+--cprint(button:GetName(), buttonTypeKey,'=', buttonTypeValue)
+kb.SecureAttribute(button, buttonTypeKey, buttonTypeValue)
+if buttonActionKey then
+--cprint(button:GetName(), buttonActionKey,'=', buttonActionValue)
+kb.SecureAttribute(button, buttonActionKey, buttonActionValue)
+end
 local indexKey = actionType..'_'..actionID
-cprint('Loading binding', indexKey)
 bindings[indexKey] = bindings[indexKey] or {}
 bindings[command] = bindings[indexKey]
 return bindings[indexKey], actionID
 end
 kb.ApplyBindings = function (profile)
-cprint('binding profile', profile)
+--cprint('binding profile', profile)
 for slot, data in pairs(profile.buttons) do
 kb.LoadBinding(unpack(data))
 end
 for key, command in pairs(profile.bindings) do
-cprint(' *', key, '->', command)
+--cprint(' *', key, '->', command)
 --_G.print('HotKey','loading', key, command)
 SetBinding(key, command)
 if bindings[command] and not tContains(bindings[command], key) then
 tinsert(bindings[command], key)
 for spellName, talentInfo in pairs(profile.talents) do
 local dummy = GetSpellInfo(spellName)
 local func = kb.CacheTalentBinding
 local dest = kb.TalentBindings
 if dummy then
-cprint('|cFFBBFF00Active:|r', dummy)
+--cprint('|cFFBBFF00Active:|r', dummy)
 local macroName, spellName, actionType, actionID = unpack(talentInfo)
 local indexKey = actionType .. '_' .. actionID
 bindings[indexKey] = {}
 func = kb.ApplyTalentBinding
 dest = kb.bindings[indexKey]
 else
-cprint('|cFFFF4400Inactive:|r', talentInfo[2])
+--cprint('|cFFFF4400Inactive:|r', talentInfo[2])
 end
 func(talentInfo, dest)
 end
 end
 kb.ApplyAllBindings =function ()
 wipe(kb.TalentBindings)
+wipe(kb.bindings)
+kb:print('Loading binding profile', kb.profileName)
 -- reflect action key settings
 if GetCVarBool("ActionButtonUseKeyDown") then
 KeyBinderMacro:RegisterForClicks("AnyDown")
 KeyBinderKey:RegisterForClicks("AnyDown")
 talentInfo.selected = selected
 talentInfo.available = available
 talentInfo.spellID = spellID
 kb.TalentCache[spellID] = talentInfo
 kb.TalentCache[talentName] = talentInfo
-print('Talent ', row, col, spellID, talentName)
+--print('Talent ', row, col, spellID, talentName)
 end
 end
 kb.talentsPushed = true
 kb.UpdateDynamicButtons('talent')
 end
 kb.UpdateProfessionInfo = function()
 wipe(kb.ProfessionCache)
 local profs = {GetProfessions() }
-print(GetProfessions())
+--print(GetProfessions())
 local primaryNum = 0
 for i = 1, 6 do
 if profs[i] then
 local index = profs[i]
 local profName, texture, _, _, numSpells, spellOffset = GetProfessionInfo(index)
-print(i, index, profName, numSpells, spellOffset)
+--print(i, index, profName, numSpells, spellOffset)
 if not SECONDARY_PROFESSIONS[index] then
 primaryNum = primaryNum + 1
 end
 local profNum = SECONDARY_PROFESSIONS[index] or primaryNum
-print(i, profNum)
+--print(i, profNum)
 kb.ProfessionCache[profNum] = kb.ProfessionCache[profNum] or {}
 for j = 1, numSpells do
 kb.SecureAttribute(KeyBinderKey, "*spell-profession_"..i .. '_' ..j, spellName)
 kb.ProfessionCache[i .. '_' .. j] = profInfo
 kb.ProfessionCache[spellName] = profInfo
 kb.ProfessionCache[spellID] = profInfo
-print('  |cFF0088FF['..i..']|r|cFFFF44BB['..spellOffset+i..']|r', spellName, "profession_"..i .. '_' ..j)
+--print('  |cFF0088FF['..i..']|r|cFFFF44BB['..spellOffset+i..']|r', spellName, "profession_"..i .. '_' ..j)
 end
 end
 end
 petSpellCache = {}
 petSubtextCache = {}
 end
 if PetHasSpellbook() then
-print('PET SPELLBOOK')
+--print('PET SPELLBOOK')
 local i = 1
 local specialNum = {}
 repeat
 local spellType, spellID = GetSpellBookItemInfo(i, BOOKTYPE_PET)
 local texture = GetSpellBookItemTexture(i, BOOKTYPE_PET)
 local isPassive = IsPassiveSpell(i, BOOKTYPE_PET)
 if not isPassive then
 if spellName then
 kb.PetCache.spellslot[spellName] = {i, spellName, subText, spellID, texture}
-print('|cFF00FF88spellslot['..spellName..']|r', '=>', i, subText)
+--print('|cFF00FF88spellslot['..spellName..']|r', '=>', i, subText)
 if subText then
 -- make sure that pet specialization subtext maps correctly
 --if match(subText, kb.PetCache.specName) then
 --  subText = 'specialization'
 local macrotext = ""
 for spellName, enabled in pairs(petSubtextCache[subText]) do
 macrotext = macrotext .. "/cast " .. spellName .. "\n"
 end
 kb.SecureAttribute(KeyBinderMacro, "*macrotext-petaction_"..subText.."_"..specialNum[subText], macrotext)
-print('|cFF00FFFFspecial['..spellName..']|r', '\n','|cFF00FFFFsubtext['..subText..']['..specialNum[subText]..']|r', '=>', i, spellName, subText, spellID,  texture, specialNum[subText])
+--print('|cFF00FFFFspecial['..spellName..']|r', '\n','|cFF00FFFFsubtext['..subText..']['..specialNum[subText]..']|r', '=>', i, spellName, subText, spellID,  texture, specialNum[subText])
 end
 local entry = {i, spellName, subText, spellID,  texture, specialNum[subText]}
 kb.PetCache.subtext[subText][specialNum[subText]] = entry
 end
 if spellID then
 kb.PetCache.spell[i] = {spellID, spellName, subText}
-print('|cFF0088FFspell['..i..']|r', '=>', spellID, spellName, subText)
+--print('|cFF0088FFspell['..i..']|r', '=>', spellID, spellName, subText)
 end
 end
 end
 i = i + 1
 until spellType == nil
 else
-print('NO PET SPELLBOOK')
+--print('NO PET SPELLBOOK')
 wipe(kb.PetCache.spell)
 wipe(kb.PetCache.spellslot)
 end
 if PetHasActionBar() then
-print('PET ACTION BAR')
+--print('PET ACTION BAR')
 for i = 1, 10 do
 local name, subtext, texture, isToken, isActive = GetPetActionInfo(i)
 if name then
 kb.PetCache.action[i] = {name, subtext, texture, isToken, isActive }
 end
-print('|cFFFFFF00action['..i..']|r', name, subtext, texture)
+--print('|cFFFFFF00action['..i..']|r', name, subtext, texture)
 end
 else
-print('NO PET ACTION BAR')
+--print('NO PET ACTION BAR')
 wipe(kb.PetCache.action)
 end
 kb.UpdateDynamicButtons('petaction')
 end
 if key2 then
 kb.SystemBindings[key2] = command
 end
 else
-print('ignoring action button binding', command)
+--print('ignoring action button binding', command)
 end
 end
 end
 kb.UpdateDynamicButtons = function(dynamicType)
 tinsert(kb.pendingAttributes, {target, name, value})
 kb:RegisterEvent('PLAYER_REGEN_ENABLED')
 else
-print(target:GetName(), 'attribute', '"'.. tostring(name)..'" = "'..tostring(value)..'"')
+--print(target:GetName(), 'attribute', '"'.. tostring(name)..'" = "'..tostring(value)..'"')
 target:SetAttribute(name, value)
 end
 end
 kb.PLAYER_REGEN_ENABLED = function()
 if #kb.pendingAttributes >= 1 then
 local args = tremove(kb.pendingAttributes)
 while args do
 local target, name, value = unpack(args)
-print(target:GetName(), 'attribute', '"'.. tostring(name)..'" = "'..tostring(value)..'"')
+--print(target:GetName(), 'attribute', '"'.. tostring(name)..'" = "'..tostring(value)..'"')
 target:SetAttribute(name, value)
 args = tremove(kb.pendingAttributes)
 end
 end
 kb.UpdateBindingsCache = function(actionType, actionID, bindings)
 local indexKey = actionType .. '_' .. actionID
 kb.bindings[indexKey] = bindings
-print('|cFF00FF00'..indexKey..'|r = {', table.concat(bindings,', '), '}')
+--print('|cFF00FF00'..indexKey..'|r = {', table.concat(bindings,', '), '}')
 tinsert(kb.ChangedBindings, {actionType, actionID})
 end

Mercurial > wow > skeletonkey

comparison SkeletonKey/ActionTemplates.lua @ 62:04c23ceaf9e0