From d08d6dae8590d5bbc21089d95084789806acc97c Mon Sep 17 00:00:00 2001 From: ackis Date: Mon, 16 Feb 2009 17:10:58 +0000 Subject: [PATCH] Fix minimap/world map stuff, and update corrds of a vendor --- ARLFrame.lua | 106 +++++++++++++++++++++++++++++++---------------- RecipeDB/ARL-Vendor.lua | 10 ++--- 2 files changed, 75 insertions(+), 41 deletions(-) diff --git a/ARLFrame.lua b/ARLFrame.lua index 6d091b3..114f9bd 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -280,51 +280,85 @@ local function SetSortString(recipeSkill, recStr) end --- Description: --- Expected result: --- Input: --- Output: +do ---/script AckisRecipeList:SetupMiniMap() -function addon:SetupMiniMap() + local function LoadZones(c, ...) + for i=1,select('#', ...),1 do + c[i] = select(i,...) + end + end - addon:Print("Setting up mini-map icons.") + local C1 = {} + local C2 = {} + local C3 = {} + local C4 = {} - -- Nuke all the icons on the mini-map - Astrolabe:RemoveAllMinimapIcons() + LoadZones(C1,GetMapZones(1)) + LoadZones(C2,GetMapZones(2)) + LoadZones(C3,GetMapZones(3)) + LoadZones(C4,GetMapZones(4)) - local minimaplist = {} + -- Description: + -- Expected result: + -- Input: + -- Output: - -- Scan through all recipes to display, and add the vendors to a list to get their acquire info - for i = 1, #sortedRecipeIndex do - local recipeIndex = sortedRecipeIndex[i] + --/script AckisRecipeList:SetupMiniMap() + function addon:SetupMiniMap() - if ((recipeDB[recipeIndex]["Display"] == true) and (recipeDB[recipeIndex]["Search"] == true)) then - -- loop through acquire methods, display each - for k, v in pairs(recipeDB[rIndex]["Acquire"]) do - -- Vendor - if (v["Type"] == 2) then - minimaplist[v["ID"]] = true + addon:Print("Setting up mini-map icons.") + + local minimaplist = {} + + -- Scan through all recipes to display, and add the vendors to a list to get their acquire info + for i = 1, #sortedRecipeIndex do + local recipeIndex = sortedRecipeIndex[i] + + if ((recipeDB[recipeIndex]["Display"] == true) and (recipeDB[recipeIndex]["Search"] == true)) then + -- loop through acquire methods, display each + for k, v in pairs(recipeDB[recipeIndex]["Acquire"]) do + -- Vendor + if (v["Type"] == 2) then + minimaplist[v["ID"]] = true + end end end end - end - for k, j in pairs(minimaplist) do - --[===[@debug@ - addon:Print("Adding vendor ID: " .. k .. " to the mini-map.") - --@end-debug@]===] - -- continent continent 0 is the world of Azeroth, 1 is Kalimdor, 2 is Eastern Continent, 3 is Outland, 4 is northrend - -- zone http://www.wowwiki.com/LocalizedMapZones - local button = CreateFrame("Button", "TestButtonARL") - - button:SetWidth(10) - button:SetHeight(10) - button:SetText("F") - - if (vendorDB[k]["Location"] == "Dalaran") then - Astrolabe:PlaceIconOnMinimap(button,4,3,vendorDB[k]["Coordx"], vendorDB[k]["Coordy"]) + local ARLWorldMap = CreateFrame("Button","ARLWorldMap",WorldMapButton) + ARLWorldMap:ClearAllPoints() + ARLWorldMap:SetWidth(8) + ARLWorldMap:SetHeight(8) + ARLWorldMap.icon = ARLWorldMap:CreateTexture("ARTWORK") + ARLWorldMap.icon:SetTexture("Interface\\AddOns\\AckisRecipeList\\img\\enchant_up") + ARLWorldMap.icon:SetAllPoints() + ARLWorldMap:Show() + ARLWorldMap.icon:Show() + + local ARLMiniMap = CreateFrame("Button","ARLMiniMap",MiniMap) + ARLMiniMap:ClearAllPoints() + ARLMiniMap:SetWidth(8) + ARLMiniMap:SetHeight(8) + ARLMiniMap.icon = ARLMiniMap:CreateTexture("ARTWORK") + ARLMiniMap.icon:SetTexture("Interface\\AddOns\\AckisRecipeList\\img\\enchant_up") + ARLMiniMap.icon:SetAllPoints() + ARLMiniMap:Show() + ARLMiniMap.icon:Show() + + for k, j in pairs(minimaplist) do + --@debug@ + addon:Print("Adding vendor ID: " .. k .. " to the mini-map at coords " .. vendorDB[k]["Coordx"] .. "," .. vendorDB[k]["Coordy"].. ".") + --@end-debug@ + -- continent continent 0 is the world of Azeroth, 1 is Kalimdor, 2 is Eastern Continent, 3 is Outland, 4 is northrend + -- zone http://www.wowwiki.com/LocalizedMapZones + + -- Cords are stored from 0 to 100 in database + if (vendorDB[k]["Location"] == "Dalaran") then + Astrolabe:PlaceIconOnMinimap(ARLMiniMap,4,3,vendorDB[k]["Coordx"]/100, vendorDB[k]["Coordy"]/100) + Astrolabe:PlaceIconOnWorldMap(WorldMapFrame,ARLWorldMap,4,3,vendorDB[k]["Coordx"]/100,vendorDB[k]["Coordy"]/100) + end end + end end @@ -978,12 +1012,12 @@ local function RecipeList_Update() elseif (playerData.excluded_recipes_unknown ~= 0) then StaticPopup_Show("ARL_ALLEXCLUDED") else - addon:Print(L["NO_DISPLAY"]) addon:Print("DEBUG: recipes_total: " .. playerData.recipes_total) addon:Print("DEBUG: recipes_known: " .. playerData.recipes_known) addon:Print("DEBUG: recipes_total_filtered: " .. playerData.recipes_total_filtered) addon:Print("DEBUG: recipes_known_filtered: " .. playerData.recipes_known_filtered) - addon:Print("DEBUG: excluded_recipes_unknown: " .. playerData.excluded_recipes_unknown) + addon:Print("DEBUG: excluded_recipes_unknown: " .. playerData.excluded_recipes_unknown) + addon:Print(L["NO_DISPLAY"]) end end diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua index a6982a0..ef054ea 100644 --- a/RecipeDB/ARL-Vendor.lua +++ b/RecipeDB/ARL-Vendor.lua @@ -13,10 +13,10 @@ Auto-generated using ARLDataminer.rb ************************************************************************ -File date: @file-date-iso@ -File revision: @file-revision@ -Project revision: @project-revision@ -Project version: @project-version@ +File date: 2009-02-03T18:21:32Z +File revision: 1460 +Project revision: 1493 +Project version: r1493 ************************************************************************ @@ -385,7 +385,7 @@ function addon:InitVendor(VendorDB) self:addLookupList(VendorDB,32296,L["Stone Guard Mukar"],BZONE["Wintergrasp"],51.17,17.75,2) self:addLookupList(VendorDB,32379,L["Captain O'Neal"],BZONE["Stormwind City"],74.99,68.04,1) self:addLookupList(VendorDB,32382,L["Lady Palanseer"],BZONE["Orgrimmar"],37.09,64.81,2) - self:addLookupList(VendorDB,32514,L["Vanessa Sellers"],BZONE["Dalaran"],38.69,40.78,0) + self:addLookupList(VendorDB,32514,L["Vanessa Sellers"],BZONE["Dalaran"],38.4,41.0,0) self:addLookupList(VendorDB,32515,L["Braeg Stoutbeard"],BZONE["Dalaran"],38.52,29.59,0) self:addLookupList(VendorDB,32533,L["Cielstrasza"],BZONE["Dragonblight"],60.05,54.11,0) self:addLookupList(VendorDB,32538,L["Duchess Mynx"],BZONE["Icecrown"],43.04,20.52,0) -- 1.7.9.5