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

cleanup

Browse Source
This commit is contained in:
Pinya
2018-07-18 15:06:20 +03:00
parent de74893739
commit c60324af12
52 changed files with 48 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Modules/Blizzard/AlertFrame.lua
+3 -11
View File
@@ -1,4 +1,4 @@
local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local B = E:GetModule("Blizzard");
--Cache global variables
@@ -27,7 +27,7 @@ function E:PostAlertMove()
local rollBars = E:GetModule("Misc").RollBars
if E.private.general.lootRoll then
local lastframe, lastShownFrame
local lastframe
for i, frame in pairs(rollBars) do
frame:ClearAllPoints()
if i ~= 1 then
@@ -44,13 +44,9 @@ function E:PostAlertMove()
end
end
lastframe = frame
if frame:IsShown() then
lastShownFrame = frame
end
end
elseif E.private.skins.blizzard.enable and E.private.skins.blizzard.lootRoll then
local lastframe, lastShownFrame
local lastframe
for i = 1, NUM_GROUP_LOOT_FRAMES do
local frame = _G["GroupLootFrame" .. i]
if frame then
@@ -69,10 +65,6 @@ function E:PostAlertMove()
end
end
lastframe = frame
if frame:IsShown() then
lastShownFrame = frame
end
end
end
end
ElvUI/Modules/Blizzard/Blizzard.lua
-62
View File
@@ -1,77 +1,15 @@
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local B = E:NewModule("Blizzard", "AceEvent-3.0", "AceHook-3.0");
local GetNumQuestChoices = GetNumQuestChoices
local GetNumQuestLogChoices = GetNumQuestLogChoices
local GetQuestLogRewardHonor = GetQuestLogRewardHonor
local GetQuestLogRewardMoney = GetQuestLogRewardMoney
local GetQuestLogRewardSpell = GetQuestLogRewardSpell
local GetRewardHonor = GetRewardHonor
local GetRewardMoney = GetRewardMoney
local GetRewardSpell = GetRewardSpell
E.Blizzard = B
function B:Initialize()
self:AlertMovers()
self:EnhanceColorPicker()
-- self:KillBlizzard()
self:PositionCaptureBar()
self:PositionDurabilityFrame()
self:PositionGMFrames()
self:MoveWatchFrame()
--[[self:RawHook("CombatConfig_Colorize_Update", function()
if not CHATCONFIG_SELECTED_FILTER_SETTINGS then return end
self.hooks.CombatConfig_Colorize_Update()
end, true)
hooksecurefunc("QuestFrameItems_Update", function(questState)
local spacerFrame, money, honor, numQuestRewards, numQuestChoices, numQuestSpellRewards
if questState == "QuestLog" then
spacerFrame = QuestLogSpacerFrame
money, honor, numQuestRewards, numQuestChoices, numQuestSpellRewards = GetQuestLogRewardMoney(), GetQuestLogRewardHonor(), GetNumQuestLogRewards(), GetNumQuestLogChoices(), GetQuestLogRewardSpell()
else
spacerFrame = QuestSpacerFrame
money, honor, numQuestRewards, numQuestChoices, numQuestSpellRewards = GetRewardMoney(), GetRewardHonor(), GetNumQuestRewards(), GetNumQuestChoices(), GetRewardSpell()
end
if money == 0 and honor > 0 and (numQuestRewards > 0 or numQuestChoices > 0 or numQuestSpellRewards) then
numQuestSpellRewards = numQuestSpellRewards and 1 or 0
local rewardsCount = numQuestRewards + numQuestChoices + numQuestSpellRewards
local honorFrame = _G[questState.."HonorFrame"]
if numQuestRewards > 0 then
honorFrame:ClearAllPoints()
honorFrame:SetPoint("TOPLEFT", questState.."Item"..rewardsCount, "BOTTOMLEFT", 3, 0)
QuestFrame_SetAsLastShown(questState.."HonorFrame", spacerFrame)
else
local questItemReceiveText = _G[questState.."ItemReceiveText"]
honorFrame:ClearAllPoints()
honorFrame:SetPoint("TOPLEFT", questItemReceiveText, "BOTTOMLEFT", 0, -5)
if numQuestSpellRewards > 0 then
questItemReceiveText:SetText(REWARD_ITEMS)
questItemReceiveText:SetPoint("TOPLEFT", questState.."Item"..rewardsCount, "BOTTOMLEFT", 3, 15)
elseif numQuestChoices > 0 then
questItemReceiveText:SetText(REWARD_ITEMS)
local index = numQuestChoices
if mod(index, 2) == 0 then
index = index - 1
end
questItemReceiveText:SetPoint("TOPLEFT", questState.."Item"..index, "BOTTOMLEFT", 3, 15)
else
questItemReceiveText:SetText(REWARD_ITEMS_ONLY)
questItemReceiveText:SetPoint("TOPLEFT", questState.."RewardTitleText", "BOTTOMLEFT", 3, 15)
end
QuestFrame_SetAsLastShown(questItemReceiveText, spacerFrame)
end
end
end)--]]
end
local function InitializeCallback()
ElvUI/Modules/Blizzard/CaptureBar.lua
+1 -1
View File
@@ -1,4 +1,4 @@
local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local B = E:GetModule("Blizzard");
--Cache global variables
ElvUI/Modules/Blizzard/ColorPicker.lua
+2 -2
View File
@@ -1,13 +1,13 @@
--[[
Credit to Jaslm, most of this code is his from the addon ColorPickerPlus
]]
local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local B = E:GetModule("Blizzard");
local S = E:GetModule("Skins");
--Cache global variables
--Lua functions
local tonumber, collectgarbage = tonumber, collectgarbage
local collectgarbage = collectgarbage
local floor = math.floor
local format = string.format
--WoW API / Variables
ElvUI/Modules/Blizzard/Durablity.lua
+1 -2
View File
@@ -1,10 +1,9 @@
local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local B = E:GetModule("Blizzard");
--Cache global variables
--Lua functions
local _G = _G
--WoW API / Variables
function B:PositionDurabilityFrame()
DurabilityFrame:SetFrameStrata("HIGH")
ElvUI/Modules/Blizzard/GM.lua
+1 -5
View File
@@ -1,10 +1,6 @@
local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local B = E:GetModule("Blizzard");
--Cache global variables
--Lua functions
--WoW API / Variables
function B:PositionGMFrames()
TicketStatusFrame:ClearAllPoints()
TicketStatusFrame:SetPoint("TOPLEFT", E.UIParent, "TOPLEFT", 250, -5)
ElvUI/Modules/Blizzard/WatchFrame.lua
+1 -2
View File
@@ -1,4 +1,4 @@
local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local B = E:GetModule("Blizzard");
--Cache global variables
@@ -6,7 +6,6 @@ local B = E:GetModule("Blizzard");
local min = math.min
--WoW API / Variables
local hooksecurefunc = hooksecurefunc
local GetScreenWidth = GetScreenWidth
local GetScreenHeight = GetScreenHeight
local WatchFrameHolder = CreateFrame("Frame", "WatchFrameHolder", E.UIParent)