diff --git a/ARLConfig.lua b/ARLConfig.lua index 244e228..1a04516 100644 --- a/ARLConfig.lua +++ b/ARLConfig.lua @@ -1239,8 +1239,44 @@ local function giveMap() get = function() return addon.db.profile.minimap end, set = function() addon.db.profile.minimap = not addon.db.profile.minimap end, }, - clearmap = { + minimap = { order = 5, + type = "toggle", + name = L["Trainer"], + desc = L["MAP_TRAINER_DESC"], + disabled = tomtomsupport, + get = function() return addon.db.profile.maptrainer end, + set = function() addon.db.profile.maptrainer = not addon.db.profile.maptrainer end, + }, + minimap = { + order = 6, + type = "toggle", + name = L["Vendor"], + desc = L["MAP_VENDOR_DESC"], + disabled = tomtomsupport, + get = function() return addon.db.profile.mapvendor end, + set = function() addon.db.profile.mapvendor = not addon.db.profile.mapvendor end, + }, + minimap = { + order = 7, + type = "toggle", + name = L["Monster"], + desc = L["MAP_MONSTER_DESC"], + disabled = tomtomsupport, + get = function() return addon.db.profile.mapmob end, + set = function() addon.db.profile.mapmob = not addon.db.profile.mapmob end, + }, + minimap = { + order = 8, + type = "toggle", + name = L["Quest"], + desc = L["MAP_QUEST_DESC"], + disabled = tomtomsupport, + get = function() return addon.db.profile.mapquest end, + set = function() addon.db.profile.mapquest = not addon.db.profile.mapquest end, + }, + clearmap = { + order = 20, type = "execute", name = L["Clear Waypoints"], disabled = tomtomsupport, diff --git a/ARLFrame.lua b/ARLFrame.lua index dd4c659..5bc3552 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -456,14 +456,19 @@ do end local function CheckMapDisplay(v, filters) + local maptrainer = addon.db.profile.maptrainer + local mapquest = addon.db.profile.mapquest + local mapvendor = addon.db.profile.mapvendor + local mapmob = addon.db.profile.mapmob local display = false - if (v["Type"] == ACQUIRE_TRAINER) then -- If it's a trainer, we don't display them on the mini-map + + if ((v["Type"] == ACQUIRE_TRAINER) and (maptrainer)) then -- If it's a trainer, we don't display them on the mini-map display = ((trainerDB[v["ID"]]["Faction"] == BFAC[myFaction]) or (trainerDB[v["ID"]]["Faction"] == factionNeutral)) - elseif (v["Type"] == ACQUIRE_VENDOR) then -- If it's a vendor check to see if we're displaying it on the map + elseif ((v["Type"] == ACQUIRE_VENDOR) and (mapvendor)) then -- If it's a vendor check to see if we're displaying it on the map display = ((vendorDB[v["ID"]]["Faction"] == BFAC[myFaction]) or (vendorDB[v["ID"]]["Faction"] == factionNeutral)) - elseif (v["Type"] == ACQUIRE_MOB) then -- If it's a mob, always return true + elseif ((v["Type"] == ACQUIRE_MOB) and (mapmob)) then -- If it's a mob, always return true return true - elseif (v["Type"] == ACQUIRE_QUEST) then -- If it's a quest check to see if we're displaying it on the map + elseif ((v["Type"] == ACQUIRE_QUEST) and (mapquest)) then -- If it's a quest check to see if we're displaying it on the map display = ((questDB[v["ID"]]["Faction"] == BFAC[myFaction]) or (questDB[v["ID"]]["Faction"] == factionNeutral)) end return display diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua index a8ac9fc..a43245a 100644 --- a/AckisRecipeList.lua +++ b/AckisRecipeList.lua @@ -153,6 +153,10 @@ function addon:OnInitialize() scantrainers = false, scanvendors = false, autoloaddb = false, + maptrainer = false, + mapvendor = true, + mapmob = true, + mapquest = true, -- Recipe Exclusion exclusionlist = {}, diff --git a/Docs/CHANGES.txt b/Docs/CHANGES.txt index 5ef8a63..3133f21 100644 --- a/Docs/CHANGES.txt +++ b/Docs/CHANGES.txt @@ -13,6 +13,7 @@ *Faction specific recipes which cannot be acquired by the other side (The choppers and the new 3.2 patterns) are now automatically filtered. *Fixed a map/mini-map coordinate display issue *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. ===RC10 *Significantly reduced memory usage over time. diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua index 2dcdee8..aadcb08 100644 --- a/Locals/testenUS.lua +++ b/Locals/testenUS.lua @@ -1553,3 +1553,8 @@ L["Zorbin Fandazzle"] = true L["Zula Slagfury"] = true L["Zurai"] = true L["Recorder Lidio"] = true +L["Monster"] = true +L["MAP_TRAINER_DESC"] = "Display trainers on the map." +L["MAP_VENDOR_DESC"] = "Display vendors on the map." +L["MAP_MONSTER_DESC"] = "Display monsters on the map." +L["MAP_QUEST_DESC"] = "Display quests on the map." \ No newline at end of file