Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 16:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

update & cleanup

Browse Source
This commit is contained in:
Crum
2017-12-15 00:18:08 -06:00
parent 995b19530c
commit f1a66d8761
4 changed files with 75 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Craft.lua
+30 -24
View File
@@ -3,16 +3,16 @@ local S = E:GetModule("Skins");
--Cache global variables
--Lua functions
local _G = getfenv()
local _G = _G
local unpack = unpack
local select = select
local find = string.find
--WoW API / Variables
local hooksecurefunc = hooksecurefunc
local GetItemInfo = GetItemInfo
local GetItemQualityColor = GetItemQualityColor
local GetCraftReagentInfo = GetCraftReagentInfo
local GetCraftItemLink = GetCraftItemLink
local hooksecurefunc = hooksecurefunc
local function LoadSkin()
-- if E.private.skins.blizzard.enable ~= true or not E.private.skins.blizzard.craft ~= true then return end
@@ -80,40 +80,46 @@ local function LoadSkin()
CraftIcon:SetPoint("TOPLEFT", 4, -3)
local skillLink = GetCraftItemLink(id)
local skillEnchantID = select(3, strfind(skillLink, "enchant:(%d+)"))
local skillItemID = select(3, strfind(skillLink, "item:(%d+)"))
local skillID = skillEnchantID or skillItemID
if skillEnchantID or skillItemID then
if skillLink then
local skillEnchantID = select(3, find(skillLink, "enchant:(%d+)"))
local skillItemID = select(3, find(skillLink, "item:(%d+)"))
local skillID = skillEnchantID or skillItemID
CraftRequirements:SetTextColor(1, 0.80, 0.10)
local quality = select(3, GetItemInfo(skillID))
if quality and quality > 1 then
CraftIcon:SetBackdropBorderColor(GetItemQualityColor(quality))
CraftName:SetTextColor(GetItemQualityColor(quality))
else
CraftIcon:SetBackdropBorderColor(unpack(E["media"].bordercolor))
CraftName:SetTextColor(1, 1, 1)
if skillID then
local quality = select(3, GetItemInfo(skillID))
if quality and quality > 1 then
CraftIcon:SetBackdropBorderColor(GetItemQualityColor(quality))
CraftName:SetTextColor(GetItemQualityColor(quality))
else
CraftIcon:SetBackdropBorderColor(unpack(E["media"].bordercolor))
CraftName:SetTextColor(1, 1, 1)
end
end
end
local numReagents = GetCraftNumReagents(id)
for i = 1, numReagents, 1 do
local reagentName, reagentTexture, reagentCount, playerReagentCount = GetCraftReagentInfo(id, i)
local _, _, reagentCount, playerReagentCount = GetCraftReagentInfo(id, i)
local reagentLink = GetCraftReagentItemLink(id, i)
local reagentID = select(3, strfind(reagentLink, "item:(%d+)"))
local icon = _G["CraftReagent" .. i .. "IconTexture"]
local name = _G["CraftReagent" .. i .. "Name"]
if reagentID then
local quality = select(3, GetItemInfo(reagentID))
if quality and quality > 1 then
icon.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality))
if playerReagentCount < reagentCount then
name:SetTextColor(0.5, 0.5, 0.5)
if reagentLink then
local reagentEnchantID = select(3, find(reagentLink, "item:(%d+)"))
local reagentItemID = select(3, find(reagentLink, "item:(%d+)"))
local reagentID = reagentEnchantID or reagentItemID
if reagentID then
local quality = select(3, GetItemInfo(reagentID))
if quality and quality > 1 then
icon.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality))
if playerReagentCount < reagentCount then
name:SetTextColor(0.5, 0.5, 0.5)
else
name:SetTextColor(GetItemQualityColor(quality))
end
else
name:SetTextColor(GetItemQualityColor(quality))
icon.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
else
icon.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
end
end
2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua
+4 -4
View File
@@ -3,16 +3,16 @@ local S = E:GetModule("Skins");
--Cache global variables
--Lua functions
local _G = getfenv()
local unpack, select = unpack, select
local _G = _G
local unpack = unpack
local select = select
--WoW API / Variables
local hooksecurefunc = hooksecurefunc
local GetInboxItem = GetInboxItem
local GetItemInfo = GetItemInfo
local GetItemQualityColor = GetItemQualityColor
local GetSendMailItem = GetSendMailItem
local hooksecurefunc = hooksecurefunc
local INBOXITEMS_TO_DISPLAY = INBOXITEMS_TO_DISPLAY
local ATTACHMENTS_MAX_RECEIVE = ATTACHMENTS_MAX_RECEIVE
local function LoadSkin()
-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.mail ~= true then return end
2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Quest.lua
+16 -22
View File
@@ -3,11 +3,13 @@ local S = E:GetModule("Skins");
--Cache global variables
--Lua functions
local _G = getfenv()
local _G = _G
local pairs = pairs
local unpack = unpack
local find = string.find
--WoW API / Variables
local GetItemInfo = GetItemInfo
local GetItemQualityColor = GetItemQualityColor
local hooksecurefunc = hooksecurefunc
local function LoadSkin()
@@ -61,7 +63,6 @@ local function LoadSkin()
item:SetFrameLevel(item:GetFrameLevel() + 2)
icon:SetDrawLayer("OVERLAY")
-- icon:Size(icon:GetWidth() -(E.Spacing*2), icon:GetHeight() -(E.Spacing*2))
icon:SetWidth(icon:GetWidth() -(E.Spacing*2))
icon:SetHeight(icon:GetHeight() -(E.Spacing*2))
icon:SetPoint("TOPLEFT", E.Border, -E.Border)
@@ -83,7 +84,6 @@ local function LoadSkin()
item:SetFrameLevel(item:GetFrameLevel() + 2)
icon:SetDrawLayer("OVERLAY")
-- icon:Size(icon:GetWidth() -(E.Spacing*2), icon:GetHeight() -(E.Spacing*2))
icon:SetWidth(icon:GetWidth() -(E.Spacing*2))
icon:SetHeight(icon:GetHeight() -(E.Spacing*2))
icon:SetPoint("TOPLEFT", E.Border, -E.Border)
@@ -105,7 +105,6 @@ local function LoadSkin()
item:SetFrameLevel(item:GetFrameLevel() + 2)
icon:SetDrawLayer("OVERLAY")
-- icon:Size(icon:GetWidth() -(E.Spacing*2), icon:GetHeight() -(E.Spacing*2))
icon:SetWidth(icon:GetWidth() -(E.Spacing*2))
icon:SetHeight(icon:GetHeight() -(E.Spacing*2))
icon:SetPoint("TOPLEFT", E.Border, -E.Border)
@@ -117,19 +116,24 @@ local function LoadSkin()
local function QuestQualityColors(frame, text, quality, link)
if link and not quality then
_, _, quality = GetItemInfo(link)
local itemEnchantID = select(3, find(link, "enchant:(%d+)"))
local itemItemID = select(3, find(link, "item:(%d+)"))
local itemID = itemEnchantID or itemItemID
if itemID then
_, _, quality = GetItemInfo(itemID)
end
end
if quality and quality > 1 then
if frame then
frame:SetBackdropBorderColor(GetItemQualityColor(quality))
-- frame.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality))
frame.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality))
end
text:SetTextColor(GetItemQualityColor(quality))
else
if frame then
frame:SetBackdropBorderColor(unpack(E["media"].bordercolor))
-- frame.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor))
frame.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
text:SetTextColor(1, 1, 1)
end
@@ -139,7 +143,6 @@ local function LoadSkin()
E:SetTemplate(QuestRewardItemHighlight, "Default", nil, true)
QuestRewardItemHighlight:SetBackdropBorderColor(1, 1, 0)
QuestRewardItemHighlight:SetBackdropColor(0, 0, 0, 0)
-- QuestRewardItemHighlight:Size(142, 40)
QuestRewardItemHighlight:SetWidth(142)
QuestRewardItemHighlight:SetHeight(40)
@@ -306,7 +309,6 @@ local function LoadSkin()
S:HandleButton(QuestTrack)
QuestTrack:SetText(TRACK_QUEST)
QuestTrack:SetPoint("TOP", QuestLogFrame, "TOP", -64, -42)
-- QuestTrack:Size(110, 21)
QuestTrack:SetWidth(110)
QuestTrack:SetHeight(21)
@@ -342,8 +344,11 @@ local function LoadSkin()
else
QuestTrack:Enable()
end
QuestLogListScrollFrame:Show()
if EmptyQuestLogFrame:IsVisible() then
QuestLogListScrollFrame:Hide()
else
QuestLogListScrollFrame:Show()
end
end)
for i = 1, 6 do
@@ -358,7 +363,6 @@ local function LoadSkin()
item:SetFrameLevel(item:GetFrameLevel() + 2)
icon:SetDrawLayer("OVERLAY")
-- icon:Size(icon:GetWidth() -(E.Spacing*2), icon:GetHeight() -(E.Spacing*2))
icon:SetWidth(icon:GetWidth() -(E.Spacing*2))
icon:SetHeight(icon:GetHeight() -(E.Spacing*2))
icon:SetPoint("TOPLEFT", E.Border, -E.Border)
@@ -389,16 +393,6 @@ local function LoadSkin()
end
end)
-- QUESTS_DISPLAYED = 25
-- for i = 7, 25 do
-- local questLogTitle = CreateFrame("Button", "QuestLogTitle" .. i, QuestLogFrame, "QuestLogTitleButtonTemplate")
-- questLogTitle:SetID(i)
-- questLogTitle:Hide()
-- questLogTitle:SetPoint("TOPLEFT", _G["QuestLogTitle" .. i - 1], "BOTTOMLEFT", 0, 1)
-- end
for i = 1, QUESTS_DISPLAYED do
local questLogTitle = _G["QuestLogTitle" .. i]
2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua
+25 -21
View File
@@ -3,7 +3,7 @@ local S = E:GetModule("Skins");
--Cache global variables
--Lua functions
local _G = getfenv()
local _G = _G
local unpack = unpack
local select = select
local find = string.find
@@ -13,6 +13,7 @@ local GetItemQualityColor = GetItemQualityColor
local GetTradeSkillItemLink = GetTradeSkillItemLink
local GetTradeSkillReagentInfo = GetTradeSkillReagentInfo
local GetTradeSkillReagentItemLink = GetTradeSkillReagentItemLink
local hooksecurefunc = hooksecurefunc
local function LoadSkin()
-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tradeskill ~= true then return end
@@ -142,39 +143,42 @@ local function LoadSkin()
TradeSkillSkillIcon:SetPoint("TOPLEFT", 4, -3)
local skillLink = GetTradeSkillItemLink(id)
local skillID = select(3, strfind(skillLink, "item:(%d+)"))
if skillID then
if skillLink then
TradeSkillRequirementLabel:SetTextColor(1, 0.80, 0.10)
local quality = select(3, GetItemInfo(skillID))
if quality and quality > 1 then
TradeSkillSkillIcon:SetBackdropBorderColor(GetItemQualityColor(quality))
TradeSkillSkillName:SetTextColor(GetItemQualityColor(quality))
else
TradeSkillSkillIcon:SetBackdropBorderColor(unpack(E["media"].bordercolor))
TradeSkillSkillName:SetTextColor(1, 1, 1)
local skillID = select(3, find(skillLink, "item:(%d+)"))
if skillID then
local quality = select(3, GetItemInfo(skillID))
if quality and quality > 1 then
TradeSkillSkillIcon:SetBackdropBorderColor(GetItemQualityColor(quality))
TradeSkillSkillName:SetTextColor(GetItemQualityColor(quality))
else
TradeSkillSkillIcon:SetBackdropBorderColor(unpack(E["media"].bordercolor))
TradeSkillSkillName:SetTextColor(1, 1, 1)
end
end
end
local numReagents = GetTradeSkillNumReagents(id)
for i = 1, numReagents, 1 do
local reagentName, reagentTexture, reagentCount, playerReagentCount = GetTradeSkillReagentInfo(id, i)
local _, _, reagentCount, playerReagentCount = GetTradeSkillReagentInfo(id, i)
local reagentLink = GetTradeSkillReagentItemLink(id, i)
local reagentID = select(3, strfind(reagentLink, "item:(%d+)"))
local icon = _G["TradeSkillReagent" .. i .. "IconTexture"]
local name = _G["TradeSkillReagent" .. i .. "Name"]
if reagentLink then
local quality = select(3, GetItemInfo(reagentID))
if quality and quality > 1 then
icon.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality))
if(playerReagentCount < reagentCount) then
name:SetTextColor(0.5, 0.5, 0.5)
local reagentID = select(3, find(reagentLink, "item:(%d+)"))
if reagentID then
local quality = select(3, GetItemInfo(reagentID))
if quality and quality > 1 then
icon.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality))
if playerReagentCount < reagentCount then
name:SetTextColor(0.5, 0.5, 0.5)
else
name:SetTextColor(GetItemQualityColor(quality))
end
else
name:SetTextColor(GetItemQualityColor(quality))
icon.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
else
icon.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
end
end