Commit 7fe6a0fb authored by Benik's avatar Benik

Merge remote-tracking branch 'origin/development'

parents e6abb41b 3c1edef6
v1.02
*Since ElvUI 1.06 has enabled skins, BenikUI tried to style them all again.
*Removed more skins/styles/mods that are not in WoW Classic.
*Fixed target buffs/debuffs timers
*Added the Talent frame in the Game Menu
v1.01
*Fixed BigWigs profile (thurin)
*BenikUI Classic where needed (thurin)
......
## Interface: 11302
## Author: Benik
## Version: 1.01
## Version: 1.02
## Title: |cff1784d1ElvUI|r |cff00c0faBenikUI Classic|r
## Notes: an ElvUI Classic decorative/enhancement edit
## RequiredDeps: ElvUI
......
......@@ -13,7 +13,7 @@ local GetAddOnEnableState = GetAddOnEnableState
BUI["styles"] = {}
BUI["softGlow"] = {}
BUI.TexCoords = {.08, 0.92, -.04, 0.92}
BUI.TexCoords = {.08, 0.92, -.08, 0.92}
BUI.Title = format('|cff00c0fa%s |r', 'BenikUI Classic')
BUI.Version = GetAddOnMetadata('ElvUI_BenikUI_Classic', 'Version')
BUI.ShadowMode = false;
......@@ -66,7 +66,7 @@ end
local r, g, b = 0, 0, 0
function BUI:UpdateStyleColors()
--local BTT = BUI:GetModule('Tooltip')
local BTT = BUI:GetModule('Tooltip')
for frame, _ in pairs(BUI["styles"]) do
if frame and not frame.ignoreColor then
if E.db.benikui.colors.StyleColor == 1 then
......@@ -83,8 +83,8 @@ function BUI:UpdateStyleColors()
BUI["styles"][frame] = nil;
end
end
--BTT:CheckTooltipStyleColor()
--BTT:RecolorTooltipStyle()
BTT:CheckTooltipStyleColor()
BTT:RecolorTooltipStyle()
end
function BUI:UpdateStyleVisibility()
......
......@@ -20,4 +20,14 @@
/run LegendaryItemAlertSystem:AddAlert("\124cffa335ee\124Hitem:18832::::::::::\124h[Brutality Blade]\124h\124r")
/run StorePurchaseAlertSystem:AddAlert("\124cffa335ee\124Hitem:180545::::::::::\124h[Mystic Runesaber]\124h\124r", "", "", 214)
/run DigsiteCompleteAlertSystem:AddAlert(1)
]]
\ No newline at end of file
]]
--[[for skillIndex = 1, GetNumSkillLines() do
local skillName, isHeader, isExpanded, skillRank, numTempPoints, skillModifier,
skillMaxRank, isAbandonable, stepCost, rankCost, minLevel, skillCostType,
skillDescription = GetSkillLineInfo(skillIndex)
if not isHeader and isAbandonable then
print(string.format("Skill: %s - %s/%s", skillName, skillRank, skillMaxRank))
print(skillIndex)
end
end]]
\ No newline at end of file
......@@ -20,6 +20,18 @@ BUI.MenuList = {
{text = COMMUNITIES_FRAME_TITLE, func = function() ToggleGuildFrame() end},
{text = MACROS, func = function() GameMenuButtonMacros:Click() end},
{text = SOCIAL_BUTTON, func = function() ToggleFriendsFrame() end},
{text = TALENTS,
func = function()
if not TalentFrame then
TalentFrame_LoadUI()
end
if not TalentFrame:IsShown() then
ShowUIPanel(TalentFrame)
else
HideUIPanel(TalentFrame)
end
end},
{text = MAINMENU_BUTTON,
func = function()
if ( not GameMenuFrame:IsShown() ) then
......
......@@ -416,7 +416,7 @@ local function Core()
order = 1,
type = 'description',
fontSize = 'medium',
name = format('|cffffd200%s|r', 'Elv, Tukz, Blazeflack, Azilroka, Darth Predator, Sinaris, Hydra, Merathilis, NihilisticPandemonium'),
name = format('|cffffd200%s|r', 'Elv, Tukz, Blazeflack, Azilroka, Darth Predator, Sinaris, Hydra, Merathilis, NihilisticPandemonium, Thurin'),
},
},
},
......
<Ui xmlns="http://www.blizzard.com/wow/ui/">
<script file="bags.lua"/>
<script file="auras.lua"/>
<!--<script file="tooltip.lua"/>-->
<script file="tooltip.lua"/>
<script file="afk.lua"/>
<!--<script file="flightMode.lua"/>-->
<script file="options.lua"/>
......
......@@ -76,15 +76,6 @@ local function RecountDecor()
end)
end
local function TinyDPSDecor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.tinydps then return end
if _G["tdpsFrame"] then
if not _G["tdpsFrame"].style then
_G["tdpsFrame"]:Style('Outside')
end
end
end
local function AtlasLootDecor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.atlasloot then return end
local AtlasLootFrame = _G["AtlasLoot_GUI-Frame"]
......@@ -95,46 +86,6 @@ local function AtlasLootDecor()
end
end
local function AltoholicDecor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.altoholic then return end
if _G["AltoholicFrame"] then
if not _G["AltoholicFrame"].style then
_G["AltoholicFrame"]:Style('Outside')
end
end
end
local function CliqueDecor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.clique then return end
_G["CliqueConfig"]:Style('Small')
_G["CliqueDialog"]:Style('Small')
local tab = _G["CliqueSpellTab"]
if not tab.style then
tab:Style('Inside')
tab.style:SetFrameLevel(5)
end
tab:GetNormalTexture():SetTexCoord(.08, 0.92, 0.08, 0.92)
end
local function oRA3Decor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.ora then return end
hooksecurefunc(oRA3, "ToggleFrame", function() _G["oRA3Frame"]:Style('Small'); end)
local ReadyCheckModule = oRA3:GetModule("ReadyCheck")
if (ReadyCheckModule) then
hooksecurefunc(ReadyCheckModule, "READY_CHECK", function() _G["oRA3ReadyCheck"]:Style('Small'); end)
end
end
local function PawnDecor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.pawn then return end
local frame = PawnUIFrame
if not frame.style then
frame:Style('Outside')
end
end
local function DbmDecor(event)
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.dbm then return end
......@@ -208,12 +159,6 @@ local function LibrariesDecor()
end
end
local function ZygorDecor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.zygor then return end
_G['ZygorGuidesViewerFrame_Border']:Style('Outside')
end
local function ImmersionDecor()
if not E.db.benikui.general.benikuiStyle or not E.db.benikuiSkins.addonSkins.immersion then return end
local frame = _G['ImmersionFrame']
......@@ -253,7 +198,7 @@ function AS:SkinCloseButton(Button, Reposition)
Button.Backdrop.img = Button.Backdrop:CreateTexture(nil, 'OVERLAY')
Button.Backdrop.img:SetSize(12, 12)
Button.Backdrop.img:Point("CENTER")
Button.Backdrop.img:SetTexture('Interface\\AddOns\\ElvUI_BenikUI\\media\\textures\\Close.tga')
Button.Backdrop.img:SetTexture('Interface\\AddOns\\ElvUI_BenikUI_Classic\\media\\textures\\Close.tga')
Button.Backdrop.img:SetVertexColor(1, 1, 1)
Button:HookScript('OnEnter', function(self)
......@@ -279,15 +224,9 @@ end
if AS:CheckAddOn('Skada') then AS:RegisterSkin('Skada', SkadaDecor, 2) end
if AS:CheckAddOn('Recount') then AS:RegisterSkin('Recount', RecountDecor, 2) end
if AS:CheckAddOn('TinyDPS') then AS:RegisterSkin('TinyDPS', TinyDPSDecor, 2) end
if AS:CheckAddOn('AtlasLoot') then AS:RegisterSkin('AtlasLoot', AtlasLootDecor, 2) end
if AS:CheckAddOn('Altoholic') then AS:RegisterSkin('Altoholic', AltoholicDecor, 2) end
if AS:CheckAddOn('Clique') then AS:RegisterSkin('Clique', CliqueDecor, 2) end
if AS:CheckAddOn('oRA3') then AS:RegisterSkin('oRA3', oRA3Decor, 2) end
if AS:CheckAddOn('Pawn') then AS:RegisterSkin('Pawn', PawnDecor, 2) end
if (AS:CheckAddOn('DBM-Core') and AS:CheckAddOn('DBM-StatusBarTimers') and AS:CheckAddOn('DBM-DefaultSkin')) then AS:RegisterSkin('DBM', DbmDecor, 'ADDON_LOADED') end
if AS:CheckAddOn('BugSack') then AS:RegisterSkin('BugSack', BugSackDecor, 2) end
if AS:CheckAddOn('ZygorGuidesViewer') then AS:RegisterSkin('Zygor', ZygorDecor, 2) end
if AS:CheckAddOn('Immersion') then AS:RegisterSkin('Immersion', ImmersionDecor, 2) end
AS:RegisterSkin('Libraries', LibrariesDecor, 2)
......
<Ui xmlns="http://www.blizzard.com/wow/ui/">
<script file="skins.lua"/>
<script file="elements.lua"/>
<!--<script file="blizzard_lod.lua"/>
<script file="alerts.lua"/>
<script file="addonskins.lua"/>-->
<script file="blizzard_lod.lua"/>
<!--<script file="alerts.lua"/>-->
<script file="addonskins.lua"/>
<script file="options.lua"/>
</Ui>
\ No newline at end of file
......@@ -17,17 +17,10 @@ local DecorElvUIAddons = {
local DecorAddons = {
{'Skada', L['Skada'], 'skada'},
{'Recount', L['Recount'], 'recount'},
{'TinyDPS', L['TinyDPS'], 'tinydps'},
{'AtlasLoot', L['AtlasLoot'], 'atlasloot'},
{'Altoholic', L['Altoholic'], 'altoholic'},
{'Clique', L['Clique'], 'clique'},
{'oRA3', L['oRA3'], 'ora'},
{'Pawn', L['Pawn'], 'pawn'},
{'DBM-Core', L['Deadly Boss Mods'], 'dbm'},
{'BigWigs', L['BigWigs'], 'bigwigs'},
{'ZygorGuidesViewer', L['Zygor Guides'], 'zygor'},
{'Immersion', L['Immersion'], 'immersion'},
{'AdiBags', L['AdiBags'], 'adibags'},
}
local SupportedProfiles = {
......
......@@ -39,41 +39,26 @@ local function styleFreeBlizzardFrames()
end
if db.bgscore then
if not PVPMatchScoreboard then
LoadAddOn("Blizzard_PVPMatch")
end
PVPMatchScoreboard:Style("Outside")
PVPMatchResults:Style("Outside")
WorldStateScoreFrame.backdrop:Style("Outside")
end
if db.character then
GearManagerDialogPopup:Style("Outside")
PaperDollFrame:Style("Outside")
CharacterFrame.backdrop:Style("Outside")
ReputationDetailFrame:Style("Outside")
ReputationFrame:Style("Outside")
TokenFrame:Style("Outside")
TokenFramePopup:Style("Outside")
end
if db.dressingroom then
DressUpFrame.backdrop:Style("Outside")
if not WardrobeOutfitEditFrame.style then
WardrobeOutfitEditFrame:Style("Outside")
end
end
if db.friends then
AddFriendFrame:Style("Outside")
AddFriendEntryFrame:Style("Outside")
FriendsFrame:Style("Outside")
FriendsFriendsFrame.backdrop:Style("Outside")
FriendsFriendsFrame:Style("Outside")
RecruitAFriendFrame:Style("Outside")
RecruitAFriendSentFrame:Style("Outside")
RecruitAFriendSentFrame.MoreDetails.Text:FontTemplate()
end
if db.gossip then
GossipFrame:Style("Outside")
ItemTextFrame:Style("Outside")
GossipFrame.backdrop:Style("Outside")
ItemTextFrame.backdrop:Style("Outside")
end
if db.guildregistrar then
......@@ -85,36 +70,9 @@ local function styleFreeBlizzardFrames()
HelpFrameHeader.backdrop:Style("Outside")
end
if db.lfg then
LFGInvitePopup:Style("Outside")
LFGDungeonReadyDialog:Style("Outside")
LFGDungeonReadyStatus:Style("Outside")
LFGListApplicationDialog:Style("Outside")
LFGListInviteDialog:Style("Outside")
PVEFrame.backdrop:Style("Outside")
PVPReadyDialog:Style("Outside")
RaidBrowserFrame.backdrop:Style("Outside")
QuickJoinRoleSelectionFrame:Style("Outside")
local function forceTabFont(button)
if button.isSkinned then
return
end
local text = button:GetFontString()
if text then
text:FontTemplate(nil, 11)
end
button.isSkinned = true
end
forceTabFont(LFGListFrame.ApplicationViewer.NameColumnHeader)
forceTabFont(LFGListFrame.ApplicationViewer.RoleColumnHeader)
forceTabFont(LFGListFrame.ApplicationViewer.ItemLevelColumnHeader)
end
if db.loot then
LootFrame:Style("Outside")
MasterLooterFrame:Style("Outside")
BonusRollFrame:Style("Outside")
end
if db.mail then
......@@ -138,16 +96,10 @@ local function styleFreeBlizzardFrames()
DropDownList2MenuBackdrop:Style("Outside")
EmoteMenu:Style("Outside")
GameMenuFrame:Style("Outside")
GhostFrame:Style("Outside")
GuildInviteFrame:Style("Outside")
InterfaceOptionsFrame:Style("Outside")
LanguageMenu:Style("Outside")
LFDRoleCheckPopup:Style("Outside")
QueueStatusFrame:Style("Outside")
ReadyCheckFrame:Style("Outside")
ReadyCheckListenerFrame:Style("Outside")
SideDressUpFrame:Style("Outside")
SplashFrame.backdrop:Style("Outside")
StackSplitFrame:Style("Outside")
StaticPopup1:Style("Outside")
StaticPopup2:Style("Outside")
......@@ -173,8 +125,8 @@ local function styleFreeBlizzardFrames()
if db.quest then
QuestFrame.backdrop:Style("Outside")
QuestLogPopupDetailFrame:Style("Outside")
QuestNPCModel.backdrop:Style("Outside")
QuestNPCModel:Style("Outside")
QuestLogFrame.backdrop:Style("Outside")
if BUI.AS then
QuestDetailScrollFrame:SetTemplate("Transparent")
......@@ -194,7 +146,7 @@ local function styleFreeBlizzardFrames()
end
if db.spellbook then
SpellBookFrame:Style("Outside")
SpellBookFrame.backdrop:Style("Outside")
end
if db.tabard then
......@@ -219,20 +171,13 @@ local function styleFreeBlizzardFrames()
ColorPickerFrame:Style("Outside")
end
--S:AddCallback("BenikUI_styleFreeBlizzardFrames", styleFreeBlizzardFrames)
local function StyleCagedBattlePetTooltip(tooltipFrame)
if not tooltipFrame.style then
tooltipFrame:Style("Outside")
end
end
S:AddCallback("BenikUI_styleFreeBlizzardFrames", styleFreeBlizzardFrames)
-- SpellBook tabs
local function styleSpellbook()
if
E.private.skins.blizzard.enable ~= true or E.db.benikui.general.benikuiStyle ~= true or
E.private.skins.blizzard.spellbook ~= true
then
if E.private.skins.blizzard.enable ~= true or E.db.benikui.general.benikuiStyle ~= true or
E.private.skins.blizzard.spellbook ~= true
then
return
end
......@@ -262,25 +207,8 @@ local function styleWorldMap()
end
local mapFrame = _G["WorldMapFrame"]
if not mapFrame.backdrop.style then
mapFrame.backdrop:Style("Outside")
end
if E.private.skins.blizzard.tooltip ~= true then
return
end
local questFrame = _G["QuestMapFrame"]
questFrame.QuestsFrame.StoryTooltip:SetTemplate("Transparent")
if not questFrame.QuestsFrame.StoryTooltip.style then
questFrame.QuestsFrame.StoryTooltip:Style("Outside")
end
local shoppingTooltips = {_G["WorldMapCompareTooltip1"], _G["WorldMapCompareTooltip2"]}
for i, tooltip in pairs(shoppingTooltips) do
if not tooltip.style then
tooltip:Style("Outside")
end
if not mapFrame.style then
mapFrame:Style("Outside")
end
end
......@@ -487,45 +415,10 @@ local function StyleDBM_Options()
return
end
DBM_GUI_OptionsFrame:HookScript(
"OnShow",
function()
DBM_GUI_OptionsFrame:Style("Outside")
end
)
end
local function StyleAltPowerBar()
if E.db.general.altPowerBar.enable ~= true then
return
end
local bar = _G["ElvUI_AltPowerBar"]
bar.backdrop:Style("Outside")
end
local function ObjectiveTrackerQuests()
local function QuestNumString()
local questNum, q, o
local block = _G["ObjectiveTrackerBlocksFrame"]
local frame = _G["ObjectiveTrackerFrame"]
if not InCombatLockdown() then
questNum = select(2, GetNumQuestLogEntries())
if questNum >= (MAX_QUESTS - 5) then -- go red
q = format("|cffff0000%d/%d|r %s", questNum, MAX_QUESTS, TRACKER_HEADER_QUESTS)
o = format("|cffff0000%d/%d|r %s", questNum, MAX_QUESTS, OBJECTIVES_TRACKER_LABEL)
else
q = format("%d/%d %s", questNum, MAX_QUESTS, TRACKER_HEADER_QUESTS)
o = format("%d/%d %s", questNum, MAX_QUESTS, OBJECTIVES_TRACKER_LABEL)
end
block.QuestHeader.Text:SetText(q)
frame.HeaderMenu.Title:SetText(o)
end
end
hooksecurefunc("ObjectiveTracker_Update", QuestNumString)
DBM_GUI_OptionsFrame:HookScript("OnShow", function()
DBM_GUI_OptionsFrame:Style("Outside")
end)
end
--S:AddCallback("BenikUI_ObjectiveTracker", ObjectiveTrackerQuests)
local function StyleInFlight()
if E.db.benikuiSkins.variousSkins.inflight ~= true or E.db.benikui.misc.flightMode == true then
......@@ -545,40 +438,23 @@ end
local function LoadInFlight()
local f = CreateFrame("Frame")
f:RegisterEvent("UPDATE_BONUS_ACTIONBAR")
f:RegisterEvent("UPDATE_MULTI_CAST_ACTIONBAR")
f:SetScript(
"OnEvent",
function(self, event)
if event then
StyleInFlight()
f:UnregisterEvent(event)
end
f:SetScript("OnEvent", function(self, event)
if event then
StyleInFlight()
f:UnregisterEvent(event)
end
)
end
local function VehicleExit()
if E.private.actionbar.enable ~= true then
return
end
local f = _G["LeaveVehicleButton"]
f:SetNormalTexture("Interface\\AddOns\\ElvUI_BenikUI\\media\\textures\\flightMode\\arrow")
f:SetPushedTexture("Interface\\AddOns\\ElvUI_BenikUI\\media\\textures\\flightMode\\arrow")
f:SetHighlightTexture("Interface\\AddOns\\ElvUI_BenikUI\\media\\textures\\flightMode\\arrow")
end)
end
function mod:StyleAdibagsBank()
if not E.db.benikuiSkins.addonSkins.adibags or not BUI.AS then
return
end
E:Delay(
0.2,
function()
if AdiBagsContainer2 then
AdiBagsContainer2:Style("Inside")
end
E:Delay(0.2, function()
if AdiBagsContainer2 then
AdiBagsContainer2:Style("Inside")
end
)
end)
end
local function StyleAdibags()
......@@ -607,7 +483,7 @@ end
function mod:PLAYER_ENTERING_WORLD(...)
--self:styleAlertFrames()
styleAddons()
--styleWorldMap()
styleWorldMap()
--StyleAdibags()
self:UnregisterEvent("PLAYER_ENTERING_WORLD")
......@@ -630,25 +506,21 @@ local function StyleAceTooltip(self)
end
function mod:Initialize()
--VehicleExit()
if E.db.benikui.general.benikuiStyle ~= true then return end
hooksecurefunc(E, "ToggleOptionsUI", StyleElvUIConfig)
--skinDecursive()
--skinStoryline()
--StyleAltPowerBar()
self:RegisterEvent("PLAYER_ENTERING_WORLD")
--self:RegisterEvent("ADDON_LOADED", "LoD_AddOns")
self:RegisterEvent("ADDON_LOADED", "LoD_AddOns")
--self:RegisterEvent("BANKFRAME_OPENED", "StyleAdibagsBank")
if E.private.skins.blizzard.tooltip ~= true then
return
end
--hooksecurefunc("BattlePetTooltipTemplate_SetBattlePet", StyleCagedBattlePetTooltip)
--hooksecurefunc(S, "Ace3_StyleTooltip", StyleAceTooltip)
hooksecurefunc(S, "Ace3_StyleTooltip", StyleAceTooltip)
end
BUI:RegisterModule(mod:GetName())
\ No newline at end of file
......@@ -156,11 +156,26 @@ function mod:TankTargetShadows()
end
end
function mod:PostUpdateAura(unit, button)
function mod:PostUpdateAura(unit, button, index, position, duration, expiration, debuffType, isStealable, unitCaster, spellID, name)
if not button.shadow then
button:CreateSoftShadow()
end
if duration == 0 and expiration == 0 then
duration, expiration = E.Libs.LCD:GetAuraDurationByUnit(unit, spellID, unitCaster, name)
button.IsLibClassicDuration = true
end
if (button.cd) and (button.IsLibClassicDuration) then
if (duration and duration > 0) then
button.cd:SetCooldown(expiration - duration, duration)
button.cd:Show()
else
button.cd:Hide()
end
end
if button.isDebuff then
if(not button.isFriend and not button.isPlayer) then
button:SetBackdropBorderColor(0.9, 0.1, 0.1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment