From 2cadb1ab7b37149690c7d2406e2674f66dfb0338 Mon Sep 17 00:00:00 2001 From: Gennoken Date: Fri, 3 Jun 2022 12:32:34 +0100 Subject: [PATCH 1/2] 2.70 dev --- ElvUI_GennUI/{ElvUI_GennUI_Mainline.toc => ElvUI_GennUI.toc} | 2 +- ElvUI_GennUI/ElvUI_GennUI_Classic.toc | 2 +- ElvUI_GennUI/ElvUI_GennUI_TBC.toc | 2 +- ElvUI_GennUI/changelog.md | 4 ++++ ElvUI_GennUI/core/extra/PA.lua | 1 + ElvUI_GennUI/core/extra/WT.lua | 4 ++-- 6 files changed, 10 insertions(+), 5 deletions(-) rename ElvUI_GennUI/{ElvUI_GennUI_Mainline.toc => ElvUI_GennUI.toc} (95%) diff --git a/ElvUI_GennUI/ElvUI_GennUI_Mainline.toc b/ElvUI_GennUI/ElvUI_GennUI.toc similarity index 95% rename from ElvUI_GennUI/ElvUI_GennUI_Mainline.toc rename to ElvUI_GennUI/ElvUI_GennUI.toc index d8af797..28849da 100644 --- a/ElvUI_GennUI/ElvUI_GennUI_Mainline.toc +++ b/ElvUI_GennUI/ElvUI_GennUI.toc @@ -1,7 +1,7 @@ ## Interface: 90205 ## Title: |cff1784d1ElvUI |cffc31f3bGennUI ## Author: Gennoken -## Version: 2.69 +## Version: 2.70 ## Notes: A Clean Minimalistic ElvUI Edit by |cffc31f3bGennoken. ## RequiredDeps: ElvUI ## DefaultState: Enabled diff --git a/ElvUI_GennUI/ElvUI_GennUI_Classic.toc b/ElvUI_GennUI/ElvUI_GennUI_Classic.toc index 58f4dca..471b08c 100644 --- a/ElvUI_GennUI/ElvUI_GennUI_Classic.toc +++ b/ElvUI_GennUI/ElvUI_GennUI_Classic.toc @@ -1,7 +1,7 @@ ## Interface: 11403 ## Title: |cff1784d1ElvUI |cffc31f3bGennUI |cff1784d1Classic ## Author: Gennoken -## Version: 2.69 +## Version: 2.70 ## Notes: A Clean Minimalistic ElvUI Edit by |cffc31f3bGennoken. ## RequiredDeps: ElvUI ## DefaultState: Enabled diff --git a/ElvUI_GennUI/ElvUI_GennUI_TBC.toc b/ElvUI_GennUI/ElvUI_GennUI_TBC.toc index fbaa5bf..bec8499 100644 --- a/ElvUI_GennUI/ElvUI_GennUI_TBC.toc +++ b/ElvUI_GennUI/ElvUI_GennUI_TBC.toc @@ -1,7 +1,7 @@ ## Interface: 20504 ## Title: |cff1784d1ElvUI |cffc31f3bGennUI |cff1784d1TBC ## Author: Gennoken -## Version: 2.69 +## Version: 2.70 ## Notes: A Clean Minimalistic ElvUI Edit by |cffc31f3bGennoken. ## RequiredDeps: ElvUI ## DefaultState: Enabled diff --git a/ElvUI_GennUI/changelog.md b/ElvUI_GennUI/changelog.md index 5232550..0e8de6e 100644 --- a/ElvUI_GennUI/changelog.md +++ b/ElvUI_GennUI/changelog.md @@ -1,5 +1,9 @@ # Changelog +**v2.70 []** +- WindTools/ProjectAzilroka small adjustements. +- + **v2.69 [02/06/2022]** - Fix corrupt TOC files diff --git a/ElvUI_GennUI/core/extra/PA.lua b/ElvUI_GennUI/core/extra/PA.lua index d4a9290..ab9e7ec 100644 --- a/ElvUI_GennUI/core/extra/PA.lua +++ b/ElvUI_GennUI/core/extra/PA.lua @@ -24,6 +24,7 @@ ProjectAzilrokaDB = { ["SquareMinimapButtons"] = { ["Backdrop"] = false, ["Shadows"] = false, + ["ButtonsPerRow"] = 8, }, ["DragonOverlay"] = { ["Enable"] = false, diff --git a/ElvUI_GennUI/core/extra/WT.lua b/ElvUI_GennUI/core/extra/WT.lua index 0e96d16..0b01928 100644 --- a/ElvUI_GennUI/core/extra/WT.lua +++ b/ElvUI_GennUI/core/extra/WT.lua @@ -9,8 +9,8 @@ function GNUI:LoadWTProfile() if IsAddOnLoaded('ElvUI_WindTools') then E.db["movers"]["WTCombatAlertFrameMover"] = "TOP,UIParent,TOP,0,-370" -E.db["movers"]["WTExtraItemsBar1Mover"] = "BOTTOMRIGHT,UIParent,BOTTOMRIGHT,-347,197" -E.db["movers"]["WTExtraItemsBar2Mover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-347,229" +E.db["movers"]["WTExtraItemsBar1Mover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-302,18" +E.db["movers"]["WTExtraItemsBar2Mover"] = "BOTTOMRIGHT,UIParent,BOTTOMRIGHT,-302,50" E.db["movers"]["WTGameBarAnchor"] = "TOP,ElvUIParent,TOP,0,-4" E.db["movers"]["WTRaidMarkersBarAnchor"] = "BOTTOM,ElvUIParent,BOTTOM,-342,378" E.db["WT"]["announcement"]["goodbye"]["enable"] = false From 668a2d95e360446aae32b16fe3f30e2e9c5d694e Mon Sep 17 00:00:00 2001 From: Gennoken Date: Thu, 11 Aug 2022 23:01:31 +0100 Subject: [PATCH 2/2] 2.70 --- ...I_GennUI.toc => ElvUI_GennUI_Mainline.toc} | 0 ElvUI_GennUI/addons/BattleGroundEnemies.lua | 93 +++++++++++++----- ElvUI_GennUI/addons/WarpDeplete.lua | 42 ++++++++ ElvUI_GennUI/addons/addons.lua | 25 +++-- ElvUI_GennUI/addons/addons.xml | Bin 561 -> 595 bytes ElvUI_GennUI/changelog.md | 10 +- ElvUI_GennUI/core.lua | 2 - ElvUI_GennUI/core/chat.lua | 2 +- ElvUI_GennUI/core/extra/extra.xml | Bin 162 -> 136 bytes ElvUI_GennUI/init.lua | 6 -- 10 files changed, 134 insertions(+), 46 deletions(-) rename ElvUI_GennUI/{ElvUI_GennUI.toc => ElvUI_GennUI_Mainline.toc} (100%) create mode 100644 ElvUI_GennUI/addons/WarpDeplete.lua diff --git a/ElvUI_GennUI/ElvUI_GennUI.toc b/ElvUI_GennUI/ElvUI_GennUI_Mainline.toc similarity index 100% rename from ElvUI_GennUI/ElvUI_GennUI.toc rename to ElvUI_GennUI/ElvUI_GennUI_Mainline.toc diff --git a/ElvUI_GennUI/addons/BattleGroundEnemies.lua b/ElvUI_GennUI/addons/BattleGroundEnemies.lua index c451377..a3b84c5 100644 --- a/ElvUI_GennUI/addons/BattleGroundEnemies.lua +++ b/ElvUI_GennUI/addons/BattleGroundEnemies.lua @@ -13,18 +13,50 @@ BattleGroundEnemiesDB = { ["40"] = { ["Enabled"] = false, }, + ["5"] = { + ["NumericTargetindicator_Enabled"] = false, + ["DrTracking_DisplayType"] = "Frame", + ["DrTracking_Container_RelativeTo"] = "Racial", + ["Position_Y"] = 258.1332310769267, + ["Trinket_Width"] = 30, + ["CovenantIcon_VerticalPosition"] = 4, + ["BarVerticalSpacing"] = 8, + ["PlayerCount_Enabled"] = false, + ["Auras_Buffs_IconsPerRow"] = 4, + ["DrTracking_Container_OffsetX"] = 10, + ["PowerBar_Texture"] = "GennUI", + ["DrTracking_Container_BasicPoint"] = "LEFT", + ["enabled"] = false, + ["BarVerticalGrowdirection"] = "upwards", + ["BarWidth"] = 180, + ["Racial_Width"] = 30, + ["HealthBar_Texture"] = "GennUI", + ["RacialFiltering_Filterlist"] = { + [7744] = true, + [59752] = true, + [107079] = true, + [58984] = true, + }, + ["Name_Fontsize"] = 12, + ["Spec_Width"] = 30, + ["Position_X"] = 991.2899545590335, + ["DrTracking_Container_RelativePoint"] = "RIGHT", + ["PowerBar_Enabled"] = true, + ["PowerBar_Height"] = 2, + ["BarHeight"] = 30, + ["DrTracking_GrowDirection"] = "rightwards", + ["RoleIcon_Enabled"] = false, + }, ["ShowRealmnames"] = false, + ["RangeIndicator_Frames"] = { + ["healthBar"] = true, + }, ["15"] = { ["NumericTargetindicator_Enabled"] = false, ["NumericTargetindicator_Fontsize"] = 12, + ["DrTracking_Container_RelativeTo"] = "Racial", ["Position_Y"] = 258.1335782991573, ["CovenantIcon_VerticalPosition"] = 1, - ["PowerBar_Background"] = { - 0.0784313725490196, -- [1] - 0.0784313725490196, -- [2] - 0.0784313725490196, -- [3] - 1, -- [4] - }, ["RoleIcon_VerticalPosition"] = 5, ["Auras_Enabled"] = false, ["ObjectiveAndRespawn_Outline"] = "OUTLINE", @@ -34,6 +66,7 @@ BattleGroundEnemiesDB = { ["BarVerticalGrowdirection"] = "upwards", ["BarWidth"] = 180, ["HealthBar_Texture"] = "GennUI", + ["CovenantIcon_Size"] = 18, ["HealthBar_Background"] = { 0.0784313725490196, -- [1] 0.0784313725490196, -- [2] @@ -41,24 +74,33 @@ BattleGroundEnemiesDB = { 1, -- [4] }, ["Name_Fontsize"] = 12, - ["DrTracking_Cooldown_Fontsize"] = 10, ["NumericTargetindicator_Outline"] = "OUTLINE", ["Position_X"] = 983.4676453418433, + ["RoleIcon_Size"] = 10, + ["DrTracking_Container_RelativePoint"] = "RIGHT", + ["DrTracking_Cooldown_Fontsize"] = 10, ["PowerBar_Height"] = 1, ["PlayerCount_Fontsize"] = 12, - ["RoleIcon_Size"] = 10, - ["DrTracking_GrowDirection"] = "rightwards", ["BarHeight"] = 20, - ["DrTracking_Container_RelativeTo"] = "Racial", - ["DrTracking_Container_RelativePoint"] = "RIGHT", ["ObjectiveAndRespawn_Fontsize"] = 14, - ["CovenantIcon_Size"] = 18, + ["PowerBar_Background"] = { + 0.0784313725490196, -- [1] + 0.0784313725490196, -- [2] + 0.0784313725490196, -- [3] + 1, -- [4] + }, ["Name_EnableTextshadow"] = false, + ["DrTracking_GrowDirection"] = "rightwards", }, }, ["ShowTooltips"] = false, ["Font"] = "GennUI", - ["lastReadVersion"] = "9.0.5.6", + ["RBG"] = { + ["TargetCalling_SetMark"] = true, + ["EnemiesTargetingMe_Amount"] = 3, + ["EnemiesTargetingMe_Enabled"] = false, + }, + ["lastReadVersion"] = "9.2.0.11", ["Allies"] = { ["ConvertCyrillic"] = false, ["40"] = { @@ -67,10 +109,14 @@ BattleGroundEnemiesDB = { ["Enabled"] = false, ["ShowRealmnames"] = false, ["15"] = { + ["Auras_Debuffs_Container_RelativeTo"] = "DRContainer", ["NumericTargetindicator_Enabled"] = false, ["NumericTargetindicator_Fontsize"] = 12, + ["Racial_BasicPoint"] = "LEFT", ["Auras_Debuffs_DebuffTypeFiltering_Enabled"] = false, + ["DrTracking_Container_RelativeTo"] = "Racial", ["Position_Y"] = 258.844819635824, + ["CovenantIcon_VerticalPosition"] = 1, ["Auras_Debuffs_Size"] = 27, ["PowerBar_Background"] = { 0.0784313725490196, -- [1] @@ -86,6 +132,8 @@ BattleGroundEnemiesDB = { ["PowerBar_Texture"] = "GennUI", ["BarVerticalGrowdirection"] = "upwards", ["BarWidth"] = 180, + ["ObjectiveAndRespawn_Outline"] = "OUTLINE", + ["Trinket_OffsetX"] = 1, ["HealthBar_Texture"] = "GennUI", ["HealthBar_Background"] = { 0.0784313725490196, -- [1] @@ -94,28 +142,25 @@ BattleGroundEnemiesDB = { 1, -- [4] }, ["Name_Fontsize"] = 12, - ["ObjectiveAndRespawn_Outline"] = "OUTLINE", - ["Trinket_OffsetX"] = 1, ["NumericTargetindicator_Outline"] = "OUTLINE", - ["Racial_RelativePoint"] = "RIGHT", ["Position_X"] = 211.2004391418668, - ["CovenantIcon_VerticalPosition"] = 1, + ["RoleIcon_Size"] = 10, ["CovenantIcon_Size"] = 18, - ["PlayerCount_Fontsize"] = 12, ["DrTracking_Cooldown_Fontsize"] = 10, ["PowerBar_Height"] = 1, - ["ObjectiveAndRespawn_Fontsize"] = 14, - ["DrTracking_Container_RelativeTo"] = "Racial", + ["PlayerCount_Fontsize"] = 12, ["BarHeight"] = 20, - ["Auras_Debuffs_Container_RelativeTo"] = "DRContainer", - ["RoleIcon_Size"] = 10, + ["ObjectiveAndRespawn_Fontsize"] = 14, ["Auras_Debuffs_Container_Point"] = "RIGHT", - ["Racial_OffsetX"] = 2, + ["Racial_RelativePoint"] = "RIGHT", ["Name_EnableTextshadow"] = false, - ["Racial_BasicPoint"] = "LEFT", + ["Racial_OffsetX"] = 2, }, }, }, }, } +if IsAddOnLoaded('Gladius') or IsAddOnLoaded('GladiusEx') then +BattleGroundEnemiesDB["profiles"]["Default"]["Enemies"]["5"]["enabled"] = false; +end end \ No newline at end of file diff --git a/ElvUI_GennUI/addons/WarpDeplete.lua b/ElvUI_GennUI/addons/WarpDeplete.lua new file mode 100644 index 0000000..a1408d0 --- /dev/null +++ b/ElvUI_GennUI/addons/WarpDeplete.lua @@ -0,0 +1,42 @@ +local E, L, V, P, G = unpack(ElvUI); +local GNUI = E:GetModule("GennUI"); + +function GNUI:LoadWDProfile() +WarpDepleteDB = { + ["profileKeys"] = { + }, + ["profiles"] = { + ["Default"] = { + ["keyFontSize"] = 18, + ["bar2Font"] = "GennUI", + ["timerSuccessColor"] = "ff06ff2c", + ["bar2FontSize"] = 14, + ["deathsFontSize"] = 14, + ["tooltipCountFormat"] = "+:percent:", + ["forcesFont"] = "GennUI", + ["frameX"] = -71.1110610961914, + ["keyDetailsFontSize"] = 14, + ["timerFont"] = "GennUI", + ["bar3Font"] = "GennUI", + ["keyDetailsColor"] = "ff00ebff", + ["showPrideGlow"] = false, + ["objectivesFont"] = "GennUI", + ["keyDetailsFont"] = "GennUI", + ["deathLogStyle"] = "count", + ["frameY"] = 152.2220916748047, + ["timerExpiredColor"] = "ffff2a2e", + ["bar1FontSize"] = 14, + ["bar1TextureColor"] = "ff979797", + ["objectivesFontSize"] = 14, + ["bar1Font"] = "GennUI", + ["forcesTextureColor"] = "ff979797", + ["deathsColor"] = "ffff2a2e", + ["forcesFontSize"] = 14, + ["deathsFont"] = "GennUI", + ["keyColor"] = "ff00ebff", + ["bar3FontSize"] = 14, + ["keyFont"] = "GennUI", + }, + }, +} +end \ No newline at end of file diff --git a/ElvUI_GennUI/addons/addons.lua b/ElvUI_GennUI/addons/addons.lua index 0b18bcf..c9c01be 100644 --- a/ElvUI_GennUI/addons/addons.lua +++ b/ElvUI_GennUI/addons/addons.lua @@ -6,16 +6,6 @@ local GNUI = E:GetModule("GennUI"); local classColor = E:ClassColor(E.myclass, true) function GNUI:SetupAddons() --- Diminish -if IsAddOnLoaded('Diminish') then - GNUI:LoadDiminishProfile() - E:Print(L["'Diminish' profile has been set."]) -end --- OmniBar -if IsAddOnLoaded('OmniBar') then - GNUI:LoadOmniBarProfile() - E:Print(L["'OmniBar' profile has been set."]) -end -- BattleGround Enemies if IsAddOnLoaded('BattleGroundEnemies') then GNUI:LoadBGEProfile() @@ -46,6 +36,11 @@ if IsAddOnLoaded('Details') then GNUI:LoadDetailsProfile() E:Print(L["'Details' profile has been set."]) end +-- Diminish +if IsAddOnLoaded('Diminish') then + GNUI:LoadDiminishProfile() + E:Print(L["'Diminish' profile has been set."]) +end -- Gladius if IsAddOnLoaded('Gladius') then E.db["unitframe"]["units"]["arena"]["enable"] = false @@ -68,6 +63,11 @@ if IsAddOnLoaded('MikScrollingBattleText') then GNUI:LoadMSBTProfile() E:Print(L["'MSBT' profile has been set."]) end +-- OmniBar +if IsAddOnLoaded('OmniBar') then + GNUI:LoadOmniBarProfile() + E:Print(L["'OmniBar' profile has been set."]) +end -- OmniCD if IsAddOnLoaded('OmniCD') then GNUI:LoadOmniCDProfile() @@ -84,6 +84,11 @@ if IsAddOnLoaded('Skada') then GNUI:LoadSkadaProfile() E:Print(L["'Skada' profile has been set."]) end +-- WarpDeplete +if IsAddOnLoaded('WarpDeplete') then + GNUI:LoadWDProfile() + E:Print(L["'WarpDeplete' profile has been set."]) +end -- Update ElvUI E:StaggeredUpdateAll(nil, true) diff --git a/ElvUI_GennUI/addons/addons.xml b/ElvUI_GennUI/addons/addons.xml index 8a983c9fa35f0cb0f85cd1776d7640bbfe72dae0..61d895b1c8b8cec41b987267654007b38373de11 100644 GIT binary patch literal 595 zcmaKoOHRW;3_#a#iYf=l>`_{YbV^ngNTur9?Kr7b&qouF67^~VO&;ck@R59G)?u9>3W6i>QnS)ijyg1s@45nvpZ!L>zTe1cIFV@sFYt0VL6vhPp6;;hNfK2Qr;8TCciR)H@Jf?Bz|fCD8wKu#7D Mqu{U6m_4mN0lyE!EdT%j literal 561 QcmZQz7zLvtKtc!r00J=p0RR91 diff --git a/ElvUI_GennUI/changelog.md b/ElvUI_GennUI/changelog.md index 0e8de6e..75002c4 100644 --- a/ElvUI_GennUI/changelog.md +++ b/ElvUI_GennUI/changelog.md @@ -1,8 +1,12 @@ # Changelog -**v2.70 []** -- WindTools/ProjectAzilroka small adjustements. -- +**v2.70 [11/08/2022]** +- **WARNING : Shadow & Light no longer supported, please remove it.** +- Solved an issue where GennUI could not be loaded. +- WindTools/ProjectAzilroka small tweaks. +- BattleGround Enemies profile updated, now includes Arena Frames. +- New AddOn profile support: WarpDeplete. +- SL Season 4 Update. **v2.69 [02/06/2022]** - Fix corrupt TOC files diff --git a/ElvUI_GennUI/core.lua b/ElvUI_GennUI/core.lua index 4832d74..488342a 100644 --- a/ElvUI_GennUI/core.lua +++ b/ElvUI_GennUI/core.lua @@ -64,8 +64,6 @@ function GNUI:SetupLayout() GNUI:LoadASProfile() -- ProjectAzilroka GNUI:LoadPAProfile() - -- Shadow & Light - GNUI:LoadSLEProfile() -- WindTools GNUI:LoadWTProfile() diff --git a/ElvUI_GennUI/core/chat.lua b/ElvUI_GennUI/core/chat.lua index d7fd3e1..628ab31 100644 --- a/ElvUI_GennUI/core/chat.lua +++ b/ElvUI_GennUI/core/chat.lua @@ -77,7 +77,7 @@ function GNUI:SetupChat() end -- keys added to TRADE - chatGroup = { 'SAY', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'GUILD', 'OFFICER', 'AFK', 'DND', 'IGNORED', 'BN_WHISPER', 'BN_INLINE_TOAST_ALERT', 'LOOT', 'CURRENCY', 'MONEY' } + chatGroup = { 'SAY', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'LOOT', 'CURRENCY', 'MONEY' } ChatFrame_RemoveAllMessageGroups(_G.ChatFrame4) for _, v in ipairs(chatGroup) do ChatFrame_AddMessageGroup(_G.ChatFrame4, v) diff --git a/ElvUI_GennUI/core/extra/extra.xml b/ElvUI_GennUI/core/extra/extra.xml index 451098db2d7c36ff030e2ac8844c2d76e1f9a8a0..a0a27bae3fbf5adbc44b005d5175ae566ed879a6 100644 GIT binary patch literal 136 zcmaFAd%sO+rb0z-PF}ICQbtKhft9{~d3m{BQch-7Rbo+!UUGh}etCYmercw@k{uVP xO>lBiWy8~xBsI{@%GEf@d* literal 162 LcmZQz80-K50HOc^ diff --git a/ElvUI_GennUI/init.lua b/ElvUI_GennUI/init.lua index d9f3664..9ce0eea 100644 --- a/ElvUI_GennUI/init.lua +++ b/ElvUI_GennUI/init.lua @@ -247,12 +247,6 @@ function GNUI:Initialize() if E.private.install_complete == nil or E.private.install_complete ~= E.version then E.private.install_complete = E.version end - - --Force SLE Install to hide - if IsAddOnLoaded('ElvUI_SLE') then - local SLEver = GetAddOnMetadata("ElvUI_SLE", "Version") - E.private.sle.install_complete = SLEver - end -- GennUI new install or update check if E.db.GNUI.install_version == nil or E.db.GNUI.install_version < GNUI.Version then