diff --git a/.pkgmeta b/.pkgmeta
index dd29235..3e6192b 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -10,7 +10,6 @@ optional-dependencies:
- skillet
- manufac
- cauldron
-# - tomtom
ignore:
- .pkgmeta
diff --git a/ARLFrame.lua b/ARLFrame.lua
index 47473e3..61b13aa 100644
--- a/ARLFrame.lua
+++ b/ARLFrame.lua
@@ -593,9 +593,7 @@ local function gttAdd(
local d, e, f = 0, 0, 0
if (hexcolor2) then
-
d, e, f = toRGB(hexcolor2)
-
end
-- Add in our left hand padding
@@ -636,7 +634,6 @@ local function gttAdd(
local mytext2 = _G["arlTooltipTextRight" .. numlines]
mytext2:SetFont(font, fontsize)
end
-
end
end
@@ -764,6 +761,8 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
-- obtain info
gttAdd(0, -1, 0, 0, L["Obtained From"] .. " : ", addon:hexcolor("NORMAL"))
+ local factiondisp = addon.db.profile.filters.general.faction
+
-- loop through acquire methods, display each
for k, v in pairs(recipeDB[rIndex]["Acquire"]) do
@@ -773,9 +772,10 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
-- TrainerZone TrainerCoords
local trnr = trainerDB[v["ID"]]
local cStr = ""
- -- Do we want to display this trainer?
- local displaytt = false
+
clr1 = addon:hexcolor("TRAINER")
+ -- Don't display trainers if it's opposite faction
+ local displaytt = false
if (trnr["Faction"] == BFAC["Horde"]) then
clr2 = addon:hexcolor("HORDE")
if (playerFaction == BFAC["Horde"]) then
@@ -788,6 +788,7 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
end
else
clr2 = addon:hexcolor("NEUTRAL")
+ displaytt = true
end
if (displaytt) then
@@ -810,23 +811,34 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
local vndr = vendorDB[v["ID"]]
local cStr = ""
- if (vndr["Coordx"] ~= 0) and (vndr["Coordy"] ~= 0) then
- cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
- end
-
clr1 = addon:hexcolor("VENDOR")
+ -- Don't display vendors of opposite faction
+ local displaytt = false
if (vndr["Faction"] == BFAC["Horde"]) then
clr2 = addon:hexcolor("HORDE")
+ if (playerFaction == BFAC["Horde"]) then
+ displaytt = true
+ end
elseif (vndr["Faction"] == BFAC["Alliance"]) then
clr2 = addon:hexcolor("ALLIANCE")
+ if (playerFaction == BFAC["Alliance"]) then
+ displaytt = true
+ end
else
clr2 = addon:hexcolor("NEUTRAL")
+ displaytt = true
end
- gttAdd(0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2)
- clr1 = addon:hexcolor("NORMAL")
- clr2 = addon:hexcolor("HIGH")
- gttAdd(1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2)
+ if (displaytt) then
+ if (vndr["Coordx"] ~= 0) and (vndr["Coordy"] ~= 0) then
+ cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
+ end
+
+ gttAdd(0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2)
+ clr1 = addon:hexcolor("NORMAL")
+ clr2 = addon:hexcolor("HIGH")
+ gttAdd(1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2)
+ end
-- Mob Drop
elseif (v["Type"] == 3) then
@@ -837,9 +849,7 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
local cStr = ""
if (mob["Coordx"] ~= 0) and (mob["Coordy"] ~= 0) then
-
cStr = "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")"
-
end
clr1 = addon:hexcolor("MOBDROP")
@@ -857,30 +867,35 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
local qst = questDB[v["ID"]]
if (qst ~= nil) then
-
- local cStr = ""
-
- if (qst["Coordx"] ~= 0) and (qst["Coordy"] ~= 0) then
-
- cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"
-
- end
-
clr1 = addon:hexcolor("QUEST")
-
+ -- Don't display quests of opposite faction
+ local displaytt = false
if (qst["Faction"] == BFAC["Horde"]) then
clr2 = addon:hexcolor("HORDE")
+ if (playerFaction == BFAC["Horde"]) then
+ displaytt = true
+ end
elseif (qst["Faction"] == BFAC["Alliance"]) then
clr2 = addon:hexcolor("ALLIANCE")
+ if (playerFaction == BFAC["Alliance"]) then
+ displaytt = true
+ end
else
clr2 = addon:hexcolor("NEUTRAL")
+ displaytt = true
end
- gttAdd(0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2)
- clr1 = addon:hexcolor("NORMAL")
- clr2 = addon:hexcolor("HIGH")
- gttAdd(1, -2, 1, 0, qst["Location"], clr1, cStr, clr2)
+ if (displaytt) then
+ local cStr = ""
+ if (qst["Coordx"] ~= 0) and (qst["Coordy"] ~= 0) then
+ cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"
+ end
+ gttAdd(0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2)
+ clr1 = addon:hexcolor("NORMAL")
+ clr2 = addon:hexcolor("HIGH")
+ gttAdd(1, -2, 1, 0, qst["Location"], clr1, cStr, clr2)
+ end
end
-- Seasonal
@@ -931,18 +946,28 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
clr1 = addon:hexcolor("EXALTED")
end
+ local displaytt = false
if (repvndr["Faction"] == BFAC["Horde"]) then
clr2 = addon:hexcolor("HORDE")
+ if (playerFaction == BFAC["Horde"]) then
+ displaytt = true
+ end
elseif (repvndr["Faction"] == BFAC["Alliance"]) then
clr2 = addon:hexcolor("ALLIANCE")
+ if (playerFaction == BFAC["Alliance"]) then
+ displaytt = true
+ end
else
clr2 = addon:hexcolor("NEUTRAL")
+ displaytt = true
end
- gttAdd(1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2)
- clr1 = addon:hexcolor("NORMAL")
- clr2 = addon:hexcolor("HIGH")
- gttAdd(2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2)
+ if (displaytt) then
+ gttAdd(1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2)
+ clr1 = addon:hexcolor("NORMAL")
+ clr2 = addon:hexcolor("HIGH")
+ gttAdd(2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2)
+ end
-- World Drop
elseif (v["Type"] == 7) then
@@ -964,7 +989,6 @@ local function GenerateTooltipContent(owner, rIndex, playerFaction, exclude)
-- Custom entry
elseif (v["Type"] == 8) then
-
-- Seasonal: SeasonEventName
local customname = customDB[v["ID"]]["Name"]
diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua
index 250cae5..1939967 100644
--- a/AckisRecipeList.lua
+++ b/AckisRecipeList.lua
@@ -1199,7 +1199,6 @@ function addon:PopulateRepFilters(RepTable)
RepTable[BFAC["Timbermaw Hold"]] = repfilters.timbermaw
RepTable[BFAC["The Violet Eye"]] = repfilters.violeteye
RepTable[BFAC["Zandalar Tribe"]] = repfilters.zandalar
--- Below this is WotLK data. May need to be changed post beta.
RepTable[BFAC["Argent Crusade"]] = repfilters.argentcrusade
RepTable[BFAC["Frenzyheart Tribe"]] = repfilters.frenzyheart
RepTable[BFAC["Knights of the Ebon Blade"]] = repfilters.ebonblade
diff --git a/Docs/CHANGES.txt b/Docs/CHANGES.txt
index 0419f5b..69f8295 100644
--- a/Docs/CHANGES.txt
+++ b/Docs/CHANGES.txt
@@ -1,5 +1,9 @@
==ARL Changes==
+===RC5===
+*All opposite faction acquire methods in the tooltip will now be hidden automatically. They will still be shown as part of the recipe window depending on your filter settings for faction.
+*You can now sort by skill level ascending and descending.
+
===RC4===
*Updated recipe information (skill levels, flags, locations, etc)
*Added more fine grained support for Tom Tom integration (Please see the ARL in-game options to see how to configure this.)
diff --git a/Docs/In-game.txt b/Docs/In-game.txt
index a05ef2f..3d9bae2 100644
--- a/Docs/In-game.txt
+++ b/Docs/In-game.txt
@@ -53,6 +53,7 @@ If you wish to add a single recipe's acquire methods to the maps, you can Ctrl-S
===Using Filters===
Filters may be toggled on or off. There are two types of filters: one which will prevent the recipe from showing up at all, and one which will prevent a specific type of acquire information from showing up.
With the first type of filter, these match the proprieties of the recipe (ie: binding). If you toggle ARL to not show BoP recipes, no recipes that are BoP will show up in the scan. The second type of filter deals with acquire information. If a recipe is available as a mob drop, or from a vendor and you toggle to not show vendor recipes, the recipe will still show up but vendor information will be hidden for it. The reason is that there is still another way to acquire this recipe (mob drop) so it should still be included in the scan.
+Please note that the tooltips will always hide the opposite faction methods of acquiring a recipe. This has been done to save space in the tooltip since they can get quite large.
===Exclusion List===
To add a recipe to the exclusion (ignore) list, just alt-click on it from the recipe window. To get this recipe back, open up the ARL options and set the toggle of "Show Excluded Recipes" to be on. This will show all the recipes you've excluded in your scan during your next scan. Once you have done this, Alt Click on the recipe again to remove it from the exclusion list.
diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua
index cfc28c7..c379b72 100644
--- a/Locals/testenUS.lua
+++ b/Locals/testenUS.lua
@@ -69,7 +69,8 @@ L["ARL_DOC_DESC"] = "Documentation for Ackis Recipe List"
-- UI Documentation
L["Using Filters"] = true
L["USING_FILTERS_DESC"] = [["Filters may be toggled on or off. There are two types of filters: one which will prevent the recipe from showing up at all, and one which will prevent a specific type of acquire information from showing up.
-With the first type of filter, these match the proprieties of the recipe (ie: binding). If you toggle ARL to not show BoP recipes, no recipes that are BoP will show up in the scan. The second type of filter deals with acquire information. If a recipe is available as a mob drop, or from a vendor and you toggle to not show vendor recipes, the recipe will still show up but vendor information will be hidden for it. The reason is that there is still another way to acquire this recipe (mob drop) so it should still be included in the scan."]]
+With the first type of filter, these match the proprieties of the recipe (ie: binding). If you toggle ARL to not show BoP recipes, no recipes that are BoP will show up in the scan. The second type of filter deals with acquire information. If a recipe is available as a mob drop, or from a vendor and you toggle to not show vendor recipes, the recipe will still show up but vendor information will be hidden for it. The reason is that there is still another way to acquire this recipe (mob drop) so it should still be included in the scan.
+Please note that the tooltips will always hide the opposite faction methods of acquiring a recipe. This has been done to save space in the tooltip since they can get quite large."]]
L["Reporting Bugs"] = true
L["REPORTING_BUGS_DESC"] = [["When reporting a bug, please make sure you do the following:
1) Download the latest version, available from http://www.wowace.com/projects/arl/files/