From dc312156313aa48ae7be414cdb0f8f84374268bc Mon Sep 17 00:00:00 2001 From: pompachomp Date: Sun, 31 Jan 2010 17:46:12 +0000 Subject: [PATCH] Fixed some formatting stuff. --- .pkgmeta | 6 +++--- ARL.lua | 10 ++++----- Config.lua | 6 +++--- Database/Jewelcrafting.lua | 28 ++++++++++++------------- Database/Tailoring.lua | 10 ++++----- Docs/CHANGES.txt | 1 + Frame.lua | 50 ++++++++++++++++++++++---------------------- 7 files changed, 56 insertions(+), 55 deletions(-) diff --git a/.pkgmeta b/.pkgmeta index c119133..92613b4 100644 --- a/.pkgmeta +++ b/.pkgmeta @@ -2,9 +2,9 @@ license-output: LICENSE.txt -#manual-changelog: -# filename: Docs/CHANGES.txt -# markup-type: creole +manual-changelog: + filename: Docs/CHANGES.txt + markup-type: creole enable-nolib-creation: yes diff --git a/ARL.lua b/ARL.lua index 3fd7b6e..fd25e14 100644 --- a/ARL.lua +++ b/ARL.lua @@ -670,7 +670,7 @@ function addon:OnEnable() [GetSpellInfo(17039)] = 17039, -- Master Swordsmith [GetSpellInfo(9787)] = 9787, -- Weaponsmith } - + local EngineeringSpec = { [GetSpellInfo(20219)] = 20219, -- Gnomish [GetSpellInfo(20222)] = 20222, -- Goblin @@ -760,7 +760,7 @@ do scan_button:SetParent(TradeSkillFrame) scan_parent = scan_button:GetParent() end - + if scan_parent == TradeSkillFrame then scan_button:ClearAllPoints() @@ -1590,7 +1590,7 @@ do recipe["Known"] = true recipes_found = recipes_found + 1 else - self:Print(self:Red(tradeName .. " " .. SpellString) .. self:White(L["MissingFromDB"])) + self:Print(self:Red(tradeName .. " " .. SpellString) .. self:White(L["MissingFromDB"])) end end end @@ -1673,7 +1673,7 @@ do [A_WORLD_DROP] = "World Drop", [A_CUSTOM] = "Custom", } - + local FILTER_NAMES = { [1] = "Alliance", [2] = "Horde", @@ -1765,7 +1765,7 @@ do [127] = "Alliance Vanguard/Horde Expedition", [128] = "The Ashen Verdict", } - + function addon:GetTextDump(RecipeDB, profession) twipe(text_table) diff --git a/Config.lua b/Config.lua index 7fd7838..bfd67f0 100644 --- a/Config.lua +++ b/Config.lua @@ -633,7 +633,7 @@ local function giveDisplay() addon.db.profile.spelltooltiplocation = name end, values = function() - return { + return { Right = L["Right"], Left = L["Left"], Top = L["Top"], @@ -658,13 +658,13 @@ function addon:SetupOptions() self:RegisterModuleOptions("Display", giveDisplay(), L["Display Options"]) self:RegisterModuleOptions("Map", giveMap(), L["Map Options"]) self:RegisterModuleOptions("Documentation", giveDocs(), L["ARL Documentation"]) - + -- Add in the about panel to the Bliz options (not apart of the ace3 config) if LibStub:GetLibrary("LibAboutPanel", true) then self.optionsFrame["About"] = LibStub:GetLibrary("LibAboutPanel").new(MODNAME, MODNAME) else self:Print("Lib AboutPanel not loaded.") - end + end end -- Description: Function which extends our options table in a modular way diff --git a/Database/Jewelcrafting.lua b/Database/Jewelcrafting.lua index ae5409b..8b5c326 100644 --- a/Database/Jewelcrafting.lua +++ b/Database/Jewelcrafting.lua @@ -3,8 +3,8 @@ Jewelcrafting.lua Jewelcrafting data for all of Ackis Recipe List ************************************************************************ -File date: @file-date-iso@ -File revision: @file-revision@ +File date: @file-date-iso@ +File revision: @file-revision@ Project revision: @project-revision@ Project version: @project-version@ ************************************************************************ @@ -460,7 +460,7 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 28953, F_ALLIANCE, F_HORDE, 3, 36, 41, 53, 54) self:addTradeAcquire(RecipeDB, 28953, 1, 26997, 1, 26960, 1, 26982, 1, 19063, 1, 19539, 1, 18751, 1, 26915, 1, 18774, 1, 28701, 1, 33590, 1, 33614, 1, 33680) - -- Stormy Azure Moonstone -- 28955 + -- Stormy Azure Moonstone -- 28955 AddRecipe(28955, 315, 23120, 2, 1, 315, 315, 335, 355) self:addTradeFlags(RecipeDB, 28955, F_ALLIANCE, F_HORDE, 10, 36, 40, 54) self:addTradeAcquire(RecipeDB, 28955, 7, 2) @@ -575,7 +575,7 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 31070, F_ALLIANCE, F_HORDE, 10, 36, 40, 51, 63) self:addTradeAcquire(RecipeDB, 31070, 7, 3) - -- Eye of the Night -- 31071 + -- Eye of the Night -- 31071 AddRecipe(31071, 360, 24116, 3, 1, 360, 370, 375, 380) self:addTradeFlags(RecipeDB, 31071, F_ALLIANCE, F_HORDE, 10, 36, 40, 53, 54, 63) self:addTradeAcquire(RecipeDB, 31071, 7, 3) @@ -1135,7 +1135,7 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 39739, F_ALLIANCE, F_HORDE, 4, 36, 41, 52, 109, 112) self:addTradeAcquire(RecipeDB, 39739, 6, 1077, 3, 25950, 6, 990, 3, 23437, 6, 1077, 3, 27666) - -- Radiant Seaspray Emerald -- 39740 + -- Radiant Seaspray Emerald -- 39740 AddRecipe(39740, 375, 32224, 1, 1, 375, 375, 380, 385) self:addTradeFlags(RecipeDB, 39740, F_ALLIANCE, F_HORDE, 4, 36, 41, 54, 109, 112) self:addTradeAcquire(RecipeDB, 39740, 6, 1077, 2, 25950, 6, 990, 2, 23437, 6, 1077, 2, 27666) @@ -1450,7 +1450,7 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 53864, F_ALLIANCE, F_HORDE, 3, 36, 41, 53, 54) self:addTradeAcquire(RecipeDB, 53864, 1, 26915, 1, 26960, 1, 26982, 1, 26997, 1, 28701, 1, 33590) - -- Mysterious Shadow Crystal -- 53865 + -- Mysterious Shadow Crystal -- 53865 AddRecipe(53865, 350, 39945, 2, 2, 350, 375, 395, 415) self:addTradeFlags(RecipeDB, 53865, F_ALLIANCE, F_HORDE, 4, 9, 36, 41, 53, 54) self:addTradeAcquire(RecipeDB, 53865, 2, 34079, 2, 34039) @@ -1675,17 +1675,17 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 53930, F_ALLIANCE, F_HORDE, 3, 36, 41, 53, 54) self:addTradeAcquire(RecipeDB, 53930, 1, 26915, 1, 26960, 1, 26982, 1, 26997, 1, 28701, 1, 33590) - -- Radiant Dark Jade -- 53931 + -- Radiant Dark Jade -- 53931 AddRecipe(53931, 350, 39990, 2, 2, 350, 375, 395, 415) self:addTradeFlags(RecipeDB, 53931, F_ALLIANCE, F_HORDE, 3, 36, 41, 54) self:addTradeAcquire(RecipeDB, 53931, 1, 26915, 1, 26960, 1, 26982, 1, 26997, 1, 28701, 1, 33590) - -- Tense Dark Jade -- 53932 + -- Tense Dark Jade -- 53932 AddRecipe(53932, 350, 39991, 2, 2, 350, 375, 395, 415) self:addTradeFlags(RecipeDB, 53932, F_ALLIANCE, F_HORDE, 4, 9, 36, 41, 54) self:addTradeAcquire(RecipeDB, 53932, 2, 34079, 2, 34039) - -- Shattered Dark Jade -- 53933 + -- Shattered Dark Jade -- 53933 AddRecipe(53933, 350, 39992, 2, 2, 350, 375, 395, 415) self:addTradeFlags(RecipeDB, 53933, F_ALLIANCE, F_HORDE, 4, 9, 36, 41, 54) self:addTradeAcquire(RecipeDB, 53933, 2, 34079, 2, 34039) @@ -1755,7 +1755,7 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 53954, F_ALLIANCE, F_HORDE, 4, 36, 41, 53, 54) self:addTradeAcquire(RecipeDB, 53954, 2, 28721, 2, 33602) - -- Stormy Sky Sapphire -- 53955 + -- Stormy Sky Sapphire -- 53955 AddRecipe(53955, 390, 40011, 3, 2, 390, 410, 425, 440) self:addTradeFlags(RecipeDB, 53955, F_ALLIANCE, F_HORDE, 4, 9, 36, 41, 54) self:addTradeAcquire(RecipeDB, 53955, 2, 30489, 2, 32294, 2, 32296) @@ -2030,17 +2030,17 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 54011, F_ALLIANCE, F_HORDE, 4, 36, 41, 53, 54) self:addTradeAcquire(RecipeDB, 54011, 2, 28721, 2, 33602) - -- Radiant Forest Emerald -- 54012 + -- Radiant Forest Emerald -- 54012 AddRecipe(54012, 390, 40098, 3, 2, 390, 410, 425, 440) self:addTradeFlags(RecipeDB, 54012, F_ALLIANCE, F_HORDE, 11, 36, 41, 54) self:addTradeAcquire(RecipeDB, 54012, 3, 29792, 3, 29793) - -- Tense Forest Emerald -- 54013 + -- Tense Forest Emerald -- 54013 AddRecipe(54013, 390, 40101, 3, 2, 390, 410, 425, 440) self:addTradeFlags(RecipeDB, 54013, F_ALLIANCE, F_HORDE, 4, 9, 36, 41, 54) self:addTradeAcquire(RecipeDB, 54013, 2, 30489, 2, 32294, 2, 32296) - -- Shattered Forest Emerald -- 54014 + -- Shattered Forest Emerald -- 54014 AddRecipe(54014, 390, 40106, 3, 2, 390, 410, 425, 440) self:addTradeFlags(RecipeDB, 54014, F_ALLIANCE, F_HORDE, 4, 9, 36, 41, 54) self:addTradeAcquire(RecipeDB, 54014, 2, 30489, 2, 32294, 2, 32296) @@ -2245,7 +2245,7 @@ function addon:InitJewelcrafting(RecipeDB) self:addTradeFlags(RecipeDB, 56087, F_ALLIANCE, F_HORDE, 4, 37, 41, 53, 54) self:addTradeAcquire(RecipeDB, 56087, 2, 28721, 2, 33602) - -- Stormy Dragon's Eye -- 56088 + -- Stormy Dragon's Eye -- 56088 AddRecipe(56088, 370, 42155, 3, 2, 370, 390, 415, 440) self:addTradeFlags(RecipeDB, 56088, F_ALLIANCE, F_HORDE, 4, 37, 41, 54) self:addTradeAcquire(RecipeDB, 56088, 2, 28721, 2, 33602) diff --git a/Database/Tailoring.lua b/Database/Tailoring.lua index a5e1b7f..28a9b28 100644 --- a/Database/Tailoring.lua +++ b/Database/Tailoring.lua @@ -3,8 +3,8 @@ Tailoring.lua Tailoring data for all of Ackis Recipe List ************************************************************************ -File date: @file-date-iso@ -File revision: @file-revision@ +File date: @file-date-iso@ +File revision: @file-revision@ Project revision: @project-revision@ Project version: @project-version@ ************************************************************************ @@ -2316,17 +2316,17 @@ function addon:InitTailoring(RecipeDB) AddRecipe(70550,450,49891,4,2,450,475,487,500) self:addTradeFlags(RecipeDB,70550,F_ALLIANCE,F_HORDE,F_VENDOR,F_ASHEN_VERDICT) self:addTradeAcquire(RecipeDB, 70550, A_REPUTATION, 1156, REVERED, 37687) - + -- Deathfrost Boots -- 70551 AddRecipe(70551,450,49890,4,2,450,475,487,500) self:addTradeFlags(RecipeDB,70551,F_ALLIANCE,F_HORDE,F_VENDOR,F_ASHEN_VERDICT) self:addTradeAcquire(RecipeDB, 70551, A_REPUTATION, 1156, HONORED, 37687) - + -- Lightweave Leggings -- 70552 AddRecipe(70552,450,49892,4,2,450,475,487,500) self:addTradeFlags(RecipeDB,70552,F_ALLIANCE,F_HORDE,F_VENDOR,F_ASHEN_VERDICT) self:addTradeAcquire(RecipeDB, 70552, A_REPUTATION, 1156, REVERED, 37687) - + -- Sandals of Consecration -- 70553 AddRecipe(70553,450,49893,4,2,450,475,487,500) self:addTradeFlags(RecipeDB,70553,F_ALLIANCE,F_HORDE,F_VENDOR,F_ASHEN_VERDICT) diff --git a/Docs/CHANGES.txt b/Docs/CHANGES.txt index a7eaf83..1e7559c 100644 --- a/Docs/CHANGES.txt +++ b/Docs/CHANGES.txt @@ -1,6 +1,7 @@ ==ARL Change Log ===Version 2818 +*INSTALL A FRESH ACKISRECIPELIST DIRECTORY OF THIS VERSION IN YOUR ADDONS FOLDER. *Removed the "Scan" and "Text Dump" buttons from the config options since they were not actually usable *Improved the Text Dump display for all the recipes. *Fixed some incorrect data in the database and added missing data. diff --git a/Frame.lua b/Frame.lua index 94f11fe..cbd4739 100644 --- a/Frame.lua +++ b/Frame.lua @@ -60,20 +60,20 @@ local Player = addon.Player ------------------------------------------------------------------------------- -- Constants ------------------------------------------------------------------------------- -local SortedProfessions = { -- To make tabbing between professions easier - { name = GetSpellInfo(51304), texture = "alchemy" }, -- 1 - { name = GetSpellInfo(51300), texture = "blacksmith" }, -- 2 - { name = GetSpellInfo(51296), texture = "cooking" }, -- 3 - { name = GetSpellInfo(51313), texture = "enchant" }, -- 4 - { name = GetSpellInfo(51306), texture = "engineer" }, -- 5 - { name = GetSpellInfo(45542), texture = "firstaid" }, -- 6 - { name = GetSpellInfo(45363), texture = "inscribe" }, -- 7 - { name = GetSpellInfo(51311), texture = "jewel" }, -- 8 - { name = GetSpellInfo(51302), texture = "leather" }, -- 9 - { name = GetSpellInfo(53428), texture = "runeforge" }, -- 10 - { name = GetSpellInfo(32606), texture = "smelting" }, -- 11 - { name = GetSpellInfo(51309), texture = "tailor" }, -- 12 -} +local SortedProfessions = { -- To make tabbing between professions easier + { name = GetSpellInfo(51304), texture = "alchemy" }, -- 1 + { name = GetSpellInfo(51300), texture = "blacksmith" }, -- 2 + { name = GetSpellInfo(51296), texture = "cooking" }, -- 3 + { name = GetSpellInfo(51313), texture = "enchant" }, -- 4 + { name = GetSpellInfo(51306), texture = "engineer" }, -- 5 + { name = GetSpellInfo(45542), texture = "firstaid" }, -- 6 + { name = GetSpellInfo(45363), texture = "inscribe" }, -- 7 + { name = GetSpellInfo(51311), texture = "jewel" }, -- 8 + { name = GetSpellInfo(51302), texture = "leather" }, -- 9 + { name = GetSpellInfo(53428), texture = "runeforge" }, -- 10 + { name = GetSpellInfo(32606), texture = "smelting" }, -- 11 + { name = GetSpellInfo(51309), texture = "tailor" }, -- 12 +} local CATEGORY_TEXT = { ["general"] = _G.GENERAL, @@ -529,7 +529,7 @@ do end local function SetSpellTooltip(owner, loc, link) - local anchor = + local anchor = spell_tip:SetOwner(owner, "ANCHOR_NONE") spell_tip:ClearAllPoints() @@ -652,7 +652,7 @@ do elseif skill_level - recipe_level < 30 then color_2 = addon:hexcolor("YELLOW") elseif skill_level - recipe_level < 40 then - color_2 = addon:hexcolor("GREEN") + color_2 = addon:hexcolor("GREEN") else color_2 = addon:hexcolor("MIDGREY") end @@ -1095,7 +1095,7 @@ MainPanel.mode_button:SetScript("OnClick", endLoop = MainPanel.profession end local index = startLoop - + while index ~= endLoop do if index > NUM_PROFESSIONS then index = 1 @@ -1227,7 +1227,7 @@ do end end -function addon.resetFilters() +function addon.resetFilters() local filterdb = addon.db.profile.filters -- Reset all filters to true @@ -1332,7 +1332,7 @@ do cButton:SetWidth(ExpTextureSize) cButton:SetHeight(ExpTextureSize) cButton:SetScript("OnClick", - function(self, button, down) + function(self, button, down) ToggleFilterMenu(category) end) @@ -1931,7 +1931,7 @@ do -- And throw up a tooltip SetTooltipScripts(cButton, tooltip_text) - + return cButton end @@ -2498,7 +2498,7 @@ do t.recipe_id = recipe_id t.is_expanded = true - t.text = pad .. pad .. faction_strings[acquire["RepLevel"]] .. nStr + t.text = pad .. pad .. faction_strings[acquire["RepLevel"]] .. nStr tinsert(self.entries, entry_index, t) entry_index = entry_index + 1 @@ -2704,7 +2704,7 @@ do local acquire_id = acquire_entry["ID"] local display = false - if acquire_type == A_TRAINER and maptrainer then + if acquire_type == A_TRAINER and maptrainer then local trainer = addon.trainer_list[acquire_id] display = (trainer["Faction"] == BFAC[player_faction] or trainer["Faction"] == FACTION_NEUTRAL) @@ -3019,7 +3019,7 @@ do -- ARLWorldMap:ClearAllPoints() -- ARLWorldMap:SetWidth(8) -- ARLWorldMap:SetHeight(8) - -- ARLWorldMap.icon = ARLWorldMap:CreateTexture("ARTWORK") + -- ARLWorldMap.icon = ARLWorldMap:CreateTexture("ARTWORK") -- ARLWorldMap.icon:SetTexture(icontext) -- ARLWorldMap.icon:SetAllPoints() @@ -3027,7 +3027,7 @@ do -- ARLMiniMap:ClearAllPoints() -- ARLMiniMap:SetWidth(8) -- ARLMiniMap:SetHeight(8) - -- ARLMiniMap.icon = ARLMiniMap:CreateTexture("ARTWORK") + -- ARLMiniMap.icon = ARLMiniMap:CreateTexture("ARTWORK") -- ARLMiniMap.icon:SetTexture(icontext) -- ARLMiniMap.icon:SetAllPoints() @@ -3240,7 +3240,7 @@ local function SelectName(cell, arg, button) for name in pairs(tskl_list[click_info.realm]) do found = true end - if not found then + if not found then tskl_list[click_info.realm] = nil end local anchor = click_info.anchor -- 1.7.9.5