James D. Callahan III [11-26-10 - 20:13]
diff --git a/Constants.lua b/Constants.lua
index c9813f7..7dc7d48 100644
--- a/Constants.lua
+++ b/Constants.lua
@@ -150,6 +150,8 @@ private.filter_flags = {
["EBONBLADE"] = 117, ["KIRINTOR"] = 118, ["HODIR"] = 119, ["KALUAK"] = 120,
["ORACLES"] = 121, ["WYRMREST"] = 122, ["WRATHCOMMON1"] = 123, ["WRATHCOMMON2"]= 124,
["WRATHCOMMON3"] = 125, ["WRATHCOMMON4"]= 126, ["WRATHCOMMON5"] = 127, ["ASHEN_VERDICT"]=128,
+ ["CATACOMMON1"] = 129, ["CATACOMMON2"] = 130, ["GUARDIANS"] = 131, ["RAMKAHEN"] = 132,
+ ["EARTHEN_RING"] = 133, ["THERAZANE"] = 134,
}
private.filter_strings = {
@@ -185,8 +187,8 @@ private.filter_strings = {
[117] = "EBONBLADE", [118] = "KIRINTOR", [119] = "HODIR", [120] = "KALUAK",
[121] = "ORACLES", [122] = "WYRMREST", [123] = "WRATHCOMMON1", [124] = "WRATHCOMMON2",
[125] = "WRATHCOMMON3", [126] = "WRATHCOMMON4", [127] = "WRATHCOMMON5", [128] = "ASHEN_VERDICT",
- [129] = "CATACOMMON1" [130] = "CATACOMMON2" [131] = "GUARDIANS" [132] = "RAMKAHEN"
- [133] = "EARTHEN_RING" [134] = "THERAZANE"
+ [129] = "CATACOMMON1", [130] = "CATACOMMON2", [131] = "GUARDIANS", [132] = "RAMKAHEN",
+ [133] = "EARTHEN_RING", [134] = "THERAZANE",
}
-------------------------------------------------------------------------------
@@ -276,13 +278,13 @@ private.rep_flags_word1 = {
-- Reputation filter bitfield word 2.
-------------------------------------------------------------------------------
private.rep_flags_word2 = {
- ASHEN_VERDICT = 0x00000001,
- CATACOMMON1 = 0x00000002,
- CATACOMMON2 = 0x00000004,
- GUARDIANS = 0x00000008,
- RAMKAHEN = 0x00000010,
- EARTHEN_RING = 0x00000020,
- THERAZANE = 0x00000040,
+ ASHEN_VERDICT = 0x00000001, -- 1
+ CATACOMMON1 = 0x00000002, -- 2
+ CATACOMMON2 = 0x00000004, -- 3
+ GUARDIANS = 0x00000008, -- 4
+ RAMKAHEN = 0x00000010, -- 5
+ EARTHEN_RING = 0x00000020, -- 6
+ THERAZANE = 0x00000040, -- 7
}
-------------------------------------------------------------------------------
@@ -435,14 +437,14 @@ private.faction_ids = {
["ARGENTCRUSADE"] = 1106,
["HODIR"] = 1119,
["ASHEN_VERDICT"] = 1156,
- --EARTHEN_RING = 1135,
- --GUARDIANS = 1158,
- --THERAZANE = 1171,
- --DRAGONMAW = 1172,
- --RAMKAHEN = 1173,
- --WILDHAMMER = 1174,
- --WARDENS = 1177,
- --HELLSCREAM = 1178,
+ ["EARTHEN_RING"] = 1135,
+ ["GUARDIANS"] = 1158,
+ ["THERAZANE"] = 1171,
+ ["DRAGONMAW"] = 1172,
+ ["RAMKAHEN"] = 1173,
+ ["WILDHAMMER"] = 1174,
+ ["WARDENS"] = 1177,
+ ["HELLSCREAM"] = 1178,
}
private.faction_strings = {
@@ -479,14 +481,14 @@ private.faction_strings = {
[1106] = "ARGENTCRUSADE",
[1119] = "HODIR",
[1156] = "ASHEN_VERDICT",
- --[1135] = "EARTHEN_RING",
- --[1158] = GUARDIANS,
- --[1171] = THERAZANE,
- --[1172] = DRAGONMAW,
- --[1173] = RAMKAHEN,
- --[1174] = WILDHAMMER,
- --[1177] = WARDENS,
- --[1178] = HELLSCREAM,
+ [1135] = "EARTHEN_RING",
+ [1158] = "GUARDIANS",
+ [1171] = "THERAZANE",
+ [1172] = "DRAGONMAW",
+ [1173] = "RAMKAHEN",
+ [1174] = "WILDHAMMER",
+ [1177] = "WARDENS",
+ [1178] = "HELLSCREAM",
}
-------------------------------------------------------------------------------
diff --git a/Interface/FilterMenus.lua b/Interface/FilterMenus.lua
index e054c4b..f16a7f3 100644
--- a/Interface/FilterMenus.lua
+++ b/Interface/FilterMenus.lua
@@ -734,8 +734,8 @@ function private.InitializeFilterPanel()
local Valiance_Warsong_Text = isAlliance and BFAC["Valiance Expedition"] or BFAC["Warsong Offensive"]
local Frostborn_Taunka_Text = isAlliance and BFAC["The Frostborn"] or BFAC["The Taunka"]
local Explorer_Hand_Text = isAlliance and BFAC["Explorers' League"] or BFAC["The Hand of Vengeance"]
- local Tol_Barad = isalliance and BFAC["Baradin's Wardens"] or BFAC["Hellscream's Reach"]
- local Wildhammer_Dragonmaw = salliance and BFAC["Wildhammer Clan"] or BFAC["Dragonmaw Clan"]
+ local Tol_Barad = isAlliance and BFAC["Baradin's Wardens"] or BFAC["Hellscream's Reach"]
+ local Wildhammer_Dragonmaw = isAlliance and BFAC["Wildhammer Clan"] or BFAC["Dragonmaw Clan"]
-------------------------------------------------------------------------------
-- Used for the tooltip of every reputation checkbox.
@@ -959,20 +959,20 @@ function private.InitializeFilterPanel()
local expansion3_buttons = {
["catacommon1"] = { tt = ReputationDesc(Wildhammer_Dragonmaw), text = Wildhammer_Dragonmaw, row = 2, col = 1 },
["catacommon2"] = { tt = ReputationDesc(Tol_Barad), text = Tol_Barad, row = 3, col = 1 },
- ["guardiansofhyjal"] = { tt = ReputationDesc(BFAC["Guardians of Hyjal"]), text = DisabledText(Explorer_Hand_Text), row = 4, col = 1 },
- ["ramkahen"] = { tt = ReputationDesc(BFAC["Ramkahen"]), text = BFAC["Frenzyheart Tribe"], row = 5, col = 1 },
- ["earthenring"] = { tt = ReputationDesc(BFAC["The Earthen Ring"]), text = BFAC["The Kalu'ak"], row = 6, col = 1 },
- ["therazane"] = { tt = ReputationDesc(BFAC["Therazane"]), text = BFAC["Kirin Tor"], row = 7, col = 1 },
+ ["guardiansofhyjal"] = { tt = ReputationDesc(BFAC["Guardians of Hyjal"]), text = DisabledText(BFAC["Guardians of Hyjal"]), row = 4, col = 1 },
+ ["ramkahen"] = { tt = ReputationDesc(BFAC["Ramkahen"]), text = BFAC["Ramhaken"], row = 5, col = 1 },
+ ["earthenring"] = { tt = ReputationDesc(BFAC["The Earthen Ring"]), text = BFAC["The Earthen Ring"], row = 6, col = 1 },
+ ["therazane"] = { tt = ReputationDesc(BFAC["Therazane"]), text = BFAC["Therazane"], row = 7, col = 1 },
}
GenerateCheckBoxes(expansion3_frame, expansion3_buttons)
-- Disable them as the data isn't in yet.
- expansion2_frame.catacommon1:Disable()
- expansion2_frame.catacommon2:Disable()
- expansion2_frame.guardiansofhyjal:Disable()
- expansion2_frame.ramkahen:Disable()
- expansion2_frame.earthenring:Disable()
- expansion2_frame.therazane:Disable()
+ expansion3_frame.catacommon1:Disable()
+ expansion3_frame.catacommon2:Disable()
+ expansion3_frame.guardiansofhyjal:Disable()
+ expansion3_frame.ramkahen:Disable()
+ expansion3_frame.earthenring:Disable()
+ expansion3_frame.therazane:Disable()
local expansion3_toggle = GenericCreateButton(nil, expansion3_frame, 15, 120, "GameFontHighlight", _G.REPUTATION .. ":", "LEFT", L["REP_TEXT_DESC"], 0)
expansion3_toggle:SetPoint("TOPLEFT", expansion3_frame, "TOPLEFT", -2, -4)
diff --git a/Interface/List.lua b/Interface/List.lua
index 16316d2..afa60b1 100644
--- a/Interface/List.lua
+++ b/Interface/List.lua
@@ -541,12 +541,12 @@ function private.InitializeListFrame()
local REP2 = private.rep_flags_word2
local REP_FILTERS_2 = {
[REP2.ASHEN_VERDICT] = "ashenverdict",
- [REP2.CATACOMMON1] = "catacommon1"
- [REP2.CATACOMMON2] = "catacommon2"
- [REP2.GUARDIANS] = "guardiansofhyjal"
- [REP2.RAMKAHEN] = "ramkahen"
- [REP2.EARTHEN_RING] = "earthenring"
- [REP2.THERAZANE] = "therazane"
+ [REP2.CATACOMMON1] = "catacommon1",
+ [REP2.CATACOMMON2] = "catacommon2",
+ [REP2.GUARDIANS] = "guardiansofhyjal",
+ [REP2.RAMKAHEN] = "ramkahen",
+ [REP2.EARTHEN_RING] = "earthenring",
+ [REP2.THERAZANE] = "therazane",
}
local CLASS1 = private.class_flags_word1