diff --git a/ARLFrame.lua b/ARLFrame.lua index 57455b5..cd8a4d2 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -6,10 +6,10 @@ ARLFrame.lua Frame functions for all of AckisRecipeList -File date: 2009-08-31T22:18:19Z -File revision: 2398 -Project revision: 2398 -Project version: r2398 +File date: @file-date-iso@ +File revision: @file-revision@ +Project revision: @project-revision@ +Project version: @project-version@ **************************************************************************************** @@ -391,8 +391,6 @@ local function SetSortString(recipeSkill, recStr) end --- Description: - local function CheckDisplayFaction(filterDB, faction) if (filterDB.general.faction ~= true) then @@ -501,80 +499,6 @@ do local BZ = LibStub("LibBabble-Zone-3.0"):GetLookupTable() - local dungeonlist = { - -- Ahn'kahet: The Old Kingdom - 29311, - -- Auchenai Crypts - 18497, 18521, - -- Azjol-Nerub - 29120, - -- Blackrock Depths - 8897, 8898, 8903, 8920, 8983, 9024, 9025, 9028, 9499, 9543, 9554, 10043, - -- Blackrock Spire - 9216, 9259, 9260, 9262, 9264, 9596, 9736, 10264, 10317, 10339, 10363, 10899, - -- Blackwing Lair - 14401, - -- Dire Maul - 11487, 14354, - -- Drak'Tharon Keep - 26632, - -- Gnomeregan - 7800, - -- Halls of Lightning - 28923, - -- Halls of Stone - 27978, - -- Karazhan - 16406, 16408, 16472, 15687, 15688, 16152, 16524, - -- Magister's Terrace - 24560, 24664, - -- Mana-Tombs - 18314, 18317, 18344, - -- Oculus - 27656, - -- Old Hillsbrad Foothills - 17820, 17862, 18096, 28132, - -- Ruins of Ahn'Qiraj - 15340, - -- Scholomance - 1853, 10469, 10499, 10503, 10508, - -- Sethekk Halls - 18320, 18322, 18472, - -- Shadow Labyrinth - 18667, 18708, 18830, - -- Stratholme - 10398, 10422, 10426, 10813, 10438, 10997, - -- Temple of Ahn'Qiraj - 15263, 15275, 15276, - -- The Arcatraz - 20869, 20880, 20898, 20900, 20885, - --The Black Morass - 21104, 17839, 17879, - -- The Botanica - 17975, 18422, 17977, 17978, - -- The Deadmines - 657, - 1732, - -- The Mechanar - 19168, 19219, 19220, 19221, - -- The Nexus - 26723, - -- The Shattered Halls - 17465, 16807, - -- The Slave Pens - 17941, - -- The Steamvault - 17722, 17803, 17796, 17797, 17798, - -- The Temple of Atal'Hakkar - 5226, - -- The Violet Hold - 31134, - -- Utgarde Keep - 23954, - -- Utgarde Pinnacle - 26861, - } - local dungeonlocationlist = { [BZ["Ahn'kahet: The Old Kingdom"]] = { ["loc"] = c1[BZ["Dragonblight"]], @@ -640,6 +564,10 @@ do ["loc"] = c1[BZ["Tanaris"]], ["c"] = 1, }, + [BZ["Onyxia's Lair"]] = { + ["loc"] = c1[BZ["Dustwallow Marsh"]], + ["c"] = 1, + }, [BZ["Ruins of Ahn'Qiraj"]] = { ["loc"] = c1[BZ["Tanaris"]], ["c"] = 1, @@ -796,6 +724,7 @@ do local continent, zone local loc = nil + local custom = false -- Get the entries location if (maplist[k] == 1) then @@ -808,6 +737,7 @@ do loc = questDB[k] elseif (maplist[k] == 8) then loc = customDB[k] + custom = true end local name = loc["Name"] @@ -834,7 +764,7 @@ do continent = 4 zone = c4[location] -- It's in a dungeon, lets check our manual listings for it. - elseif (dungeonlist[k]) then + elseif (dungeonlocationlist[location]) then continent = dungeonlocationlist[location]["c"] zone = dungeonlocationlist[location]["loc"] name = name .. " (" .. location .. ")" @@ -850,7 +780,7 @@ do end end - end -- addon:SetupMap() + end end -- do block -- Description: Parses the recipes and determines which ones to display, and makes them display appropiatly @@ -910,7 +840,6 @@ local function initDisplayStrings() end --- Description: local function ClearRecipeButtonTooltip(bIndex) @@ -933,7 +862,6 @@ local function toRGB(hex) end --- Description: -- I want to do a bit more comprehensive tooltip processing. Things like changing font sizes, -- adding padding to the left hand side, and using better color handling. So... this function @@ -1001,7 +929,6 @@ local function SetSpellTooltip(owner, loc, link) arlSpellTooltip:Show() end --- Description: local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude) local spellTooltipLocation = addon.db.profile.spelltooltiplocation local acquireTooltipLocation = addon.db.profile.acquiretooltiplocation @@ -1598,8 +1525,6 @@ local function SetProgressBar(playerData) end --- Description: - function addon:ResetGUI() addon.db.profile.frameopts.offsetx = 0 @@ -1612,8 +1537,6 @@ function addon:ResetGUI() end - - ------------------------------------------------------------------------------- -- Sorts the recipe Database depending on the settings defined in the database. ------------------------------------------------------------------------------- @@ -1704,8 +1627,6 @@ end -- This could happen because a filter changes, a new profession is chosen, or -- a new search occurred. Use this function to do all the dirty work --- Description: - local function ReDisplay() addon:UpdateFilters(recipeDB, allSpecTable, playerData) sortedRecipeIndex = SortMissingRecipes(recipeDB) @@ -1779,8 +1700,6 @@ function addon:CreateScanButton() end --- Description: - function addon:ShowScanButton() -- Anchor to ATSW @@ -1823,8 +1742,6 @@ function addon:ShowScanButton() end --- Description: - function addon:TooltipDisplay(this, textLabel) this:SetScript("OnEnter", @@ -1843,8 +1760,6 @@ function addon:TooltipDisplay(this, textLabel) end --- Description: - function addon.numFilters() -- IMPORTANT: If the number of filters we're maintaining changes, you'll need to change the FilterValueMap @@ -1868,8 +1783,6 @@ function addon.numFilters() end --- Description: - function addon.resetTitle() -- reset the frame title line @@ -1892,8 +1805,6 @@ function addon.resetTitle() end --- Description: - function addon.filterSwitch(val) if (FilterValueMap[val].cb:GetChecked()) then @@ -1909,8 +1820,6 @@ function addon.filterSwitch(val) end --- Description: - local function HideARL_ExpOptCB(ignorevalue) ARL_ExpGeneralOptCB.text:SetText(addon:Yellow(ExpButtonText[1])) @@ -1972,8 +1881,6 @@ local function HideARL_ExpOptCB(ignorevalue) end --- Description: - function addon.ToggleFilters() local xPos = addon.Frame:GetLeft() @@ -2047,8 +1954,6 @@ function addon.ToggleFilters() end --- Description: - do local PUSHDOWN = { [64] = 1, [65] = 1, [66] = 1, [67] = 1, [85] = 1, @@ -2074,8 +1979,6 @@ do end end -- do --- Description: - function addon:GenericCreateButton( bName, parentFrame, bHeight, bWidth, anchorFrom, anchorFrame, anchorTo, xOffset, yOffset, @@ -2908,7 +2811,6 @@ function addon.RepFilterSwitch(whichrep) end --- Description: function addon.setFlyawayState() @@ -3030,7 +2932,6 @@ function addon.setFlyawayState() ARL_IgnoreCB:SetChecked(addon.db.profile.ignoreexclusionlist) end --- Description: local function recursiveReset(t) @@ -3052,7 +2953,6 @@ local function recursiveReset(t) end --- Description: function addon.resetFilters() @@ -3096,7 +2996,6 @@ function addon.resetFilters() end end --- Description: function addon.DoFlyaway(panel) @@ -3389,7 +3288,6 @@ local function expandallDisplayStrings() end --- Description: function addon.ExpandAll_Clicked() @@ -3407,7 +3305,6 @@ function addon.ExpandAll_Clicked() end --- Description: local function SetSortName() @@ -3427,7 +3324,6 @@ local function SetSortName() end --- Description: local function ARL_DD_Sort_OnClick(button, value) CloseDropDownMenus() @@ -3436,7 +3332,6 @@ local function ARL_DD_Sort_OnClick(button, value) ReDisplay() end --- Description: local function ARL_DD_Sort_Initialize() diff --git a/Docs/CHANGES.txt b/Docs/CHANGES.txt index 1b6c631..f8ebfd9 100644 --- a/Docs/CHANGES.txt +++ b/Docs/CHANGES.txt @@ -15,6 +15,7 @@ *All professions have skill level data added (exception being cooking and JC) *Added the ability to customize which type of points you see on the mini-map (vendor, quest, trainer, mob). By default trainer will be off, the rest will be on. *Sorting via acquire method will now sort the special strings (aka discoveries) together. Items of the same "custom" type will be sorted alphabetically. +*Custom strings will now be added to the mini-map/map if you wish. ===RC10 *Significantly reduced memory usage over time. diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua index 00e9204..351c1d6 100644 --- a/Locals/testenUS.lua +++ b/Locals/testenUS.lua @@ -453,18 +453,18 @@ L["MISSING_LIBRARY"] = "%s is missing. Addon cannot run." -- Drop Obtain Info L["Unknown Zone"] = true --- Custom database strings (Need way better descriptions, just filler right now): -L["Custom1"] = "Discovered by making elixirs or flasks using Burning Crusade or higher ingredients." -L["Custom2"] = "Discovered by making potions using Burning Crusade or higher ingredients." -L["Custom3"] = "Discovered by doing transmutes using Burning Crusade or higher ingredients." -L["Custom4"] = "Discovered by Major Protection Potions using Burning Crusade or higher ingredients." -L["Custom5"] = "Randomly obtained by completing the cooking daily quest in Shattrath and selecting the meat crate." -L["Custom6"] = "Randomly obtained by completing the cooking daily quest in Shattrath and selecting the fish barrel." -L["Custom7"] = "Randomly obtained by completing the fishing daily quest in Shattrath." -L["Custom8"] = "Learned by default when learning the profession." -L["Custom9"] = "Recipe is created by Engineers." -L["Custom10"] = "Quest to obtain the recipe opens up after turning in the Head of Onyxia." -L["Custom11"] = "Obtained by clicking on a tablet in Zul'Gurub in the Edge of Madness." +-- Custom database strings: +L["DISCOVERY_ALCH_ELIXIRFLASK"] = "Discovered by making elixirs or flasks using Burning Crusade or higher ingredients." +L["DISCOVERY_ALCH_POTION"] = "Discovered by making potions using Burning Crusade or higher ingredients." +L["DISCOVERY_ALCH_XMUTE"] = "Discovered by doing transmutes using Burning Crusade or higher ingredients." +L["DISCOVERY_ALCH_PROT"] = "Discovered by Major Protection Potions using Burning Crusade or higher ingredients." +L["DAILY_COOKING_MEAT"] = "Randomly obtained by completing the cooking daily quest in Shattrath and selecting the meat crate." +L["DAILY_COOKING_FISH"] = "Randomly obtained by completing the cooking daily quest in Shattrath and selecting the fish barrel." +L["DAILY_FISHING_SHATT"] = "Randomly obtained by completing the fishing daily quest in Shattrath." +L["DEFAULT_RECIPE"] = "Learned by default when learning the profession." +L["CRAFTED_ENGINEERS"] = "Recipe is created by Engineers." +L["ONYXIA_HEAD_QUEST"] = "Quest to obtain the recipe opens up after turning in the Head of Onyxia." +L["EDGE_OF_MADNESS"] = "Obtained by clicking on a tablet in Zul'Gurub in the Edge of Madness." L["Custom12"] = "Discovered by doing transmutes using Wrath of the Lich King ingredients." L["Custom13"] = "Obtained by talking to Henry Stern in Razorfen Downs." L["Custom14"] = "Obtained randomly by conducting minor inscription research." diff --git a/RecipeDB/ARL-Custom.lua b/RecipeDB/ARL-Custom.lua index c04514f..93cc227 100644 --- a/RecipeDB/ARL-Custom.lua +++ b/RecipeDB/ARL-Custom.lua @@ -39,48 +39,50 @@ local BZONE = LibStub("LibBabble-Zone-3.0"):GetLookupTable() function addon:InitCustom(CustomDB) - self:addLookupList(CustomDB,1,L["Custom1"]) - self:addLookupList(CustomDB,2,L["Custom2"]) - self:addLookupList(CustomDB,3,L["Custom3"]) - self:addLookupList(CustomDB,4,L["Custom4"]) - self:addLookupList(CustomDB,5,L["Custom5"]) - self:addLookupList(CustomDB,6,L["Custom6"]) - self:addLookupList(CustomDB,7,L["Custom7"]) - self:addLookupList(CustomDB,8,L["Custom8"]) - self:addLookupList(CustomDB,9,L["Custom9"]) - self:addLookupList(CustomDB,10,L["Custom10"]) - self:addLookupList(CustomDB,11,L["Custom11"],BZONE["Zul'Gurub"],0,0) - self:addLookupList(CustomDB,12,L["Custom12"]) - self:addLookupList(CustomDB,13,L["Custom13"]) - self:addLookupList(CustomDB,14,L["Custom14"]) - self:addLookupList(CustomDB,15,L["Custom15"]) - self:addLookupList(CustomDB,16,L["Custom16"]) - self:addLookupList(CustomDB,17,L["Custom17"]) - self:addLookupList(CustomDB,18,L["Custom18"]) - self:addLookupList(CustomDB,19,L["Custom19"]) - self:addLookupList(CustomDB,20,L["Custom20"]) - self:addLookupList(CustomDB,21,L["Custom21"]) - self:addLookupList(CustomDB,22,L["Custom22"]) - self:addLookupList(CustomDB,23,L["Custom23"]) - self:addLookupList(CustomDB,24,L["Custom24"]) - self:addLookupList(CustomDB,25,L["Custom25"]) - self:addLookupList(CustomDB,26,L["Custom26"]) - --self:addLookupList(CustomDB,27,L["Custom27"]) - self:addLookupList(CustomDB,28,L["Custom28"]) - self:addLookupList(CustomDB,29,L["Custom29"]) - self:addLookupList(CustomDB,30,L["Custom30"]) - self:addLookupList(CustomDB,31,L["Custom31"]) - self:addLookupList(CustomDB,32,L["Custom32"]) - self:addLookupList(CustomDB,33,L["Custom33"]) - self:addLookupList(CustomDB,34,L["Custom34"]) - self:addLookupList(CustomDB,35,L["Custom35"]) - self:addLookupList(CustomDB,36,L["Custom36"]) - self:addLookupList(CustomDB,37,L["Custom37"]) - self:addLookupList(CustomDB,38,L["Custom38"]) - self:addLookupList(CustomDB,39,L["Custom39"]) - self:addLookupList(CustomDB,40,L["Custom40"]) - self:addLookupList(CustomDB,41,L["Custom41"]) - self:addLookupList(CustomDB,42,L["Custom42"]) + -- Alchemy Discoveries + self:addLookupList(CustomDB,1,L["DISCOVERY_ALCH_ELIXIRFLASK"],"N/A") + self:addLookupList(CustomDB,2,L["DISCOVERY_ALCH_POTION"],"N/A") + self:addLookupList(CustomDB,3,L["DISCOVERY_ALCH_XMUTE"],"N/A") + self:addLookupList(CustomDB,4,L["DISCOVERY_ALCH_PROT"],"N/A") + -- Cooking/Fishing Daily Quests + self:addLookupList(CustomDB,5,L["DAILY_COOKING_MEAT"],BZONE["Shattrath"],0,0) + self:addLookupList(CustomDB,6,L["DAILY_COOKING_FISH"],BZONE["Shattrath"],0,0) + self:addLookupList(CustomDB,7,L["DAILY_FISHING_SHATT"],BZONE["Shattrath"],0,0) + self:addLookupList(CustomDB,8,L["DEFAULT_RECIPE"],"N/A") + self:addLookupList(CustomDB,9,L["CRAFTED_ENGINEERS"],"N/A") + self:addLookupList(CustomDB,10,L["ONYXIA_HEAD_QUEST"],BZONE["Onyxia's Lair"],0,0) + self:addLookupList(CustomDB,11,L["EDGE_OF_MADNESS"],BZONE["Zul'Gurub"],0,0) + self:addLookupList(CustomDB,12,L["Custom12"],"N/A") + self:addLookupList(CustomDB,13,L["Custom13"],"N/A") + self:addLookupList(CustomDB,14,L["Custom14"],"N/A") + self:addLookupList(CustomDB,15,L["Custom15"],"N/A") + self:addLookupList(CustomDB,16,L["Custom16"],"N/A") + self:addLookupList(CustomDB,17,L["Custom17"],"N/A") + self:addLookupList(CustomDB,18,L["Custom18"],"N/A") + self:addLookupList(CustomDB,19,L["Custom19"],"N/A") + self:addLookupList(CustomDB,20,L["Custom20"],"N/A") + self:addLookupList(CustomDB,21,L["Custom21"],"N/A") + self:addLookupList(CustomDB,22,L["Custom22"],"N/A") + self:addLookupList(CustomDB,23,L["Custom23"],"N/A") + self:addLookupList(CustomDB,24,L["Custom24"],"N/A") + self:addLookupList(CustomDB,25,L["Custom25"],"N/A") + self:addLookupList(CustomDB,26,L["Custom26"],"N/A") + --self:addLookupList(CustomDB,27,L["Custom27"],"N/A") + self:addLookupList(CustomDB,28,L["Custom28"],"N/A") + self:addLookupList(CustomDB,29,L["Custom29"],"N/A") + self:addLookupList(CustomDB,30,L["Custom30"],"N/A") + self:addLookupList(CustomDB,31,L["Custom31"],"N/A") + self:addLookupList(CustomDB,32,L["Custom32"],"N/A") + self:addLookupList(CustomDB,33,L["Custom33"],"N/A") + self:addLookupList(CustomDB,34,L["Custom34"],"N/A") + self:addLookupList(CustomDB,35,L["Custom35"],"N/A") + self:addLookupList(CustomDB,36,L["Custom36"],"N/A") + self:addLookupList(CustomDB,37,L["Custom37"],"N/A") + self:addLookupList(CustomDB,38,L["Custom38"],"N/A") + self:addLookupList(CustomDB,39,L["Custom39"],"N/A") + self:addLookupList(CustomDB,40,L["Custom40"],"N/A") + self:addLookupList(CustomDB,41,L["Custom41"],"N/A") + self:addLookupList(CustomDB,42,L["Custom42"],"N/A") end