wow/skeletonkey: ActionTemplates.lua comparison

comparison ActionTemplates.lua @ 71:ca3118127e5e

- Talent change detection - Use stored assignments for inactive talent slots

author	Nenue
date	Fri, 06 Jan 2017 16:21:49 -0500
parents	131d9190db6b
children	c48913c5924c

comparison

equal deleted inserted replaced

-:131d9190db6b
+:ca3118127e5e
 local specialButtonType
 if actionType == 'spell' then
 if not GetSpellInfo(actionID) then
 isAvailable = nil
 end
-local dynamicInfo = kb.TalentCache[name] or kb.ProfessionCache[name]
+local dynamicInfo = kb.DynamicSpells[name]
 if dynamicInfo then
-cprint('|cFF00FFFFDynamicInfo:|r', name)
+configTable.assignedKeys = configTable.assignedKeys or {GetBindingKey(configTable.command)}
+cprint('|cFF00FFFFDynamicInfo:|r', dynamicInfo.dynamicType, table.concat(configTable.assignedKeys or {}, ','))
 for k, v in pairs(dynamicInfo) do
-cprint(' --', k, v)
+--cprint(' --', k, v)
 configTable[k] = v
 end
 end
 else
 if actionType ~= 'macro' then
 actionPrefix = '*macrotext-'
 end
 end
 local attributeSuffix, attributeValue, command, target, button =  kb.RegisterAction(actionType, actionID, name)
 local actionKey = actionPrefix .. attributeSuffix
 cprint('|cFF00FF88LoadBinding()|r', button:GetName(), "*type-"..attributeSuffix, actionType,  '|cFFFFFF00'..actionKey, attributeValue)
 if isAvailable then
 kb.SecureAttribute(button, "*type-"..attributeSuffix, specialButtonType or actionType)
 else
 return nil
 end
 end
 local usedSlots = {}
-kb.ApplyBindings = function (profile)
+kb.UpgradeProfile = function(profile)
-cprint('|cFF0088FFApplyBindings()')
---cprint('binding profile', profile)
 wipe(usedSlots)
 for slot, configTable in pairs(profile.buttons) do
+-- convert old style table
 if #configTable >= 1 then
 local command, name, icon, actionType, actionID, macroName, macroText, spellbookSlot, spellbookType = unpack(configTable)
 cprint('|CFFFF4400Fixing pad entry', slot, command, name)
 local assignedKeys = {GetBindingKey(command)}
 iconPath = icon,
 spellbookSlot = spellbookSlot,
 spellbookType = spellbookType,
 assignedKeys = assignedKeys
 }
+local dynamic = kb.DynamicSpells[name]
+if dynamic then
+configTable.dynamicType = dynamic.dynamicType
+configTable.dynamicIndex = dynamic.dynamicIndex
+configTable.dynamicSubIndex = dynamic.dynamicSubIndex
+configTable.dynamicID = dynamic.dynamicID
+if configTable.dynamicType == 'talent' then
+profile.talents[name] = configTable
+end
+end
 kb.currentProfile.buttons[slot] = configTable
 end
 if not configTable.actionID then
 configTable.actionID = configTable.actionName
 end
 configTable.iconPath = GetSpellTexture(configTable.actionName)
 end
 usedSlots[configTable.actionName or configTable.actionID] = true
 usedSlots[configTable.command] = true
+end
-if kb.LoadBinding(configTable) then
-configTable.isAvailable = true
-end
+-- clean up legacy data
-end
+for spellName, talentInfo in pairs(profile.talents) do
+if not usedSlots[spellName] then
+cprint('|cFFFF4400Unslotted talent', spellName)
+profile.talents[spellName] = nil
+end
+end
+for command in pairs(profile.bound) do
+if not usedSlots[command] then
+cprint('|cFFFF4400Unslotted bound entry', command)
+profile.bound[command] = nil
+profile.commands[command] = nil
+end
+end
+for command in pairs(profile.commands) do
+if not usedSlots[command] then
+cprint('|cFFFF4400Unslotted command entry', command)
+profile.commands[command] = nil
+end
+end
+end
+kb.ApplyBindings = function (profile)
+cprint('|cFF0088FFApplyBindings()')
+--cprint('binding profile', profile)
+local version = profile.versionID or 0
+if version < 310 then
+kb.UpgradeProfile(profile)
+end
+-- do flat bindings to start
 for key, command in pairs(profile.bindings) do
 command = command:gsub('KeyBinder', 'SkeletonKey')
 profile.bindings[key] = command
 cprint('|cFF00FFFF'.. key .. '|r to|cFF00FF00', command)
 SetBinding(key, command)
 if commandActions[command] and not tContains(commandActions[command], key) then
 tinsert(commandActions[command], key)
 end
 end
-for spellName, talentInfo in pairs(profile.talents) do
+-- then buttons
-if not usedSlots[spellName] then
+for slot, configTable in pairs(profile.buttons) do
-cprint('|cFFFF4400Unslotted talent', spellName)
+-- convert old style table
-profile.talents[spellName] = nil
+if kb.LoadBinding(configTable) then
-end
+local talent = profile.talents[configTable.actionName]
-end
+if talent then
-for command in pairs(profile.bound) do
+configTable.assignedKeys = talent.assignedKeys
-if not usedSlots[command] then
+end
-cprint('|cFFFF4400Unslotted bound entry', command)
+if not configTable.assignedKeys then
-profile.bound[command] = nil
+configTable.assignedKeys = {GetBindingKey(configTable.command) }
-profile.commands[command] = nil
+end
-end
+configTable.isAvailable = true
-end
+if configTable.dynamicType then
-for command in pairs(profile.commands) do
+kb:print(table.concat(configTable.assignedKeys, ', ') .. ' bound to '.. configTable.actionName)
-if not usedSlots[command] then
+end
-cprint('|cFFFF4400Unslotted command entry', command)
-profile.commands[command] = nil
+end
 end
-end
 end
 kb.ApplyAllBindings =function ()
 cprint('|cFF0088FFApplyAllBindings()')
 wipe(kb.TalentBindings)
 talentInfo.dynamicID = talentID
 talentInfo.dynamicIndex = row
 talentInfo.dynamicSubIndex = col
 talentInfo.actionID = spellID
 talentInfo.isAvailable = selected
-kb.TalentCache[spellID] = talentInfo
-kb.TalentCache[talentName] = talentInfo
 kb.DynamicSpells[spellID] = talentInfo
 kb.DynamicSpells[talentName] = talentInfo
 end
 --print('Talent ', row, col, spellID, talentName)
 talentInfo.actionName = name
 talentInfo.dynamicType = 'talent'
 talentInfo.dynamicID = id
 talentInfo.actionID = spellID
 talentInfo.isAvailable = selected
-kb.TalentCache[spellID] = talentInfo
-kb.TalentCache[name] = talentInfo
 kb.DynamicSpells[spellID] = talentInfo
 kb.DynamicSpells[name] = talentInfo
 end
 end
 end

Mercurial > wow > skeletonkey

comparison ActionTemplates.lua @ 71:ca3118127e5e