From e50e6e2f7e7be587a62d89fd866647fc8f7f6b50 Mon Sep 17 00:00:00 2001 From: "James D. Callahan III" Date: Mon, 29 Mar 2010 20:56:59 -0400 Subject: [PATCH] Moved the PROFESSIONS and ORDERED_PROFESSIONS tables from Datamine.lua to constants.lua as lowercased members of the private table. --- Constants.lua | 37 ++++++++++++++++++++++++++++++++++++- Datamine.lua | 34 +++------------------------------- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/Constants.lua b/Constants.lua index 890ffd8..deb13f4 100644 --- a/Constants.lua +++ b/Constants.lua @@ -28,6 +28,38 @@ local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) local private = select(2, ...) ------------------------------------------------------------------------------- +-- Profession data. +private.professions = { + ["Alchemy"] = GetSpellInfo(51304), + ["Blacksmithing"] = GetSpellInfo(51300), + ["Cooking"] = GetSpellInfo(51296), + ["Enchanting"] = GetSpellInfo(51313), + ["Engineering"] = GetSpellInfo(51306), + ["FirstAid"] = GetSpellInfo(45542), + ["Inscription"] = GetSpellInfo(45363), + ["Jewelcrafting"] = GetSpellInfo(51311), + ["Leatherworking"] = GetSpellInfo(51302), + ["Runeforging"] = GetSpellInfo(53428), + ["Smelting"] = GetSpellInfo(2656), + ["Tailoring"] = GetSpellInfo(51309), +} + +private.ordered_professions = { + private.professions.Alchemy, -- 1 + private.professions.Blacksmithing, -- 2 + private.professions.Cooking, -- 3 + private.professions.Enchanting, -- 4 + private.professions.Engineering, -- 5 + private.professions.FirstAid, -- 6 + private.professions.Inscription, -- 7 + private.professions.Jewelcrafting, -- 8 + private.professions.Leatherworking, -- 9 + private.professions.Runeforging, -- 10 + private.professions.Smelting, -- 11 + private.professions.Tailoring, -- 12 +} + +------------------------------------------------------------------------------- -- Item qualities. ------------------------------------------------------------------------------- private.item_qualities = { @@ -48,6 +80,9 @@ private.item_quality_names = { [6] = "ARTIFACT", } +------------------------------------------------------------------------------- +-- Game/expansion versions. +------------------------------------------------------------------------------- private.game_versions = { ["ORIG"] = 1, ["TBC"] = 2, @@ -139,7 +174,7 @@ private.filter_strings = { private.acquire_types = { ["TRAINER"] = 1, ["VENDOR"] = 2, - ["MOB_DROP"] = 3, + ["MOB_DROP"] = 3, ["QUEST"] = 4, ["SEASONAL"] = 5, ["REPUTATION"] = 6, diff --git a/Datamine.lua b/Datamine.lua index f29acbd..d9dd25c 100644 --- a/Datamine.lua +++ b/Datamine.lua @@ -64,23 +64,7 @@ local private = select(2, ...) local F = private.filter_flags local A = private.acquire_types -------------------------------------------------------------------------------- --- Tradeskill professions -------------------------------------------------------------------------------- -local PROFESSIONS = { - ["Alchemy"] = GetSpellInfo(51304), - ["Blacksmithing"] = GetSpellInfo(51300), - ["Cooking"] = GetSpellInfo(51296), - ["Enchanting"] = GetSpellInfo(51313), - ["Engineering"] = GetSpellInfo(51306), - ["FirstAid"] = GetSpellInfo(45542), - ["Inscription"] = GetSpellInfo(45363), - ["Jewelcrafting"] = GetSpellInfo(51311), - ["Leatherworking"] = GetSpellInfo(51302), - ["Runeforging"] = GetSpellInfo(53428), - ["Smelting"] = GetSpellInfo(32606), - ["Tailoring"] = GetSpellInfo(51309), -} +local PROFESSIONS = private.professions ------------------------------------------------------------------------------- -- Mined via Data-tools @@ -1363,20 +1347,8 @@ end --- Scans the items in the specified profession ------------------------------------------------------------------------------- do - local ORDERED_PROFESSIONS = { - string.lower(PROFESSIONS.Alchemy), -- 1 - string.lower(PROFESSIONS.Blacksmithing), -- 2 - string.lower(PROFESSIONS.Cooking), -- 3 - string.lower(PROFESSIONS.Enchanting), -- 4 - string.lower(PROFESSIONS.Engineering), -- 5 - string.lower(PROFESSIONS.FirstAid), -- 6 - string.lower(PROFESSIONS.Inscription), -- 7 - string.lower(PROFESSIONS.Jewelcrafting), -- 8 - string.lower(PROFESSIONS.Leatherworking), -- 9 - string.lower(PROFESSIONS.Runeforging), -- 10 - string.lower(PROFESSIONS.Smelting), -- 11 - string.lower(PROFESSIONS.Tailoring), -- 12 - } + local ORDERED_PROFESSIONS = private.ordered_professions + local recipe_list = {} local output = {} -- 1.7.9.5