From 50f594c178a80f6e6d1a42684e5ea98c95ea0232 Mon Sep 17 00:00:00 2001 From: Ackis Date: Fri, 7 Nov 2008 16:47:26 +0000 Subject: [PATCH] Add missing reference for Skillet integration and change ID checking to check for both enchant and spell based off of needs by lilsparky --- AckisRecipeList.lua | 14 ++++++++++---- AckisRecipeList.toc | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua index 9adff40..04e77fb 100644 --- a/AckisRecipeList.lua +++ b/AckisRecipeList.lua @@ -287,13 +287,14 @@ function addon:OnEnable() -- If we're using Skillet, use Skillet's API to work with getting tradeskills if (Skillet) and (Skillet.GetNumTradeSkills) and (Skillet.GetTradeSkillLine) and (Skillet.GetTradeSkillInfo) and - (Skillet.GetTradeSkillRecipeLink) then + (Skillet.GetTradeSkillRecipeLink) and (Skillet.ExpandTradeSkillSubClass) then self:Print("Enabling Skillet advanced features.") GetNumTradeSkills = function(...) return Skillet:GetNumTradeSkills(...) end GetTradeSkillLine = function(...) return Skillet:GetTradeSkillLine(...) end GetTradeSkillInfo = function(...) return Skillet:GetTradeSkillInfo(...) end GetTradeSkillRecipeLink = function(...) return Skillet:GetTradeSkillRecipeLink(...) end + ExpandTradeSkillSubClass = function(...) return Skillet:ExpandTradeSkillSubClass(...) end end @@ -688,6 +689,12 @@ end ]]-- +local function GetID(SpellLink) + + return select(3,sfind(SpellLink, "\124H%w+:(%d+):")) + +end + -- Description: Scans the recipe listing and marks known recipes as true in the database -- Expected result: The array of Recipes will have all known recipes toggles to true -- Input: Recipe Array @@ -737,9 +744,8 @@ function addon:ScanForKnownRecipes(RecipeDB, playerData) -- Get the trade skill link for the specified recipe local SpellLink = GetTradeSkillRecipeLink(i) - -- Get the SpellID from the spell link - local _,_,SpellString = sfind(SpellLink, "enchant:(%d+)") - local SpellID = tonumber(SpellString) + -- Get the SpellID from the spell link or enchant link (to account for Skillet) + local SpellID = tonumber(GetID(SpellLink)) -- Spell ID is in RecipeDB so lets flag it as known if (RecipeDB[SpellID]) then diff --git a/AckisRecipeList.toc b/AckisRecipeList.toc index c7c7fa9..b948d05 100644 --- a/AckisRecipeList.toc +++ b/AckisRecipeList.toc @@ -15,7 +15,7 @@ ## eMail: ackis AT shaw DOT ca ## X-email: ackis AT shaw DOT ca ## X-License: MIT modified with notification clause -## X-Donate: Donate a few bucks/hours at your local animal shelter, or send me UDE Point codes, or a Murky Code. +## X-Donate: Donate a few bucks/hours at your local animal shelter, send me UDE Point codes, or a Murky Code. ## Interface: 30000 ## Version: Beta 9 @project-revision@ -- 1.7.9.5