wow/skeletonkey: SkeletonKey/KeySlot.lua comparison

comparison SkeletonKey/KeySlot.lua @ 15:32d64e42ec9b

- resolve pet bar actions for binding slots - detect type of petaction (can be spell, stance, or 'PETACTION') - keep track of displayed pet ability slots and update them alongside pet cache refreshes

author	Nenue
date	Fri, 29 Jul 2016 03:27:15 -0400
parents	82170735e67c
children	cdd387d39137

comparison

equal deleted inserted replaced

-:82170735e67c
+:32d64e42ec9b
 -- All the internal slot logic is kept here
 local kb, print = LibStub('LibKraken').register(KeyBinder, 'Slot')
 local CURSOR_SPELLSLOT, CURSOR_BOOKTYPE, CURSOR_PETACTION
 local SUMMON_RANDOM_FAVORITE_MOUNT_SPELL = 150544
-local BORDER_UNASSIGNED = {0.2,0.2,0.2,1 }
+local BORDER_UNASSIGNED = {0.2,0.2,0.2,1}
-local BORDER_ASSIGNED = {0.5,0.5,0.5,1 }
+local BORDER_ASSIGNED = {1,1,1,1}
 local BORDER_DYNAMIC = {1,1,0,1}
 local BORDER_PENDING = {1,0.5,0,1 }
 local BUTTON_HEADERS = {
 ['spell'] = SPELLS,
 do
 -- Pet actions
 local isPickup
 hooksecurefunc("PickupPetAction", function(slot, ...)
 isPickup = GetCursorInfo()
+print(slot, ...)
-CURSOR_PETACTION = isPickup and slot
+if kb.PetCache.action[slot] then
+if isPickup then
+local key = kb.PetCache.action[slot][1]
+local spellName = _G[key] or key
+if spellName and kb.PetCache.spellslot[spellName] then
+print('picked up', spellName, kb.PetCache.spellslot[spellName][1])
+CURSOR_SPELLSLOT = kb.PetCache.spellslot[spellName][1]
+CURSOR_BOOKTYPE = BOOKTYPE_PET
+end
+else
+print('Dropped pet action =', GetPetActionInfo(slot))
+end
 print('|cFFFF4400PickupPetAction|r', isPickup, CURSOR_PETACTION)
+end
+local name, subtext, texture, isToken = GetPetActionInfo(slot)
+if name then
+kb.PetCache.action[slot] = {name, subtext, texture, isToken}
+end
 end)
 end
 kb.DropToSlot = function(self)
 ResetCursor()
 return
 end
-local macroName, macroText
+local name, icon, _
-local command, name, icon, _
 local pickupID, pickupBook
 if actionType == 'spell' then
 actionID = subData
 name, _, icon = GetSpellInfo(actionID)
 elseif actionType == 'macro' then
 name, icon = GetMacroInfo(actionID)
 elseif actionType == 'petaction' then
-if not (CURSOR_SPELLSLOT and CURSOR_BOOKTYPE) then
+if CURSOR_SPELLSLOT and CURSOR_BOOKTYPE then
-ClearCursor()
+local spellType, spellID = GetSpellBookItemInfo(CURSOR_SPELLSLOT, CURSOR_BOOKTYPE)
-ResetCursor()
+local spellName, spellText = GetSpellBookItemName(CURSOR_SPELLSLOT, CURSOR_BOOKTYPE)
-end
+if spellType == 'PETACTION' then
+actionID = spellText
-local bookType, spellID = GetSpellBookItemInfo(CURSOR_SPELLSLOT, CURSOR_BOOKTYPE)
+else
-actionID = spellID
+name, _, icon = GetSpellInfo(spellID)
-pickupID = CURSOR_SPELLSLOT
+actionID = spellID
-pickupBook = CURSOR_BOOKTYPE
+end
-name, _, icon = GetSpellInfo(spellID)
+pickupID = CURSOR_SPELLSLOT
+pickupBook = CURSOR_BOOKTYPE
+else
+end
 elseif actionType == 'mount' then
 if subType == 0 then
 name, _, icon = GetSpellInfo(SUMMON_RANDOM_FAVORITE_MOUNT_SPELL)
 actionID = 0
 else
 local speciesID, customName, level, xp, maxXp, displayID, isFavorite, petName, petIcon, petType, creatureID = C_PetJournal.GetPetInfoByPetID(detail);
 name = customName or petName
 icon = petIcon
 end
-macroName, macroText, command = kb.RegisterAction(actionType, actionID, name)
+local macroName, macroText, command = kb.RegisterAction(actionType, actionID, name)
 local isAssigned, isBound, assignedBy, boundBy = kb.IsCommandBound(self, command)
 if isAssigned then
 local popup = StaticPopupDialogs["SKELETONKEY_CONFIRM_ASSIGN_SLOT"]
 local GetPickupValue = {
 spell = function(self) return select(7, GetSpellInfo(self.actionID)) end,
 petaction = function(self) return self.pickupSlot, self.pickupBook end,
 }
 kb.PickupSlot = function(self)
-if not self.command then
+if not (self.command and self.isAvailable) then
 return
 end
 print(self.actionType)
 if self.actionType == 'spell' then
 -- It can't be picked up if SpellInfo(name) returns void
 end
 if self.command then
 print('['..slot..'] =', self.command, GetBindingKey(self.command))
-if self.pending then
+if not self.isAvailable then
-self.border:SetColorTexture(unpack(BORDER_PENDING))
+self.border:SetColorTexture(1,0,0,1)
-elseif self.isDynamic then
+self.ignoreTexture:Show()
-self.border:SetColorTexture(unpack(BORDER_DYNAMIC))
+else
-else
+self.ignoreTexture:Hide()
-self.border:SetColorTexture(unpack(BORDER_ASSIGNED))
-end
+if self.pending then
+self.border:SetColorTexture(unpack(BORDER_PENDING))
+elseif self.isDynamic then
+self.border:SetColorTexture(unpack(BORDER_DYNAMIC))
+else
+self.border:SetColorTexture(unpack(BORDER_ASSIGNED))
+end
+end
 if self.actionType == 'macro' then
 self.macro:Show()
 else
 self.macro:Hide()
 end
 end
 if self.isDynamic then
-print('|cFFFFBB00UpdateSlot|r: ', self.isDynamic, self.isAvailable, self.actionID)
+print('|cFF00BBFFUpdateSlot|r:', self.isDynamic, self.isAvailable, self.actionID)
 end
 if self.isDynamic == 'profession'  then
 local profText = (self.spellNum == 1) and TRADE_SKILLS or (BUTTON_HEADERS[self.profIndex] or GetProfessionInfo(self.profIndex))
 if self.isAvailable then
 print(self.actionID, #kb.inactiveTalentBindings[self.actionID])
 self.bindingText= kb.BindingString(unpack(kb.inactiveTalentBindings[self.actionID]))
 end
 end
+elseif self.isDynamic == 'petaction' and self.command:match("special") then
+self.statusText = '|cFF00FF00Pet Special|r'
+self.bindingText = kb.BindingString(GetBindingKey(self.command))
 else
 self.statusText = '|cFF00FF00'.. (BUTTON_HEADERS[self.actionType] and BUTTON_HEADERS[self.actionType] or self.actionType) .. '|r'
 self.bindingText = kb.BindingString(GetBindingKey(self.command))
 end
 self.profile = nil
 self.icon:SetTexture(nil)
 self.border:SetColorTexture(unpack(BORDER_UNASSIGNED))
 self:EnableKeyboard(false)
 self:SetScript('OnKeyDown', nil)
+self.ignoreTexture:Hide()
 end
 kb.SetSlot = function(self, command, name, icon, actionType, actionID, macroName, macroText, pickupSlot, pickupBook)
 local slot = self:GetID()
 local isDynamic, isAvailable
 isDynamic = 'talent'
 print(' Special slot: |cFFBBFF00talent|r', name, isAvailable)
 end
 isAvailable = GetSpellInfo(name)
+end
+elseif actionType == 'petaction' then
+isDynamic = 'petaction'
+if kb.PetCache.spellslot and kb.PetCache.spellslot[name] then
+isAvailable = true
+kb.RemoveCacheButton(kb.petFrames, self)
+else
+print('|cFFFF4400OnCacheUpdate, re-do #', slot)
+tinsert(kb.petFrames, self)
 end
 elseif actionType == 'macro' then
 if not actionID then
 actionID = GetMacroIndexByName(name)
 end
 end
 end
 kb.LoadBinding(command, name, icon, actionType, actionID, macroName, macroText)
 end
-if actionType == 'petaction' then
-self.pickupSlot = pickupSlot
-self.pickupBook = pickupBook
-else
-self.pickupSlot = nil
-self.pickupBook = nil
-end
 actionID = actionID or 0
 self:EnableKeyboard(true)
-print(' |cFF00FF00kb.currentProfile.buttons['..slot..'] |cFF00FFFF=|r |cFF00FFFF"'.. command.. '"|r |cFF00FF00"'.. name, '"|r |cFFFFFF00icon:'.. icon .. '|r |cFFFF8800"'.. actionType, '"|r |cFFFF0088id:'.. actionID ..'|r |cFF00FF00"'.. macroName .. '"|r')
+print(' |cFF00FF00kb.currentProfile.buttons['..slot..'] |cFF00FFFF=|r |cFF00FFFF"'.. command.. '"|r |cFF00FF00"'.. name.. '"|r |cFFFFFF00icon:'.. icon .. '|r |cFFFF8800"'.. actionType, '"|r |cFFFF0088id:'.. actionID ..'|r |cFF00FF00"'.. macroName .. '"|r')
 kb.currentProfile.buttons[slot] = {command, name, icon, actionType, actionID, macroName, macroText, pickupSlot, pickupBook}
 -- Clean up conflicting entries for loaded button
 local previous = kb.currentProfile.commands[command]
 if previous ~= slot and kb.buttons[previous] then
 end
 self.isAvailable = isAvailable
 self.isDynamic = isDynamic
+self.pickupSlot = pickupSlot
+self.pickupBook = pickupBook
 self.macroText = macroText
 self.macroName = macroName
 self.actionType = actionType
 self.actionID = actionID
 self.actionName = name

Mercurial > wow > skeletonkey

comparison SkeletonKey/KeySlot.lua @ 15:32d64e42ec9b