diff --git a/ARLConfig.lua b/ARLConfig.lua
index aa6817e..96d7e29 100644
--- a/ARLConfig.lua
+++ b/ARLConfig.lua
@@ -298,28 +298,28 @@ local function giveFilter()
set = function() addon.db.profile.filters.obtain.mobdrop = not addon.db.profile.filters.obtain.mobdrop end,
},
originalwow = {
- order = 13,
+ order = 20,
type = "toggle",
name = L["Old World"],
desc = L["ORIGINAL_WOW_DESC"],
- get = function() return addon.db.profile.filters.general.originalwow end,
- set = function() addon.db.profile.filters.general.originalwow = not addon.db.profile.filters.general.originalwow end,
+ get = function() return addon.db.profile.filters.obtain.originalwow end,
+ set = function() addon.db.profile.filters.obtain.originalwow = not addon.db.profile.filters.obtain.originalwow end,
},
bc = {
- order = 14,
+ order = 21,
type = "toggle",
name = L["Burning Crusade"],
desc = L["BC_WOW_DESC"],
- get = function() return addon.db.profile.filters.general.bc end,
- set = function() addon.db.profile.filters.general.bc = not addon.db.profile.filters.general.bc end,
+ get = function() return addon.db.profile.filters.obtain.bc end,
+ set = function() addon.db.profile.filters.obtain.bc = not addon.db.profile.filters.obtain.bc end,
},
wrath = {
- order = 15,
+ order = 22,
type = "toggle",
name = L["Wrath of the Lich King"],
desc = L["LK_WOW_DESC"],
- get = function() return addon.db.profile.filters.general.wrath end,
- set = function() addon.db.profile.filters.general.wrath = not addon.db.profile.filters.general.wrath end,
+ get = function() return addon.db.profile.filters.obtain.wrath end,
+ set = function() addon.db.profile.filters.obtain.wrath = not addon.db.profile.filters.obtain.wrath end,
},
}
},
diff --git a/ARLFrame.lua b/ARLFrame.lua
index c4c9b6a..4cc7cb2 100644
--- a/ARLFrame.lua
+++ b/ARLFrame.lua
@@ -2573,9 +2573,6 @@ function addon.setFlyawayState()
ARL_FactionCB:SetChecked(filterdb.general.faction)
ARL_KnownCB:SetChecked(filterdb.general.known)
ARL_UnknownCB:SetChecked(filterdb.general.unknown)
- ARL_OriginalWoWCB:SetChecked(filterdb.general.originalwow)
- ARL_BCCB:SetChecked(filterdb.general.bc)
- ARL_WrathCB:SetChecked(filterdb.general.wrath)
-- Classes
ARL_DeathKnightCB:SetChecked(filterdb.classes.deathknight)
ARL_DruidCB:SetChecked(filterdb.classes.druid)
@@ -2598,6 +2595,9 @@ function addon.setFlyawayState()
ARL_DiscoveryCB:SetChecked(filterdb.obtain.discovery)
ARL_WorldDropCB:SetChecked(filterdb.obtain.worlddrop)
ARL_MobDropCB:SetChecked(filterdb.obtain.mobdrop)
+ ARL_OriginalWoWCB:SetChecked(filterdb.obtain.originalwow)
+ ARL_BCCB:SetChecked(filterdb.obtain.bc)
+ ARL_WrathCB:SetChecked(filterdb.obtain.wrath)
-- Binding Options
ARL_iBoECB:SetChecked(filterdb.binding.itemboe)
ARL_iBoPCB:SetChecked(filterdb.binding.itembop)
@@ -4458,9 +4458,6 @@ function addon:CreateFrame(
[4] = { cb = ARL_FactionCB, svroot = filterdb.general, svval = "faction" },
[5] = { cb = ARL_KnownCB, svroot = filterdb.general, svval = "known" },
[6] = { cb = ARL_UnknownCB, svroot = filterdb.general, svval = "unknown" },
- [89] = { cb = ARL_OriginalWoWCB, svroot = filterdb.general, svval = "originalwow" },
- [90] = { cb = ARL_BCCB, svroot = filterdb.general, svval = "bc" },
- [91] = { cb = ARL_WrathCB, svroot = filterdb.general, svval = "wrath" },
-- Classes
[87] = { cb = ARL_DeathKnightCB, svroot = filterdb.classes, svval = "deathknight" },
[88] = { cb = ARL_DruidCB, svroot = filterdb.classes, svval = "druid" },
@@ -4483,6 +4480,9 @@ function addon:CreateFrame(
[14] = { cb = ARL_DiscoveryCB, svroot = filterdb.obtain, svval = "discovery" },
[39] = { cb = ARL_WorldDropCB, svroot = filterdb.obtain, svval = "worlddrop" },
[40] = { cb = ARL_MobDropCB, svroot = filterdb.obtain, svval = "mobdrop" },
+ [89] = { cb = ARL_OriginalWoWCB, svroot = filterdb.obtain, svval = "originalwow" },
+ [90] = { cb = ARL_BCCB, svroot = filterdb.obtain, svval = "bc" },
+ [91] = { cb = ARL_WrathCB, svroot = filterdb.obtain, svval = "wrath" },
-- Binding Options
[15] = { cb = ARL_iBoECB, svroot = filterdb.binding, svval = "itemboe" },
[16] = { cb = ARL_iBoPCB, svroot = filterdb.binding, svval = "itembop" },
diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua
index fec63db..f6b60d1 100644
--- a/AckisRecipeList.lua
+++ b/AckisRecipeList.lua
@@ -179,9 +179,6 @@ function addon:OnInitialize()
skill = true,
known = false,
unknown = true,
- originalwow = true,
- bc = true,
- wrath = true,
},
-- Obtain Options
obtain = {
@@ -195,6 +192,9 @@ function addon:OnInitialize()
discovery = true,
worlddrop = true,
mobdrop = true,
+ originalwow = true,
+ bc = true,
+ wrath = true,
},
-- Item Filters (Armor/Weapon)
item = {
@@ -998,6 +998,7 @@ do
-- So to be more effecient we'll just leave this function if there's a false
local generaldb = filterdb.general
+ local obtaindb = filterdb.obtain
-- Is this recipe in my currently selected profession?
if (Recipe["Profession"] ~= playerProfession) then
@@ -1035,13 +1036,13 @@ do
-- Filter out "era" recipes
- if ((generaldb.originalwow == false) and (Recipe["Game"] == 0)) then
+ if ((obtaindb.originalwow == false) and (Recipe["Game"] == 0)) then
return false
end
- if ((generaldb.bc == false) and (Recipe["Game"] == 1)) then
+ if ((obtaindb.bc == false) and (Recipe["Game"] == 1)) then
return false
end
- if ((generaldb.wrath == false) and (Recipe["Game"] == 2)) then
+ if ((obtaindb.wrath == false) and (Recipe["Game"] == 2)) then
return false
end
@@ -1365,8 +1366,6 @@ do
-- loop through nonexclusive (soft filters) flags until one is true
-- If one of these is true (ie: we want to see trainers and there is a trainer flag) we display the recipe
- local obtaindb = filterdb.obtain
-
-- Display trainer recipes
if (obtaindb.trainer == true) and (flags[3] == true) then
return true