Skip to content

Commit

Permalink
fix quest info up version add chat icons 7.5994
Browse files Browse the repository at this point in the history
  • Loading branch information
fxpw committed Mar 14, 2024
1 parent c614cf3 commit 46ad7a0
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ElvUI.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Interface: 30300
## Author: Elv, Bunny, fxpw
## Version: 7.5993
## Version: 7.5994
## Title: |cff1784d1E|r|cffe5e3e3lvUI|r for sirus
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB, ElvSirusDB
Expand Down
Binary file added Media/ChatLogos/angrybird.tga
Binary file not shown.
Binary file added Media/ChatLogos/gbutterfly.tga
Binary file not shown.
3 changes: 2 additions & 1 deletion Modules/Blizzard/Blizzard.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ function B:Initialize()

local items = {
["QuestInfoItem"] = MAX_NUM_ITEMS,
["QuestProgressItem"] = MAX_REQUIRED_ITEMS
["QuestProgressItem"] = MAX_REQUIRED_ITEMS,
["QuestRequiredItem"] = MAX_REQUIRED_ITEMS,
}

QuestLogFrame:HookScript("OnShow", function()
Expand Down
8 changes: 8 additions & 0 deletions Modules/Chat/Chat.lua
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ local nwd = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\nwd]], ":20
local legion = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\legion]], ":30:30")
local nerfed = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\nerfed]], ":32:32")
local bagdemagus = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\bagdemagus]], ":24:24")
local gb = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\gbutterfly]], ":32:32")
local angrybird = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\angrybird]], ":32:32")



Expand Down Expand Up @@ -284,6 +286,12 @@ local specialChatIconsSirus = {
["Чешшуйчатый-Scourge x2 - 3.3.5a+"] = bagdemagus,
["Bagdemagus-Scourge x2 - 3.3.5a+"] = bagdemagus,
["Сайона-Scourge x2 - 3.3.5a+"] = bagdemagus,

["Колючка-Sirus x5 - 3.3.5a+"] = gb,
["Колючая-Sirus x5 - 3.3.5a+"] = gb,

["Pain-Sirus x5 - 3.3.5a+"] = angrybird,
["Масстаунт-Sirus x5 - 3.3.5a+"] = angrybird,
}
local randomChatIcons = {
["Шутка-Scourge x2 - 3.3.5a+"] = true,
Expand Down
66 changes: 63 additions & 3 deletions Modules/Skins/Blizzard/Quest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ S:AddCallback("Skin_Quest", function()

local items = {
["QuestInfoItem"] = MAX_NUM_ITEMS,
["QuestProgressItem"] = MAX_REQUIRED_ITEMS
["QuestProgressItem"] = MAX_REQUIRED_ITEMS,
["QuestRequiredItem"] = MAX_REQUIRED_ITEMS,
}
for frame, numItems in pairs(items) do
for i = 1, numItems do
Expand All @@ -259,6 +260,12 @@ S:AddCallback("Skin_Quest", function()

count:SetParent(item.backdrop)
count:SetDrawLayer("OVERLAY")
if frame == "QuestRequiredItem" and count then
local text = count:GetText()
if text then
count:SetText(text:gsub(" / ", "\n"))
end
end
end
end

Expand All @@ -269,12 +276,16 @@ S:AddCallback("Skin_Quest", function()
local r, g, b = GetItemQualityColor(quality)

frame:SetBackdropBorderColor(r, g, b)
frame.backdrop:SetBackdropBorderColor(r, g, b)
if frame.backdrop then
frame.backdrop:SetBackdropBorderColor(r, g, b)
end

text:SetTextColor(r, g, b)
else
frame:SetBackdropBorderColor(unpack(E.media.bordercolor))
frame.backdrop:SetBackdropBorderColor(unpack(E.media.bordercolor))
if frame.backdrop then
frame.backdrop:SetBackdropBorderColor(unpack(E.media.bordercolor))
end

text:SetTextColor(1, 1, 1)
end
Expand Down Expand Up @@ -322,6 +333,23 @@ S:AddCallback("Skin_Quest", function()
link = item.type and (QuestInfoFrame.questLog and GetQuestLogItemLink or GetQuestItemLink)(item.type, item:GetID())

questQualityColors(item, name, link)

end
end
for i = 1, MAX_NUM_ITEMS do
item = _G["QuestRequiredItem"..i]

if item ~= self then
name = _G["QuestRequiredItem"..i.."Name"]
link = item.hyperlink
local count = _G["QuestRequiredItem"..i.."Count"]
if count then
local text = count:GetText()
if text then
count:SetText(text:gsub(" / ", "\n"))
end
end
questQualityColors(item, name, link)
end
end
end
Expand Down Expand Up @@ -393,6 +421,22 @@ S:AddCallback("Skin_Quest", function()

questQualityColors(item, name, link)
end
for i = 1, MAX_NUM_ITEMS do
item = _G["QuestRequiredItem"..i]

if item and item ~= self then
name = _G["QuestRequiredItem"..i.."Name"]
link = item.hyperlink
local count = _G["QuestRequiredItem"..i.."Count"]
if count then
local text = count:GetText()
if text then
count:SetText(text:gsub(" / ", "\n"))
end
end
questQualityColors(item, name, link)
end
end
end)

hooksecurefunc("QuestInfo_ShowRewards", function()
Expand All @@ -405,6 +449,22 @@ S:AddCallback("Skin_Quest", function()

questQualityColors(item, name, link)
end
for i = 1, MAX_NUM_ITEMS do
item = _G["QuestRequiredItem"..i]

if item and item ~= self then
name = _G["QuestRequiredItem"..i.."Name"]
link = item.hyperlink
local count = _G["QuestRequiredItem"..i.."Count"]
if count then
local text = count:GetText()
if text then
count:SetText(text:gsub(" / ", "\n"))
end
end
questQualityColors(item, name, link)
end
end
end)

hooksecurefunc("QuestInfo_ShowRequiredMoney", function()
Expand Down

0 comments on commit 46ad7a0

Please sign in to comment.