From 3f3224f0a5dcd2bea3f780f621d2cddbc4c4f3fb Mon Sep 17 00:00:00 2001 From: Brad Morgan Date: Mon, 10 Jun 2024 09:24:35 -0600 Subject: [PATCH] Update scrollData and Enchanting Vellum --- Skillet-Classic.toc | 9 +- Skillet.lua | 2 +- SkilletData.lua | 967 +++++++++++++++----------------------------- SkilletData2.lua | 574 ++++++++++++++------------ SkilletNewsData.lua | 1 + SkilletOptions.lua | 2 + 6 files changed, 645 insertions(+), 910 deletions(-) diff --git a/Skillet-Classic.toc b/Skillet-Classic.toc index c4bb439..89c8fe6 100644 --- a/Skillet-Classic.toc +++ b/Skillet-Classic.toc @@ -1,14 +1,10 @@ -## Interface: 10000 -## Interface-Classic: 11502 -## Interface-BCC: 20504 -## Interface-Wrath: 30403 -## Interface-Cata: 40400 +## Interface: 40400 ## Title: Skillet-Classic |cff7fff7f -Ace3-|r ## Notes: A replacement tradeskill window ## Notes-esES: Una sustitucion de la ventana de Habilidades de Comercio ## Notes-ruRU: Заменяет окно профессий на более функциональное. ## Author: bsmorgan -## Version: @project-version@ +## Version: 1.92-alpha1 ## X-Category: Tradeskill ## X-License GPL v3 or later ## X-Curse-Project-ID: 447401 @@ -60,6 +56,7 @@ Locale\Locale-zhTW.lua Skillet.lua SkilletOptions.lua SkilletData.lua +## SkilletData2.lua SkilletNewsGUI.lua SkilletNewsData.lua SkilletARL.lua diff --git a/Skillet.lua b/Skillet.lua index c2a6278..eed4c6d 100644 --- a/Skillet.lua +++ b/Skillet.lua @@ -83,7 +83,7 @@ local defaults = { queue_crafts = false, include_craftbuttons = true, enchant_scrolls = false, - use_higher_vellum = false, +-- use_higher_vellum = false, include_tradebuttons = true, search_includes_reagents = true, interrupt_clears_queue = false, diff --git a/SkilletData.lua b/SkilletData.lua index 0d8056f..88d0132 100644 --- a/SkilletData.lua +++ b/SkilletData.lua @@ -389,21 +389,25 @@ Skillet.TradeSkillAutoTarget = { }, [7411] = { -- Enchanting [38682] = 1, -- Armor Vellum +--[[ [37602] = 1, -- Armor Vellum II [43145] = 1, -- Armor Vellum III [39349] = 1, -- Weapon Vellum [39350] = 1, -- Weapon Vellum II [43146] = 1, -- Weapon Vellum III +]]-- }, } local defaultVellum = 38682 +--[[ Skillet.subVellum = { [38682] = {37602, 43145}, -- Armor Vellum [37602] = {43145}, -- Armor Vellum II [39349] = {39350, 43146}, -- Weapon Vellum [39350] = {43146}, -- Weapon Vellum II } +]]-- local lastAutoTarget = {} function Skillet:GetAutoTargetItem(tradeID, spellID) @@ -411,7 +415,8 @@ function Skillet:GetAutoTargetItem(tradeID, spellID) local itemID, limit, count, itemName if self.TradeSkillAutoTarget[tradeID] then if not Skillet.isCraft and tradeID == 7411 then - itemID = self.vellumData[spellID] or defaultVellum +-- itemID = self.vellumData[spellID] or defaultVellum + itemID = defaultVellum limit = self.TradeSkillAutoTarget[tradeID][itemID] itemName = GetItemInfo(itemID) count = GetItemCount(itemID) @@ -420,6 +425,7 @@ function Skillet:GetAutoTargetItem(tradeID, spellID) return itemID, itemName else DA.DEBUG(1,"GetAutoTargetItem: need itemID= "..tostring(itemID).." ("..tostring(itemName)..")") +--[[ if self.db.profile.use_higher_vellum and self.subVellum[itemID] then for i=1,#self.subVellum[itemID],1 do local subItem = self.subVellum[itemID][i] @@ -431,6 +437,7 @@ function Skillet:GetAutoTargetItem(tradeID, spellID) end end end +]]-- end return nil, itemName else @@ -1305,646 +1312,322 @@ end -- -- Table used to convert Enchant to Scroll -- -Skillet.scrollData = { - -- Scraped from WoWhead using the following javascript: - -- for (i=0; i