Commit e5a47bab authored by Azilroka's avatar Azilroka

SMB / MXP

parent f6094393
......@@ -119,12 +119,12 @@ for k, v in pairs(LOCALIZED_CLASS_NAMES_MALE) do PA.Classes[v] = k end
for k, v in pairs(LOCALIZED_CLASS_NAMES_FEMALE) do PA.Classes[v] = k end
function PA:ClassColorCode(class)
local color = PA:GetClassColor(PA.Classes[class])
local color = PA:GetClassColor(PA.Classes[class] or class)
return format('FF%02x%02x%02x', color.r * 255, color.g * 255, color.b * 255)
end
function PA:GetClassColor(class)
return _G.CUSTOM_CLASS_COLORS and _G.CUSTOM_CLASS_COLORS[class] or _G.RAID_CLASS_COLORS[class] or { r = 1, g = 1, b = 1 }
return _G.CUSTOM_CLASS_COLORS and _G.CUSTOM_CLASS_COLORS[class] or _G.RAID_CLASS_COLORS[class or 'PRIEST']
end
local Color = PA:GetClassColor(PA.MyClass)
......
......@@ -8,7 +8,7 @@ MXP.isEnabled = false
PA.MXP, _G.MasterExperience = MXP, MXP
local _G = _G
local min, format = min, format
local min, max, format = min, max, format
local tostring, tonumber = tostring, tonumber
local strsplit = strsplit
......@@ -89,8 +89,8 @@ function MXP:UpdateBar(barID, infoString)
local expColor, restedColor, questColor = MXP.db.Colors.Experience, MXP.db.Colors.Rested, MXP.db.Colors.Quest
if MXP.db.ColorByClass and info.class then
expColor = MXP:ConvertColorToClass(expColor, RAID_CLASS_COLORS[info.class])
restedColor = MXP:ConvertColorToClass(restedColor, RAID_CLASS_COLORS[info.class], .6)
expColor = MXP:ConvertColorToClass(expColor, PA:GetClassColor(info.class))
restedColor = MXP:ConvertColorToClass(restedColor, PA:GetClassColor(info.class), .6)
end
bar:SetStatusBarColor(expColor.r, expColor.g, expColor.b, expColor.a)
......@@ -282,7 +282,10 @@ function MXP:QUEST_LOG_UPDATE()
QuestLogXP, ZoneQuestXP, CompletedQuestXP = 0, 0, 0
for i = 1, C_QuestLog.GetNumQuestLogEntries() do
MXP:CheckQuests(C_QuestLog.GetQuestIDForLogIndex(i), C_QuestLog.GetInfo(i).isOnMap)
local info = C_QuestLog.GetInfo(i)
if not info.isHidden then
MXP:CheckQuests(C_QuestLog.GetQuestIDForLogIndex(i), info.isOnMap)
end
end
MXP:SendMessage()
......
......@@ -584,7 +584,7 @@ function SMB:GetOptions()
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.BarMouseOver = PA.ACH:Toggle(PA.ACL['Bar MouseOver'], nil, 2)
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.Backdrop = PA.ACH:Toggle(PA.ACL['Bar Backdrop'], nil, 3)
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.IconSize = PA.ACH:Range(PA.ACL['Icon Size'], nil, 4, { min = 12, max = 48, step = 1 })
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.ButtonSpacing = PA.ACH:Range(PA.ACL['Button Spacing'], nil, 5, { min = 0, max = 10, step = 1 })
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.ButtonSpacing = PA.ACH:Range(PA.ACL['Button Spacing'], nil, 5, { min = -1, max = 10, step = 1 })
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.ButtonsPerRow = PA.ACH:Range(PA.ACL['Buttons Per Row'], nil, 6, { min = 1, max = 100, step = 1 })
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.Shadows = PA.ACH:Toggle(PA.ACL['Shadows'], nil, 7)
PA.Options.args.SquareMinimapButtons.args.General.args.MBB.args.ReverseDirection = PA.ACH:Toggle(PA.ACL['Reverse Direction'], nil, 8)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment