From 7d7fdb61ab87a1452282396133c0fd7bb202397b Mon Sep 17 00:00:00 2001 From: Crum Date: Thu, 1 Nov 2018 22:32:19 -0500 Subject: [PATCH 01/19] update --- ElvUI/Core/Commands.lua | 53 +- ElvUI/Core/Load_Core.xml | 4 +- ElvUI/Core/StatusReport.lua | 235 +++++++ ElvUI/Core/core.lua | 322 +++++----- ElvUI/Core/modulecopy.lua | 276 ++++++++ ElvUI/Core/toolkit.lua | 118 +++- ElvUI/Init.lua | 97 ++- ElvUI/Layout/Layout.lua | 5 +- ElvUI/Media/Fonts/DieDieDie.ttf | Bin 383352 -> 163840 bytes ElvUI/Media/Textures/ElvUI_Chat_Logo.blp | Bin 1876 -> 0 bytes ElvUI/Media/Textures/LevelUpTex.blp | Bin 0 -> 350724 bytes ElvUI/Media/Textures/PVP-Icons.blp | Bin 0 -> 44860 bytes .../Textures/PVPCurrency-Honor-Alliance.blp | Bin 0 -> 3916 bytes .../Textures/PVPCurrency-Honor-Horde.blp | Bin 0 -> 3916 bytes ElvUI/Media/Textures/Raid-Icon-Rez.blp | Bin 0 -> 6660 bytes ElvUI/Media/Textures/Smileys/happy.blp | Bin 1540 -> 0 bytes ElvUI/Media/Textures/Smileys/heart.blp | Bin 1540 -> 0 bytes ElvUI/Media/Textures/Smileys/hmm.blp | Bin 1540 -> 0 bytes .../Media/Textures/Smileys/middle_finger.blp | Bin 1540 -> 0 bytes ElvUI/Media/Textures/Smileys/sad.blp | Bin 1540 -> 0 bytes ElvUI/Media/Textures/Smileys/surprise.blp | Bin 1540 -> 0 bytes ElvUI/Media/Textures/Smileys/tongue.blp | Bin 1540 -> 0 bytes ElvUI/Media/Textures/Smileys/weepy.blp | Bin 1540 -> 0 bytes ElvUI/Media/Textures/Smileys/winky.blp | Bin 1540 -> 0 bytes ...throbe_Chat_Logo.blp => UI-CopperIcon.blp} | Bin 1540 -> 1540 bytes .../Textures/UI-Dialog-Icon-AlertNew.blp | Bin 0 -> 6660 bytes .../{Smileys/grin.blp => UI-GoldIcon.blp} | Bin 1540 -> 1540 bytes .../Media/Textures/UI-GroupLoot-Pass-Down.blp | Bin 0 -> 1868 bytes .../Textures/UI-GroupLoot-Pass-Highlight.blp | Bin 0 -> 1868 bytes ElvUI/Media/Textures/UI-GroupLoot-Pass-Up.blp | Bin 0 -> 2564 bytes ElvUI/Media/Textures/UI-LFR-PORTRAIT.blp | Bin 0 -> 6660 bytes ...blp => UI-OptionsFrame-NewFeatureIcon.blp} | Bin 1540 -> 1540 bytes .../broken_heart.blp => UI-SilverIcon.blp} | Bin 1540 -> 1540 bytes ElvUI/Media/Textures/arrowdown.tga | Bin 5672 -> 0 bytes ElvUI/Media/Textures/arrowup.tga | Bin 5672 -> 0 bytes ElvUI/Media/Textures/bubbleTex.tga | Bin 1068 -> 0 bytes ElvUI/Media/Textures/close.tga | Bin 0 -> 4114 bytes ElvUI/Media/Textures/combat.tga | Bin 0 -> 4114 bytes ...helloKittyChat1.tga => helloKittyChat.tga} | Bin ElvUI/Media/Textures/hello_kitty.tga | Bin 524332 -> 131116 bytes ElvUI/Media/Textures/logo.tga | Bin 51542 -> 131116 bytes ElvUI/Media/Textures/resting.tga | Bin 0 -> 4114 bytes ElvUI/Media/Textures/resting1.blp | Bin 0 -> 2564 bytes ElvUI/Media/Textures/tukui_logo.blp | Bin 44900 -> 0 bytes ElvUI/Media/Textures/vehicleexit.tga | Bin 16428 -> 0 bytes ElvUI/Modules/Misc/AFK.lua | 10 +- ElvUI/Settings/Global.lua | 99 ++- ElvUI_Config/ElvUI_Config.toc | 3 +- ElvUI_Config/ModuleControl.lua | 588 ++++++++++++++++++ 49 files changed, 1617 insertions(+), 193 deletions(-) create mode 100644 ElvUI/Core/StatusReport.lua create mode 100644 ElvUI/Core/modulecopy.lua delete mode 100644 ElvUI/Media/Textures/ElvUI_Chat_Logo.blp create mode 100644 ElvUI/Media/Textures/LevelUpTex.blp create mode 100644 ElvUI/Media/Textures/PVP-Icons.blp create mode 100644 ElvUI/Media/Textures/PVPCurrency-Honor-Alliance.blp create mode 100644 ElvUI/Media/Textures/PVPCurrency-Honor-Horde.blp create mode 100644 ElvUI/Media/Textures/Raid-Icon-Rez.blp delete mode 100644 ElvUI/Media/Textures/Smileys/happy.blp delete mode 100644 ElvUI/Media/Textures/Smileys/heart.blp delete mode 100644 ElvUI/Media/Textures/Smileys/hmm.blp delete mode 100644 ElvUI/Media/Textures/Smileys/middle_finger.blp delete mode 100644 ElvUI/Media/Textures/Smileys/sad.blp delete mode 100644 ElvUI/Media/Textures/Smileys/surprise.blp delete mode 100644 ElvUI/Media/Textures/Smileys/tongue.blp delete mode 100644 ElvUI/Media/Textures/Smileys/weepy.blp delete mode 100644 ElvUI/Media/Textures/Smileys/winky.blp rename ElvUI/Media/Textures/{Bathrobe_Chat_Logo.blp => UI-CopperIcon.blp} (70%) create mode 100644 ElvUI/Media/Textures/UI-Dialog-Icon-AlertNew.blp rename ElvUI/Media/Textures/{Smileys/grin.blp => UI-GoldIcon.blp} (70%) create mode 100644 ElvUI/Media/Textures/UI-GroupLoot-Pass-Down.blp create mode 100644 ElvUI/Media/Textures/UI-GroupLoot-Pass-Highlight.blp create mode 100644 ElvUI/Media/Textures/UI-GroupLoot-Pass-Up.blp create mode 100644 ElvUI/Media/Textures/UI-LFR-PORTRAIT.blp rename ElvUI/Media/Textures/{Smileys/angry.blp => UI-OptionsFrame-NewFeatureIcon.blp} (70%) rename ElvUI/Media/Textures/{Smileys/broken_heart.blp => UI-SilverIcon.blp} (70%) delete mode 100644 ElvUI/Media/Textures/arrowdown.tga delete mode 100644 ElvUI/Media/Textures/arrowup.tga delete mode 100644 ElvUI/Media/Textures/bubbleTex.tga create mode 100644 ElvUI/Media/Textures/close.tga create mode 100644 ElvUI/Media/Textures/combat.tga rename ElvUI/Media/Textures/{helloKittyChat1.tga => helloKittyChat.tga} (100%) create mode 100644 ElvUI/Media/Textures/resting.tga create mode 100644 ElvUI/Media/Textures/resting1.blp delete mode 100644 ElvUI/Media/Textures/tukui_logo.blp delete mode 100644 ElvUI/Media/Textures/vehicleexit.tga create mode 100644 ElvUI_Config/ModuleControl.lua diff --git a/ElvUI/Core/Commands.lua b/ElvUI/Core/Commands.lua index 9f1e435..63a9028 100644 --- a/ElvUI/Core/Commands.lua +++ b/ElvUI/Core/Commands.lua @@ -38,12 +38,24 @@ function FarmMode() if Minimap:IsShown() then UIFrameFadeOut(Minimap, 0.3) UIFrameFadeIn(FarmModeMap, 0.3) - Minimap.fadeInfo.finishedFunc = function() Minimap:Hide() Minimap.backdrop:Hide() _G.MinimapZoomIn:Click() _G.MinimapZoomOut:Click() Minimap:SetAlpha(1) end + Minimap.fadeInfo.finishedFunc = function() + Minimap:Hide() + Minimap.backdrop:Hide() + _G.MinimapZoomIn:Click() + _G.MinimapZoomOut:Click() + Minimap:SetAlpha(1) + end FarmModeMap.enabled = true else UIFrameFadeOut(FarmModeMap, 0.3) UIFrameFadeIn(Minimap, 0.3) - FarmModeMap.fadeInfo.finishedFunc = function() FarmModeMap:Hide() Minimap.backdrop:Show() _G.MinimapZoomIn:Click() _G.MinimapZoomOut:Click() Minimap:SetAlpha(1) end + FarmModeMap.fadeInfo.finishedFunc = function() + FarmModeMap:Hide() + Minimap.backdrop:Show() + _G.MinimapZoomIn:Click() + _G.MinimapZoomOut:Click() + Minimap:SetAlpha(1) + end FarmModeMap.enabled = false end end @@ -75,6 +87,8 @@ function E:LuaError(msg) msg = lower(msg) if msg == "on" then DisableAllAddOns() + EnableAddOn("!Compatibility") + EnableAddOn("!DebugTools") EnableAddOn("ElvUI") EnableAddOn("ElvUI_Config") SetCVar("ShowErrors", "1") @@ -114,7 +128,36 @@ function E:DelayScriptCall(msg) self:Print("usage: /in ") self:Print("example: /in 1.5 /say hi") else - E:ScheduleTimer(OnCallback, secs, command) + E:Delay(secs, OnCallback, command) + end +end + +local BLIZZARD_ADDONS = { + "Blizzard_AuctionUI", + "Blizzard_BattlefieldMinimap", + "Blizzard_BindingUI", + "Blizzard_CombatLog", + "Blizzard_CombatText", + "Blizzard_CraftUI", + "Blizzard_GMSurveyUI", + "Blizzard_GuildBankUI", + "Blizzard_InspectUI", + "Blizzard_ItemSocketingUI", + "Blizzard_MacroUI", + "Blizzard_RaidUI", + "Blizzard_TalentUI", + "Blizzard_TimeManager", + "Blizzard_TradeSkillUI", + "Blizzard_TrainerUI" +} + +function E:EnableBlizzardAddOns() + for _, addon in pairs(BLIZZARD_ADDONS) do + local reason = select(5, GetAddOnInfo(addon)) + if reason == "DISABLED" then + EnableAddOn(addon) + E:Print("The following addon was re-enabled:", addon) + end end end @@ -130,8 +173,10 @@ function E:LoadCommands() self:RegisterChatCommand("enable", "EnableAddon") self:RegisterChatCommand("disable", "DisableAddon") self:RegisterChatCommand("farmmode", "FarmMode") + self:RegisterChatCommand("enableblizzard", "EnableBlizzardAddOns") + self:RegisterChatCommand("estatus", "ShowStatusReport") if E:GetModule("ActionBars") and E.private.actionbar.enable then self:RegisterChatCommand("kb", E:GetModule("ActionBars").ActivateBindMode) end -end \ No newline at end of file +end diff --git a/ElvUI/Core/Load_Core.xml b/ElvUI/Core/Load_Core.xml index 2a74520..77cfac9 100644 --- a/ElvUI/Core/Load_Core.xml +++ b/ElvUI/Core/Load_Core.xml @@ -15,4 +15,6 @@