diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua index e694f84..f1a263f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/spellbook.lua @@ -157,23 +157,30 @@ local function AbilityButtonHelper(j) end end) end - i.styled = true - end - if x then - x:SetTexCoord(0.1, 0.9, 0.1, 0.9) - x:ClearAllPoints() - x:SetAllPoints() - if not i.Panel then - i:SetPanelTemplate("Inset", false, 3, 3, 3) - end - end + i.styled = true + + if x then + x:SetTexCoord(0.1, 0.9, 0.1, 0.9) + x:ClearAllPoints() + x:SetAllPoints() + if not i.Panel then + i:SetPanelTemplate("Inset", false, 3, 3, 3) + end + end + + if(i.Name) then i.Name:SetFontObject(NumberFont_Outline_Large) i.Name:SetTextColor(1,1,0) end + if(i.InfoText) then i.InfoText:SetFontObject(NumberFont_Shadow_Small) i.InfoText:SetTextColor(0.9,0.9,0.9) end + end i.styled = true end local function ButtonUpdateHelper(self, strip) - for j=1, SPELLS_PER_PAGE do - local i = _G["SpellButton"..j] - local x = _G["SpellButton"..j.."IconTexture"] + for j=1, SPELLS_PER_PAGE do + local name = "SpellButton"..j + local i = _G[name] + local x = _G[name.."IconTexture"] + local spellString = _G[name.."SpellName"]; + local subSpellString = _G[name.."SubSpellName"]; if not InCombatLockdown() then i:SetFrameLevel(SpellBookFrame:GetFrameLevel() + 5) end @@ -187,10 +194,10 @@ local function ButtonUpdateHelper(self, strip) end end end - if _G["SpellButton"..j.."Highlight"]then - _G["SpellButton"..j.."Highlight"]:SetTexture(1, 1, 1, 0.3) - _G["SpellButton"..j.."Highlight"]:ClearAllPoints() - _G["SpellButton"..j.."Highlight"]:SetAllPoints(x) + if _G[name.."Highlight"] then + _G[name.."Highlight"]:SetTexture(1, 1, 1, 0.3) + _G[name.."Highlight"]:ClearAllPoints() + _G[name.."Highlight"]:SetAllPoints(x) end if i.shine then i.shine:ClearAllPoints() @@ -204,7 +211,9 @@ local function ButtonUpdateHelper(self, strip) if not i.Panel then i:SetPanelTemplate("Slot") end - end + end + if(spellString) then spellString:SetFontObject(NumberFontNormal) spellString:SetTextColor(1,1,0) end + if(subSpellString) then subSpellString:SetFontObject(NumberFont_Shadow_Small) subSpellString:SetTextColor(0.9,0.9,0.9) end end end --[[ @@ -263,6 +272,11 @@ local function SpellBookStyle() local frameMissing = _G[("%sMissing"):format(gName)] if(frame and frame.missingText) then frame.missingText:SetTextColor(0, 0, 0) end if(frameMissing) then frameMissing:SetTextColor(1, 1, 0) end + --frame.skillName + if(frame.missingHeader) then frame.missingHeader:SetFontObject(NumberFont_Outline_Large) frame.missingHeader:SetTextColor(1,1,0) end + if(frame.missingText) then frame.missingText:SetFontObject(NumberFont_Shadow_Small) frame.missingText:SetTextColor(0.9,0.9,0.9) end + if(frame.rank) then frame.rank:SetFontObject(NumberFontNormal) frame.rank:SetTextColor(0.9,0.9,0.9) end + if(frame.professionName) then frame.professionName:SetFontObject(NumberFont_Outline_Large) frame.professionName:SetTextColor(1,1,0) end end for _, gName in pairs(proButtons)do @@ -279,6 +293,8 @@ local function SpellBookStyle() button.Panel:SetAllPoints() end end + if(button.spellString) then button.spellString:SetFontObject(NumberFontNormal) button.spellString:SetTextColor(1,1,0) end + if(button.subSpellString) then button.subSpellString:SetFontObject(NumberFont_Shadow_Small) button.subSpellString:SetTextColor(0.9,0.9,0.9) end end end diff --git a/Interface/SPELLBOOK/Professions-Book-Left.blp b/Interface/SPELLBOOK/Professions-Book-Left.blp index d6496a0..baa7515 100644 Binary files a/Interface/SPELLBOOK/Professions-Book-Left.blp and b/Interface/SPELLBOOK/Professions-Book-Left.blp differ diff --git a/Interface/SPELLBOOK/Professions-Book-Right.blp b/Interface/SPELLBOOK/Professions-Book-Right.blp index e499938..6b82b3b 100644 Binary files a/Interface/SPELLBOOK/Professions-Book-Right.blp and b/Interface/SPELLBOOK/Professions-Book-Right.blp differ diff --git a/Interface/SPELLBOOK/Spellbook-Page-1.blp b/Interface/SPELLBOOK/Spellbook-Page-1.blp index c96119d..96f0473 100644 Binary files a/Interface/SPELLBOOK/Spellbook-Page-1.blp and b/Interface/SPELLBOOK/Spellbook-Page-1.blp differ diff --git a/Interface/SPELLBOOK/Spellbook-Page-2.blp b/Interface/SPELLBOOK/Spellbook-Page-2.blp index 97ee489..131cbf0 100644 Binary files a/Interface/SPELLBOOK/Spellbook-Page-2.blp and b/Interface/SPELLBOOK/Spellbook-Page-2.blp differ