wow/skeletonkey: KeyButton.lua comparison

comparison KeyButton.lua @ 80:b9a53385462c

- Fixed Demon Hunter Vengeance bindings, along with other spells that are replaced by specialization variants. - Spells replaced by a specialization now display the replacing name along with the original name in their binding slot.

author	Nick@Zahhak
date	Tue, 21 Mar 2017 02:23:23 -0400
parents	d4c100b0fd01
children	9a206b105ea5

comparison

equal deleted inserted replaced

-:ac9e48125660
+:b9a53385462c
 local CURSOR_SPELLSLOT, CURSOR_BOOKTYPE, CURSOR_PETACTION, CURSOR_TEXTURE
 local SUMMON_RANDOM_FAVORITE_MOUNT_SPELL = 150544
 local BORDER_UNASSIGNED = {0.6,0.6,0.6,1}
 local BORDER_ASSIGNED = {1,1,1,1}
 local BORDER_DYNAMIC = {1,1,0,1}
-local BORDER_PENDING = {1,0.5,0,1 }
+local BORDER_PENDING = {1,0.5,0,1}
+local BORDER_REPLACED = {0,1,.5,1}
 local BUTTON_HEADERS = {
 ['spell'] = SPELLS,
 ['macro'] = MACRO,
 ['petaction'] = PET,
 ['mount'] = MOUNT,
 end
 end
 elseif click == 'RightButton' then
 self:ReleaseSlot()
 else
-kb.ProcessInput(strupper(click))
+SkeletonKey:ProcessInput(strupper(click))
 end
 SkeletonKey:Update()
 end
 function skb:OnDragStart()
 local name, icon, _, macroName, macroText
 local pickupID, pickupBook
 if actionType == 'spell' then
-actionID = subData
+local realName = GetSpellInfo(subData)
-name, _, icon = GetSpellInfo(actionID)
+name, _, icon, _, _, _, actionID = GetSpellInfo(subData)
 elseif actionType == 'macro' then
 name, icon, macroText = GetMacroInfo(actionID)
 macroName = name
 elseif actionType == 'petaction' then
 if CURSOR_SPELLSLOT and CURSOR_BOOKTYPE then
 self:ReleaseSlot()
 end
 end
 local borderType = BORDER_UNASSIGNED
+local displayName = self.actionName
+local displayTexture = self.iconPath
+local altName, altTexture
 if self.command then
-print('|cFFFF4400', self.actionName, #self.assignedKeys, table.concat(self.assignedKeys, ','))
+print('|cFFFF4400:', self.actionName, #self.assignedKeys, table.concat(self.assignedKeys, ','))
-print(self.isAvailable)
+print('|cFF00FF88:', self.isAvailable, self.actionID)
-print(self.actionID)
 self.bindingText= kb.BindingString(unpack(self.assignedKeys))
 if not self.isAvailable then
 borderType = BORDER_DYNAMIC
 self.ignoreTexture:Show()
 else
 self.ignoreTexture:Hide()
 if self.actionType == 'macro' then
 self.macro:Show()
 else
 self.macro:Hide()
 if self.actionType == 'spell' then
-self.isAvailable = GetSpellInfo(self.actionName) and true or false
+altName, _, altTexture = GetSpellInfo(self.actionName)
+self.isAvailable = displayName and true or false
+if altName and (altName ~= self.actionName) then
+displayName = '|cFFFFFF00'..altName..'|r ('..self.actionName..')'
+displayTexture = altTexture
+borderType = BORDER_REPLACED
+end
 end
 end
 if self.dynamicType == 'profession'  then
 else
 self.icon:SetAlpha(1)
 end
-if self.actionType == 'spell' then
-self.icon:SetTexture(GetSpellTexture(self.actionID))
-end
 print('|cFF00BBFFUpdateSlot|r:', '['..slot..'] =', self.command, self.bindingText, self.dynamicType, self.isAvailable, self.actionID)
-else
-if kb.saveTarget == self then
-kb.DeactivateSlot(self)
-end
 end
 if not self.isAvailable then
 self.bind:SetTextColor(.7,.7,.7,1)
 self:SetAlpha(1)
 end
 --self.alert:SetShown(self.command and not self.isBound)
-self.icon:SetTexture(self.iconPath)
+self.icon:SetTexture(displayTexture)
 self.border:SetColorTexture(unpack(borderType))
 self.header:SetText(self.statusText)
 self.bind:SetText(self.bindingText)
-self.details:SetText(self.actionName)
+self.details:SetText(displayName)
 end
 --- Resets button command
 function skb:ReleaseSlot ()
 local slot = self:GetID()
+-- keep right click from deleting an assignment during bind mode
+if kb.saveTarget == self then
+self:GetParent():DeactivateSlot(self)
+return
+end
 if kb.currentProfile.buttons[slot] then
 kb.currentProfile.buttons[slot] = nil
 end
 if self.command then
 actionID = actionID or 0
 self:EnableKeyboard(true)
 -- this is done to keep legacy key-values from breaking algorithm assumptions
-print(slotInfo.assignedKeys)
+print('assigned', table.concat(slotInfo.assignedKeys,', '))
-print(GetBindingKey(command))
-self.assignedKeys = slotInfo.assignedKeys or {GetBindingKey(command)}
+if #slotInfo.assignedKeys == 0 then
+print('updating assigned table to:', GetBindingKey(command))
+slotInfo.assignedKeys = {GetBindingKey(command) }
+end
+self.assignedKeys = slotInfo.assignedKeys
 local slotInfo = {
 command = command,
 actionName = name,
 iconPath = icon,

Mercurial > wow > skeletonkey

comparison KeyButton.lua @ 80:b9a53385462c