diff --git a/.pkgmeta b/.pkgmeta index e1df7d8..ea63417 100644 --- a/.pkgmeta +++ b/.pkgmeta @@ -10,14 +10,13 @@ optional-dependencies: - skillet - manufac - cauldron +# - tomtom # File list to ignore: ignore: - .pkgmeta - .docmeta - ARLDataminer.rb - - DataMiner - - dlcount - Docs externals: @@ -36,7 +35,4 @@ externals: libs/LibBabble-Zone-3.0: svn://svn.wowace.com/wow/libbabble-zone-3-0/mainline/trunk libs/LibAboutPanel: svn://svn.curseforge.net/wow/libaboutpanel/mainline/trunk libs/LibBetterBlizzOptions: svn://svn.wowace.com/wow/libbetterblizzoptions-1-0/mainline/trunk - libs/LibSharedMedia-3.0: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/tags/2 - DataMiner: svn://svn.curseforge.net/wow/data-tools/mainline/trunk - dlcount: svn://svn.curseforge.net/wow/dlcount/mainline/trunk - libs/Astrolabe: http://svn.esamynn.org/astrolabe/trunk + libs/LibSharedMedia-3.0: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/tags/2 \ No newline at end of file diff --git a/ARLConfig.lua b/ARLConfig.lua index a505e28..f02fd8f 100644 --- a/ARLConfig.lua +++ b/ARLConfig.lua @@ -965,6 +965,12 @@ local options = nil local function fullOptions() + local tomtomsupport = true + + if (TomTom) then + tomtomsupport = false + end + if (not options) then options = { @@ -1194,6 +1200,7 @@ local function fullOptions() type = "toggle", name = L["World Map"], desc = L["WORLDMAP_DESC"], + disable = tomtomsupport, get = function() return addon.db.profile.worldmap end, set = function() addon.db.profile.worldmap = not addon.db.profile.worldmap end, }, @@ -1202,6 +1209,7 @@ local function fullOptions() type = "toggle", name = L["Mini Map"], desc = L["MINIMAP_DESC"], + disable = tomtomsupport, get = function() return addon.db.profile.minimap end, set = function() addon.db.profile.minimap = not addon.db.profile.minimap end, }, @@ -1211,9 +1219,7 @@ local function fullOptions() } for k,v in pairs(modularOptions) do - options.args[k] = (type(v) == "function") and v() or v - end end diff --git a/ARLFrame.lua b/ARLFrame.lua index 00368a0..0b5a772 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -20,7 +20,6 @@ local addon = LibStub("AceAddon-3.0"):GetAddon(MODNAME) local BFAC = LibStub("LibBabble-Faction-3.0"):GetLookupTable() local L = LibStub("AceLocale-3.0"):GetLocale(MODNAME) -local Astrolabe = DongleStub("Astrolabe-0.4") local string = string local ipairs = ipairs @@ -315,10 +314,20 @@ do --/script AckisRecipeList:SetupMap() function addon:SetupMap() - if ((addon.db.profile.worldmap == true) and (addon.db.profile.minimap == true)) then + if (not TomTom) then + --@debug@ + self:Print("TomTom not loaded, integration with the world map and mini-map disabled.") + return + --@end-debug@ + end + + local worldmap = addon.db.profile.worldmap + local minimap = addon.db.profile.minimap + + if ((worldmap == true) and (minimap == true)) then --@debug@ - addon:Print("Setting up mini-map icons.") + addon:Print("Setting up mini-map and world map icons with TomTom.") --@end-debug@ local icontext = "Interface\\AddOns\\AckisRecipeList\\img\\enchant_up" @@ -347,6 +356,7 @@ do end end + --[[ local ARLWorldMap = CreateFrame("Button","ARLWorldMap",WorldMapDetailFrame) ARLWorldMap:ClearAllPoints() ARLWorldMap:SetWidth(8) @@ -362,6 +372,7 @@ do ARLMiniMap.icon = ARLMiniMap:CreateTexture("ARTWORK") ARLMiniMap.icon:SetTexture(icontext) ARLMiniMap.icon:SetAllPoints() + ]]-- for k, j in pairs(maplist) do @@ -385,19 +396,12 @@ do addon:Print("DEBUG: No continent/zone map match for vendor " .. k .. ".") --@end-debug@ end - - if ((zone) and (continent) and (addon.db.profile.worldmap == true)) then + + if ((zone) and (continent)) then --@debug@ addon:Print("Adding vendor ID: " .. k .. " to the world map at coords " .. vendorDB[k]["Coordx"] .. "," .. vendorDB[k]["Coordy"].. " with continent ID: " .. continent .. " and zone ID: " .. zone .. ".") --@end-debug@ - Astrolabe:PlaceIconOnWorldMap(WorldMapDetailFrame,ARLWorldMap,continent,zone,vendorDB[k]["Coordx"]/100,vendorDB[k]["Coordy"]/100) - end - - if ((zone) and (continent) and (addon.db.profile.minimap == true)) then - --@debug@ - addon:Print("Adding vendor ID: " .. k .. " to the mini-map at coords " .. vendorDB[k]["Coordx"] .. "," .. vendorDB[k]["Coordy"].. ".") - --@end-debug@ - Astrolabe:PlaceIconOnMinimap(ARLMiniMap,continent,zone,vendorDB[k]["Coordx"]/100, vendorDB[k]["Coordy"]/100) + TomTom:AddZWaypoint(continent, zone, vendorDB[k]["Coordx"]/100, vendorDB[k]["Coordy"]/100, vendorDB[k]["Name"], false, minimap, worldmap) end end diff --git a/AckisRecipeList.toc b/AckisRecipeList.toc index 8045f5a..ff313be 100644 --- a/AckisRecipeList.toc +++ b/AckisRecipeList.toc @@ -27,7 +27,7 @@ ## X-Website: http://www.wowwiki.com/AckisRecipeList/ ## X-Feedback: http://wow.curse.com/downloads/wow-addons/details/arl.aspx -## OptionalDeps: Ace3, Astrolabe, LibAboutPanel, LibBetterBlizzOptions-1.0, LibBabble-Zone-3.0, LibBabble-Faction-3.0, LibBabble-Boss-3.0, LibSharedMedia-3.0, Skillet, ATSW, Manufac, Cauldron +## OptionalDeps: Ace3, LibAboutPanel, LibBetterBlizzOptions-1.0, LibBabble-Zone-3.0, LibBabble-Faction-3.0, LibBabble-Boss-3.0, LibSharedMedia-3.0, Skillet, ATSW, Manufac, Cauldron, TomTom ## DefaultState: Enabled ## LoadOnDemand: 1