--- a/SkeletonKey/ActionTypes.lua	Sat Jul 30 03:33:09 2016 -0400
+++ b/SkeletonKey/ActionTypes.lua	Sat Jul 30 19:08:11 2016 -0400
@@ -21,42 +21,54 @@
   [PET_MODE_ASSIST] = {SLASH_PET_ASSIST1, 'pet_assist'},
 }
 
+kb.ActionTypes = {}
+kb.PetCache = {}
+kb.TalentCache = {}
+kb.ProfessionCache = {}
+
+local atype = kb.ActionTypes
+
 --- Caps Lock
-local ACTION_HANDLERS = {}
-ACTION_HANDLERS['mount'] = function(id, name)
+atype['mount'] = function(id, name)
   if id == SUMMON_RANDOM_FAVORITE_MOUNT_SPELL then
     return 'mount_random', "/script C_MountJournal.SummonByID(0)", CLICK_KEYBINDER_MACRO
   else
     return 'mount_'..id, "/script C_MountJournal.SummonByID("..id..")", CLICK_KEYBINDER_MACRO
   end
 end
-ACTION_HANDLERS['macro'] = function(id, name)
+
+atype['macro'] = function(id, name)
   return CLICK_KEYBINDER_MACRO, 'macro_' .. tostring(name), id
 end
-ACTION_HANDLERS['equipset'] = function(id, name)
+
+atype['equipset'] = function(id, name)
     return CLICK_KEYBINDER_MACRO, 'equipset_'..tostring(name), "/script UseEquipmentSet("..tostring(id)..")"
 end
-ACTION_HANDLERS['spell'] = function(id, name)
+
+atype['spell'] = function(id, name)
   local attributeName = name
   if kb.ProfessionCache[id] then
     attributeName = "profession_".. kb.ProfessionCache[id].profOffset .. '_' .. kb.ProfessionCache[id].spellNum
   end
   return CLICK_KEYBINDER_KEY, attributeName, name
 end
-ACTION_HANDLERS['petaction'] = function(_, name)
+
+atype['petaction'] = function(_, name)
   -- ID doesn't exist for basic commands, even though they can be picked up
   local attributeName, attributeValue = "petaction_" .. tostring(name), "/cast "..tostring(name)
   if PETACTION_SCRIPT[name] then
     attributeValue, attributeName = unpack(PETACTION_SCRIPT[name])
+  elseif kb.PetCache.special[name] then
+    attributeName = "petaction_special" .. tonumber(kb.PetCache.special[name][2])
   end
-
   return CLICK_KEYBINDER_MACRO, attributeName, attributeValue
 end
 
-ACTION_HANDLERS['battlepet'] = function(id, name)
+atype['battlepet'] = function(id, name)
   return CLICK_KEYBINDER_MACRO, 'battlepet_' .. tostring(name), SLASH_SUMMON_BATTLE_PET1 .. " " .. tostring(name)
 end
-ACTION_HANDLERS['item'] = function(id, name)
+
+atype['item'] = function(id, name)
   return CLICK_KEYBINDER_KEY, 'item_' .. tostring(name), id
 end
 
@@ -64,8 +76,8 @@
 --- Resolves the SecureActionButton attribute names used for the given action
 kb.RegisterAction = function(actionType, id, name)
 
-  assert(ACTION_HANDLERS[actionType], 'Missing actionType handler for `'..tostring(actionType)..'`')
-  local target, attributeName, attributeValue  = ACTION_HANDLERS[actionType](id, name)
+  assert(atype[actionType], 'Missing actionType handler for `'..tostring(actionType)..'`')
+  local target, attributeName, attributeValue  = atype[actionType](id, name)
 
   local command = target .. attributeName
   local baseName, iterative = attributeName, 1
@@ -89,7 +101,6 @@
 
 
 
-kb.inactiveTalentBindings = {}
 kb.ApplyTalentBinding = function(talentInfo, cache)
   for i = 5, #talentInfo do
     local command = CLICK_KEYBINDER_KEY.. talentInfo[2]
@@ -101,9 +112,9 @@
 kb.CacheTalentBinding = function(talentInfo, cache)
 
   local spellID = talentInfo[4]
-  kb.inactiveTalentBindings[spellID] = kb.inactiveTalentBindings[spellID] or {}
-  kb.inactiveTalentBindings[spellID] = {select(5,unpack(talentInfo)) }
-  --cprint(spellID, unpack(kb.inactiveTalentBindings[spellID]))
+  cache[spellID] = cache[spellID] or {}
+  cache[spellID] = {select(5,unpack(talentInfo)) }
+  --cprint(spellID, unpack(kb.TalentBindings[spellID]))
 end
 
 do
@@ -150,7 +161,7 @@
     for spellName, talentInfo in pairs(profile.talents) do
       local dummy = GetSpellInfo(spellName)
       local func = kb.CacheTalentBinding
-      local dest = kb.inactiveTalentBindings
+      local dest = kb.TalentBindings
       if dummy then
         cprint('|cFFBBFF00Active:|r', dummy)
         local macroName, spellName, actionType, actionID = unpack(talentInfo)
@@ -168,7 +179,7 @@
   end
 
   kb.ApplyAllBindings =function ()
-    table.wipe(kb.inactiveTalentBindings)
+    table.wipe(kb.TalentBindings)
 
 
     -- reflect action key settings
@@ -189,4 +200,180 @@
 
     SaveBindings(GetCurrentBindingSet())
   end
+end
+
+
+local PET_SPECIAL_SUBTEXT = 'Special Ability'
+local SECONDARY_PROFESSIONS = {
+  [5] = 3,
+  [7] = 4,
+  [9] = 5,
+  [10] = 6
+}
+
+kb.TalentCache = {}
+kb.ProfessionCache = {}
+kb.PetCache = {}
+kb.specInfo = {}
+kb.UpdateSpecInfo = function()
+  kb.specInfo.id = GetSpecialization()
+  kb.specInfo.globalID, kb.specInfo.name, kb.specInfo.desc, kb.specInfo.texture = GetSpecializationInfo(kb.specInfo.id)
+  print('|cFF00FF00current spec:|r', kb.specInfo.id, 'of', GetNumSpecializations())
+end
+
+kb.UpdateTalentInfo = function()
+  if kb.talentsPushed then
+    return
+  end
+  table.wipe(kb.TalentCache)
+  for row =1, MAX_TALENT_TIERS do
+    for col = 1, NUM_TALENT_COLUMNS do
+      local talentID, talentName, icon, selected, available, spellID = GetTalentInfo(row, col, 1)
+      local talentInfo = kb.TalentCache[spellID] or {}
+      talentInfo.row = 1
+      talentInfo.col = col
+      talentInfo.name = talentName
+      talentInfo.talentID = talentID
+      talentInfo.selected = selected
+      talentInfo.available = available
+      talentInfo.spellID = spellID
+      kb.TalentCache[spellID] = talentInfo
+      kb.TalentCache[talentName] = talentInfo
+      print('Talent ', row, col, spellID, talentName)
+    end
+  end
+  kb.talentsPushed = true
+
+  kb.UpdateDynamicButtons('talent')
+end
+
+kb.UpdateProfessionInfo = function()
+  table.wipe(kb.ProfessionCache)
+  local profs = {GetProfessions() }
+  local primaryNum = 0
+  for i, index in ipairs(profs) do
+    local profName, texture, rank, maxRank, numSpells, spellOffset = GetProfessionInfo(index)
+    print(i, index, profName, numSpells, spellOffset)
+    if not SECONDARY_PROFESSIONS[index] then
+      primaryNum = primaryNum + 1
+    end
+    local profNum = SECONDARY_PROFESSIONS[index] or primaryNum
+
+
+    kb.ProfessionCache[profNum] = kb.ProfessionCache[i] or {}
+
+    for j = 1, numSpells do
+      local spellName, _, icon, _, _, _, spellID = GetSpellInfo(spellOffset+j, BOOKTYPE_PROFESSION)
+
+      local profInfo = {
+        spellName = spellName,
+        spellID = spellID,
+        icon = icon,
+        profOffset = i,
+        profIndex = index,
+        spellOffset = (spellOffset+j),
+        spellNum = j
+      }
+      KeyBinderKey:SetAttribute("*type-profession_"..i .. '_' ..j, "spell")
+      KeyBinderKey:SetAttribute("*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)
+    end
+
+  end
+
+  kb.UpdateDynamicButtons('profession')
+end
+
+
+
+kb.UpdatePetInfo = function()
+  kb.PetCache.spell = kb.PetCache.spell or {}
+  kb.PetCache.spellslot = kb.PetCache.spellslot or {}
+  kb.PetCache.action = kb.PetCache.action or {}
+  kb.PetCache.special = kb.PetCache.action or {}
+  local hasPetSpells, petType = HasPetSpells()
+  if PetHasSpellbook() then
+    print('PET SPELLBOOK')
+    local i = 1
+    local specialNum = 0
+    repeat
+
+      local spellType, spellID = GetSpellBookItemInfo(i, BOOKTYPE_PET)
+      local spellName, subText = GetSpellBookItemName(i, BOOKTYPE_PET)
+      local isPassive = IsPassiveSpell(i, BOOKTYPE_PET)
+      if not isPassive then
+        if spellName then
+          kb.PetCache.spellslot[spellName] = {i, spellName, subText}
+          print('|cFF00FF88spellslot['..spellName..']|r', '=>', i, subText)
+
+          if subText == PET_SPECIAL_SUBTEXT then
+            specialNum = specialNum + 1
+            kb.PetCache.special[spellName] = {i, specialNum, spellID, subText }
+            print('|cFF00FFFFspecial['..spellName..']|r', '=>', i, specialNum, spellID, subText)
+            KeyBinderMacro:SetAttribute("*macrotext-pet_special_"..specialNum, "/cast "..spellName)
+          end
+
+          if spellID then
+            kb.PetCache.spell[i] = {spellID, spellName, subText}
+            print('|cFF0088FFspell['..i..']|r', '=>', spellID, spellName, subText)
+          end
+        end
+
+
+      end
+
+      i = i + 1
+    until spellType == nil
+  else
+    print('NO PET SPELLBOOK')
+    table.wipe(kb.PetCache.spell)
+    table.wipe(kb.PetCache.spellslot)
+  end
+
+  if PetHasActionBar() then
+    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)
+    end
+  else
+    print('NO PET ACTION BAR')
+    table.wipe(kb.PetCache.action)
+  end
+
+  kb.UpdateDynamicButtons('petaction')
+
+end
+
+kb.UpdateSystemBinds = function()
+  table.wipe(kb.SystemBindings)
+  local n = GetNumBindings()
+  for i=1, n do
+    local command, key1, key2 = GetBinding(i)
+    if key1 then
+      kb.SystemBindings[key1] = command
+    end
+    if key2 then
+      kb.SystemBindings[key2] = command
+    end
+  end
+end
+
+kb.UpdateDynamicButtons = function(dynamicType)
+  for i, button in ipairs(kb.buttons) do
+    if button.isDynamic == dynamicType then
+      kb.UpdateSlot(button, true)
+    end
+  end
 end
\ No newline at end of file