# HG changeset patch # User Nenue # Date 1469925843 14400 # Node ID f6dd297cb8125e87cc5e7ae694b0b76c5e95c3bd # Parent 564015ef0317d5469aab5755a790127d3f6aa62d - fix pet stance/actioni bindings - fix pet action availability check diff -r 564015ef0317 -r f6dd297cb812 SkeletonKey/ActionTypes.lua --- a/SkeletonKey/ActionTypes.lua Sat Jul 30 20:28:15 2016 -0400 +++ b/SkeletonKey/ActionTypes.lua Sat Jul 30 20:44:03 2016 -0400 @@ -20,14 +20,14 @@ local PET_BASIC_SUBTEXT = 'Basic Attack' local PET_SPECIAL_SUBTEXT = 'Special Ability' local PETACTION_SCRIPT = { - [PET_ACTION_MOVE_TO] = {SLASH_PET_MOVE_TO1, 'pet_move_to'}, - [PET_ACTION_ATTACK] = {SLASH_PET_ATTACK1, 'pet_attack'}, - [PET_ACTION_FOLLOW] = {SLASH_PET_FOLLOW1, 'pet_follow'}, - [PET_ACTION_WAIT] = {SLASH_PET_STAY1, 'pet_stay'}, - [PET_MODE_AGGRESSIVE] = {SLASH_PET_AGGRESSIVE1, 'pet_aggressive'}, - [PET_MODE_DEFENSIVE] = {SLASH_PET_DEFENSIVE1, 'pet_defensive'}, - [PET_MODE_PASSIVE] = {SLASH_PET_PASSIVE1, 'pet_passive'}, - [PET_MODE_ASSIST] = {SLASH_PET_ASSIST1, 'pet_assist'}, + [PET_ACTION_MOVE_TO] = {'pet_move_to', SLASH_PET_MOVE_TO1}, + [PET_ACTION_ATTACK] = {'pet_attack', SLASH_PET_ATTACK1}, + [PET_ACTION_FOLLOW] = {'pet_follow', SLASH_PET_FOLLOW1}, + [PET_ACTION_WAIT] = {'pet_stay', SLASH_PET_STAY1 }, + [PET_MODE_AGGRESSIVE] = {'pet_aggressive', SLASH_PET_AGGRESSIVE1 }, + [PET_MODE_DEFENSIVE] = { 'pet_defensive', SLASH_PET_DEFENSIVE1}, + [PET_MODE_PASSIVE] = { 'pet_passive', SLASH_PET_PASSIVE1}, + [PET_MODE_ASSIST] = {'pet_assist', SLASH_PET_ASSIST1}, } local SECONDARY_PROFESSIONS = { [5] = 3, @@ -79,7 +79,7 @@ -- 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]) + attributeName, attributeValue = unpack(PETACTION_SCRIPT[name]) elseif kb.PetCache.special[name] then attributeName = "petaction_"..kb.PetCache.special[name][3].."_" .. tonumber(kb.PetCache.special[name][6]) end diff -r 564015ef0317 -r f6dd297cb812 SkeletonKey/KeySlot.lua --- a/SkeletonKey/KeySlot.lua Sat Jul 30 20:28:15 2016 -0400 +++ b/SkeletonKey/KeySlot.lua Sat Jul 30 20:44:03 2016 -0400 @@ -510,12 +510,13 @@ if kb.PetCache.subtext[specialType] and kb.PetCache.subtext[specialType][tonumber(specialNum)] then print('***dynamic pet thign', specialType, specialNum) - isAvailable = true --[[ i, spellName, subText, spellID, texture, specialNum[subText ]] pickupSlot, name, specialType, actionID, icon, specialNum = unpack(kb.PetCache.subtext[specialType][tonumber(specialNum)]) pickupBook = BOOKTYPE_PET end + isAvailable = (kb.PetCache.spellslot[name]) + elseif actionType == 'macro' then if not actionID then