diff --git a/AddOns/!!!ClassicAPI/Util/ColorUtil.lua b/AddOns/!!!ClassicAPI/Util/ColorUtil.lua index 0e916dc6..11c1dd12 100644 --- a/AddOns/!!!ClassicAPI/Util/ColorUtil.lua +++ b/AddOns/!!!ClassicAPI/Util/ColorUtil.lua @@ -77,7 +77,7 @@ function GetFactionColor(factionGroupTag) -- Both PLAYER_FACTION_GROUP (tag -> index) and PLAYER_FACTION_COLORS -- (index -> color) live in our Constants.lua. Guarded defensively in -- case a client variant leaves one unset. - local group = PLAYER_FACTION_GROUP and PLAYER_FACTION_GROUP[factionGroupTag]; + local group = PLAYER_FACTION_GROUP[factionGroupTag]; return PLAYER_FACTION_COLORS and PLAYER_FACTION_COLORS[group]; end diff --git a/AddOns/!!!ClassicAPI/Util/Constants.lua b/AddOns/!!!ClassicAPI/Util/Constants.lua index a344fb61..8b0a1383 100644 --- a/AddOns/!!!ClassicAPI/Util/Constants.lua +++ b/AddOns/!!!ClassicAPI/Util/Constants.lua @@ -106,14 +106,18 @@ BAG_ITEM_QUALITY_COLORS = }; -- faction -PLAYER_FACTION_GROUP = PLAYER_FACTION_GROUP or -{ - [0] = "Horde", - [1] = "Alliance", - Horde = 0, - Alliance = 1, +PLAYER_FACTION_GROUP = { [0] = "Horde", [1] = "Alliance", Horde = 0, Alliance = 1 }; + +FACTION_LABELS = { + [0] = FACTION_HORDE, + [1] = FACTION_ALLIANCE, }; +FACTION_LABELS_FROM_STRING = { + ["Horde"] = FACTION_HORDE, + ["Alliance"] = FACTION_ALLIANCE, +} + PLAYER_FACTION_COLORS = { [0] = PLAYER_FACTION_COLOR_HORDE,