Verified Commit ffce610c authored by Merathilis's avatar Merathilis

Merge branch 'development' into master

parents 2ebf3cc2 793ac4b7
[b][color=orange]v4.67[/color], 29.11.2020[/b][list]
[*]AutoButtons: Added/Updated Shadowlands Pots/Flasks
[*]LocPanel: Updated Teleport Items
[*]Updated Rectangle Minimap to work in Torghast
[*]Added some vignettes to my blacklist in the Notifications
[*]Removed iFilger Profile[/list]
[b][color=orange]v4.66[/color], 23.11.2020[/b][list]
[*]Added an option to adjust the waypoints
[*]Fixed the backdrop from the Minimap if S&L is enabled
......@@ -5,7 +13,7 @@
[*]Removed GuildBest from the Mythic Keystone frame
[*]Reworked Instance Difficulty
[*]Fixed border color on the Merchant frame
[*]Added some new hearthstones/flasks/food/pots for Shadowlands
[*]Added some new hearthstones/flasks/food/pots for Shadowlands[/list]
[b][color=orange]v4.65 for Shadowland PrePatch[/color], 18.11.2020[/b][list]
......
** v4.67, 29.11.2020**
* AutoButtons: Added/Updated Shadowlands Pots/Flasks
* LocPanel: Updated Teleport Items
* Updated Rectangle Minimap to work in Torghast
* Added some vignettes to my blacklist in the Notifications
* Removed iFilger Profile
** v4.66, 23.11.2020**
* Added an option to adjust the waypoints
* Fixed the backdrop from the Minimap if S&L is enabled
......
......@@ -7,23 +7,24 @@ local ReloadUI = ReloadUI
--Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS: BigWigs3DB, LibStub
function MER:LoadBigWigsProfileDPS()
function MER:LoadBigWigsProfile()
--[[----------------------------------
-- BigWigs - Settings
--]]----------------------------------
local key = MER.Title
local main = MER.Title
local heal = MER.Title.."-".." Heal"
LoadAddOn("BigWigs_Options")
LoadAddOn("BigWigs")
if BigWigs3DB["profiles"] == nil then BigWigs3DB["profiles"] = {} end
if BigWigs3DB["profiles"][key] == nil then
if BigWigs3DB["profiles"][main] == nil then
BigWigs3DB = {
["namespaces"] = {
["BigWigs_Plugins_Alt Power"] = {
["profiles"] = {
[key] = {
[main] = {
["posx"] = 600,
["fontSize"] = 11,
["fontOutline"] = "",
......@@ -31,11 +32,30 @@ function MER:LoadBigWigsProfileDPS()
["lock"] = true,
["posy"] = 132,
},
[heal] = {
["posx"] = 90,
["fontSize"] = 11,
["fontName"] = "Merathilis Expressway",
["font"] = "Merathilis Expressway",
["lock"] = true,
["posy"] = 245,
},
},
},
["BigWigs_Plugins_Colors"] = {
["profiles"] = {
[key] = {
[main] = {
["barColor"] = {
["BigWigs_Plugins_Colors"] = {
["default"] = {
0, -- [1]
0.474509803921569, -- [2]
0.980392156862745, -- [3]
},
},
},
},
[heal] = {
["barColor"] = {
["BigWigs_Plugins_Colors"] = {
["default"] = {
......@@ -50,7 +70,7 @@ function MER:LoadBigWigsProfileDPS()
},
["BigWigs_Plugins_Bars"] = {
["profiles"] = {
[key] = {
[main] = {
["BigWigsEmphasizeAnchor_y"] = 256,
["BigWigsEmphasizeAnchor_x"] = 457,
["BigWigsAnchor_y"] = 24,
......@@ -68,97 +88,7 @@ function MER:LoadBigWigsProfileDPS()
["emphasizeGrowup"] = true,
["texture"] = "RenAscensionL",
},
},
},
["BigWigs_Plugins_Super Emphasize"] = {
["profiles"] = {
[key] = {
["monochrome"] = false,
["fontName"] = "Merathilis Expressway",
},
},
},
["BigWigs_Plugins_Messages"] = {
["profiles"] = {
[key] = {
["outline"] = "OUTLINE",
["fontSize"] = 20,
["BWEmphasizeCountdownMessageAnchor_x"] = 664,
["BWMessageAnchor_x"] = 608,
["growUpwards"] = false,
["BWEmphasizeCountdownMessageAnchor_y"] = 523,
["fontName"] = "Merathilis Expressway",
["BWEmphasizeMessageAnchor_y"] = 614,
["BWMessageAnchor_y"] = 676,
["BWEmphasizeMessageAnchor_x"] = 610,
},
},
},
["BigWigs_Plugins_Proximity"] = {
["profiles"] = {
[key] = {
["posx"] = 346.27,
["fontName"] = "Merathilis Expressway",
["lock"] = true,
["height"] = 99.0000381469727,
["posy"] = 81.82,
},
},
},
},
["profiles"] = {
[key] = {
["fakeDBMVersion"] = true,
},
},
}
end
end
function MER:LoadBigWigsProfileHeal()
--[[----------------------------------
-- BigWigs - Settings
--]]----------------------------------
local key = MER.Title.."-".." Heal"
LoadAddOn("BigWigs_Options")
LoadAddOn("BigWigs")
if BigWigs3DB["profiles"] == nil then BigWigs3DB["profiles"] = {} end
if BigWigs3DB["profiles"][key] == nil then
BigWigs3DB = {
["namespaces"] = {
["BigWigs_Plugins_Alt Power"] = {
["profiles"] = {
[key] = {
["posx"] = 90,
["fontSize"] = 11,
["fontName"] = "Merathilis Expressway",
["font"] = "Merathilis Expressway",
["lock"] = true,
["posy"] = 245,
},
},
},
["BigWigs_Plugins_Colors"] = {
["profiles"] = {
[key] = {
["barColor"] = {
["BigWigs_Plugins_Colors"] = {
["default"] = {
0, -- [1]
0.474509803921569, -- [2]
0.980392156862745, -- [3]
},
},
},
},
},
},
["BigWigs_Plugins_Bars"] = {
["profiles"] = {
[key] = {
[heal] = {
["outline"] = "OUTLINE",
["BigWigsAnchor_width"] = 200.000045776367,
["BigWigsAnchor_x"] = 941.244988069448,
......@@ -178,7 +108,11 @@ function MER:LoadBigWigsProfileHeal()
},
["BigWigs_Plugins_Super Emphasize"] = {
["profiles"] = {
[key] = {
[main] = {
["monochrome"] = false,
["fontName"] = "Merathilis Expressway",
},
[heal] = {
["monochrome"] = false,
["fontName"] = "Merathilis Expressway",
},
......@@ -186,7 +120,19 @@ function MER:LoadBigWigsProfileHeal()
},
["BigWigs_Plugins_Messages"] = {
["profiles"] = {
[key] = {
[main] = {
["outline"] = "OUTLINE",
["fontSize"] = 20,
["BWEmphasizeCountdownMessageAnchor_x"] = 664,
["BWMessageAnchor_x"] = 608,
["growUpwards"] = false,
["BWEmphasizeCountdownMessageAnchor_y"] = 523,
["fontName"] = "Merathilis Expressway",
["BWEmphasizeMessageAnchor_y"] = 614,
["BWMessageAnchor_y"] = 676,
["BWEmphasizeMessageAnchor_x"] = 610,
},
[heal] = {
["outline"] = "OUTLINE",
["fontSize"] = 20,
["BWEmphasizeCountdownMessageAnchor_x"] = 664,
......@@ -202,7 +148,14 @@ function MER:LoadBigWigsProfileHeal()
},
["BigWigs_Plugins_Proximity"] = {
["profiles"] = {
[key] = {
[main] = {
["posx"] = 346.27,
["fontName"] = "Merathilis Expressway",
["lock"] = true,
["height"] = 99.0000381469727,
["posy"] = 81.82,
},
[heal] = {
["posx"] = 931.511307278197,
["fontName"] = "Merathilis Expressway",
["posy"] = 85.3333353996277,
......@@ -213,18 +166,17 @@ function MER:LoadBigWigsProfileHeal()
},
},
["profiles"] = {
[key] = {
[main] = {
["showZoneMessages"] = false,
["fakeDBMVersion"] = true,
["flash"] = true,
},
[heal] = {
["showZoneMessages"] = false,
["fakeDBMVersion"] = true,
["flash"] = true,
},
},
}
end
end
E.PopupDialogs["MUI_INSTALL_BW_LAYOUT"] = {
text = L["MUI_INSTALL_SETTINGS_LAYOUT_BW"],
OnAccept = function() MER:LoadBigWigsProfileDPS(); ReloadUI() end,
OnCancel = function() MER:LoadBigWigsProfileHeal(); ReloadUI() end,
button1 = 'BigWigs DPS Layout',
button2 = 'BigWigs Heal Layout'
}
......@@ -5,7 +5,6 @@
<script file="DeadlyBossMods.lua"/>
<script file="Details.lua"/>
<script file="FCT.lua"/>
<script file="iFilger.lua"/>
<script file="ls_Toasts.lua"/>
<script file="ProjectAzilroka.lua"/>
<script file="Skada.lua"/>
......
local MER, E, L, V, P, G = unpack(select(2, ...))
--Cache global variables
local _G = _G
--WoW API / Variables
-- GLOBALS:
function MER:LoadiFilgerProfile()
--[[----------------------------------
-- ProjectAzilroka - Settings
--]]----------------------------------
local IF = _G.iFilger
IF.data:SetProfile('MerathilisUI')
IF.db["FocusDebuffs"]["Enable"] = false
IF.db["FocusBuffs"]["Enable"] = false
IF.db["PvPTargetBuffs"]["Enable"] = false
IF.db["PvPTargetDebuffs"]["Enable"] = false
IF.db["Enhancements"]["Enable"] = false
IF.db["RaidDebuffs"]["Enable"] = false
IF.db["PvPPlayerDebuffs"]["Enable"] = false
IF.db["Cooldowns"]["Enable"] = false
IF.db["Buffs"]["Enable"] = true
IF.db["Buffs"]["Direction"] = "LEFT"
IF.db["Buffs"]["Spacing"] = 2
IF.db["Buffs"]["IconSize"] = 32
IF.db["StackCountFont"] = "Expressway"
IF.db["StackCountFontFlag"] = "OUTLINE"
IF.db["CooldownText"]["Font"] = "Expressway"
IF.db["CooldownText"]["FontFlag"] = "OUTLINE"
end
......@@ -16,13 +16,11 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
local ChangeLogData = {
"Changes:",
"• Added an option to adjust the waypoints",
"• Fixed the backdrop from the Minimap if S&L is enabled",
"• Fixed Time DataText",
"• Removed GuildBest from the Mythic Keystone frame",
"• Reworked Instance Difficulty",
"• Fixed border color on the Merchant frame",
"• Added some new hearthstones/flasks/food/pots for Shadowlands",
"• AutoButtons: Added/Updated Shadowlands Pots/Flasks",
"• LocPanel: Updated Teleport Items",
"• Updated Rectangle Minimap to work in Torghast",
"• Added some vignettes to my blacklist in the Notifications",
"• Removed iFilger Profile",
-- "• ''",
" ",
......
## Interface: 90002
## Author: Merathilis
## Version: 4.66
## Version: 4.67
## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
## Notes: A decorative edit for ElvUI + additional features.
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
......@@ -11,7 +11,7 @@
## OptionalDeps: SharedMedia, BigWigs, ls_Toasts
## X-Credits: Benik, Blazeflack, Azilroka, Simpy, NihilisticPandemonium, Darth Predator, fgprodigal, siweia, Solor, Elv, fang2hou & all AddOn Authors who inspired me.
## X-ElvVersion: 12.13
## X-Curse-Packaged-Version: 4.66
## X-Curse-Packaged-Version: 4.67
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
......@@ -321,6 +321,7 @@ L["Equipments"] = "Ausrüstungen"
L["Potions"] = "Tränke"
L["Flasks"] = "Fläschchen"
L["Food"] = "Essen"
L["Crafted by mage"] = "Hergestellt vom Magier"
L["Banners"] = "Banner"
L["Utilities"] = "Werkzeuge"
L["Fade Time"] = "Ausblendzeit"
......
......@@ -319,6 +319,7 @@ L["Equipments"] = true
L["Potions"] = true
L["Flasks"] = true
L["Food"] = true
L["Crafted by mage"] = true
L["Banners"] = true
L["Utilities"] = true
L["Custom Items"] = true
......
......@@ -318,6 +318,7 @@ L["Equipments"] = true
L["Potions"] = true
L["Flasks"] = true
L["Food"] = true
L["Crafted by mage"] = true
L["Banners"] = true
L["Utilities"] = true
L["Custom Items"] = true
......
......@@ -317,6 +317,7 @@ L["Quest Items"] = true
L["Equipments"] = true
L["Potions"] = true
L["Food"] = true
L["Crafted by mage"] = true
L["Flasks"] = true
L["Banners"] = true
L["Utilities"] = true
......
......@@ -318,6 +318,7 @@ L["Equipments"] = "장비"
L["Potions"] = "물약"
L["Flasks"] = "영약"
L["Food"] = true
L["Crafted by mage"] = true
L["Banners"] = "전투 깃발"
L["Utilities"] = "유틸리티"
L["Custom Items"] = "사용자 지정 아이템"
......
......@@ -320,6 +320,7 @@ L["Equipments"] = true
L["Potions"] = true
L["Flasks"] = true
L["Food"] = true
L["Crafted by mage"] = true
L["Banners"] = true
L["Utilities"] = true
L["Custom Items"] = true
......
......@@ -327,6 +327,7 @@ L["Equipments"] = "装备"
L["Potions"] = "药水"
L["Flasks"] = "合剂"
L["Food"] = true
L["Crafted by mage"] = true
L["Banners"] = "战旗"
L["Utilities"] = "实用"
L["Fade Time"] = "淡入时间"
......
......@@ -315,6 +315,7 @@ L["Equipments"] = "裝備"
L["Potions"] = "藥水"
L["Flasks"] = "藥劑"
L["Food"] = true
L["Crafted by mage"] = true
L["Banners"] = "戰旗"
L["Utilities"] = "實用物品"
L["Custom Items"] = "自訂物品"
......
......@@ -112,6 +112,7 @@ local potions = {
171351,
171352,
171370,
177278,
176811,
183823,
184090,
......@@ -137,6 +138,7 @@ local potionsShadowlands = {
171351,
171352,
171370,
177278,
176811,
183823,
184090,
......@@ -262,6 +264,20 @@ local foodShadowlands = {
184682,
}
local conjuredManaFood = {
34062,
43518,
43523,
65499,
65500,
65515,
65516,
65517,
80610,
80618,
113509
}
local banners = {
63359,
64400,
......@@ -282,6 +298,14 @@ local utilities = {
164978,
}
local torghastItems = {
168207, -- Plundered Anima Cell
170540, -- Ravenous Anima Cell
176331, -- Obscuring Essence Potion
176409, -- Rejuvenating Siphoned Essence
176443 -- Fleeting Frenzy Potion
}
local questItemList = {}
local function UpdateQuestItemList()
wipe(questItemList)
......@@ -654,6 +678,15 @@ function module:UpdateBar(id)
buttonID = buttonID + 1
end
end
elseif module == "MAGEFOOD" then -- Food crafted by mage
for _, foodID in pairs(conjuredManaFood) do
local count = GetItemCount(foodID)
if count and count > 0 and not self.db.blackList[foodID] and buttonID <= barDB.numButtons then
self:SetUpButton(bar.buttons[buttonID], {itemID = foodID})
self:UpdateButtonSize(bar.buttons[buttonID], barDB)
buttonID = buttonID + 1
end
end
elseif module == "BANNER" then
for _, bannerID in pairs(banners) do
local count = GetItemCount(bannerID)
......@@ -681,6 +714,15 @@ function module:UpdateBar(id)
buttonID = buttonID + 1
end
end
elseif module == "TORGHAST" then -- Torghast Items
for _, itemID in pairs(torghastItems) do
local count = GetItemCount(itemID)
if count and count > 0 and not self.db.blackList[itemID] and buttonID <= barDB.numButtons then
self:SetUpButton(bar.buttons[buttonID], {itemID = itemID})
self:UpdateButtonSize(bar.buttons[buttonID], barDB)
buttonID = buttonID + 1
end
end
elseif module == "CUSTOM" then
for _, itemID in pairs(self.db.customList) do
local count = GetItemCount(itemID)
......
......@@ -450,7 +450,7 @@ local function AutoButtonTable()
type = "input",
name = L["Button Groups"],
desc = format(
"%s %s\n\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s",
"%s %s\n\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s",
L["Set the type and order of button groups."],
L["You can separate the groups with a comma."],
FormatDesc("QUEST", L["Quest Items"]),
......@@ -459,6 +459,8 @@ local function AutoButtonTable()
FormatDesc("POTIONSL", format("%s (%s)", L["Potions"], L["Shadowlands"])),
FormatDesc("FLASK", L["Flasks"]),
FormatDesc("FLASKSL", format("%s (%s)", L["Flasks"], L["Shadowlands"])),
FormatDesc("FOODSL", format("%s (%s)", L["Food"], L["Crafted by mage"])),
FormatDesc("TORGHAST", L["Torghast Items"]),
FormatDesc("FOOD", L["Food"]),
FormatDesc("FOODSL", format("%s (%s)", L["Food"], L["Shadowlands"])),
FormatDesc("BANNER", L["Banners"]),
......
......@@ -228,7 +228,7 @@ function module:UpdateBar()
if show then
local chatFunc = function(self, mouseButton)
if mouseButton ~= "LeftButton" then
if mouseButton ~= "LeftButton" or not db.cmd then
return
end
local currentText = DefaultChatFrame.editBox:GetText()
......
......@@ -109,6 +109,7 @@ local AddonsToHide = {
-- addon, frame
{'ZygorGuidesViewer', 'ZygorGuidesViewerFrame'},
{'ZygorGuidesViewer', 'Zygor_Notification_Center'},
{'ZygorGuidesViewer', 'ZygorGuidesViewer_ActionBar'},
{'WorldQuestTracker', 'WorldQuestTrackerScreenPanel'},
{'WorldQuestTracker', 'WorldQuestTrackerFinderFrame'},
{'XIV_Databar', 'XIV_Databar'},
......@@ -123,6 +124,7 @@ local AddonsToHide = {
{'ConRO', 'ConRO_BurstButton'},
{'ConRO', 'ConRO_AutoButton'},
{'ConRO', 'ConRO_SingleButton'},
{'ConRO', 'ConRO_FullButton'},
{'Details', 'DetailsBaseFrame1'}, -- probably more
{'Details', 'DetailsRowFrame1'}, -- probably more
{'!KalielsTracker','!KalielsTrackerFrame'},
......@@ -295,6 +297,10 @@ function module:SetFlightMode(status)
end
end
if _G.ZoneAbilityFrame then
_G.ZoneAbilityFrame:SetAlpha(0)
end
C_Timer_After(0.05, function() _G.MainMenuBarVehicleLeaveButton:Hide() end)
-- Disable Blizz location messsages
......@@ -370,6 +376,10 @@ function module:SetFlightMode(status)
end
end
if _G.ZoneAbilityFrame then
_G.ZoneAbilityFrame:SetAlpha(1)
end
if _G.ElvUI_StanceBar then
_G.ElvUI_StanceBar:SetAlpha(1)
end
......
......@@ -127,6 +127,7 @@ module.EngineerItems = {
{151652, nil, true}, --Wormhole Generator: Argus
{168807, nil, true}, --Wormhole Generator: Kul Tiras
{168808, nil, true}, --Wormhole Generator: Zandalar
{172924, nil, true}, --Wormhole Generator: Shadowlands
}
module.Spells = {
["DEATHKNIGHT"] = {
......@@ -178,6 +179,7 @@ module.Spells = {
[11] = {text = GetSpellInfo(176242),icon = MER:GetIconFromID("spell", 176242),secure = {buttonType = "spell",ID = 176242}, UseTooltip = true},-- TP:Warspear
[12] = {text = GetSpellInfo(224869),icon = MER:GetIconFromID("spell", 224869),secure = {buttonType = "spell",ID = 224869}, UseTooltip = true},-- TP:Dalaran - BI
[13] = {text = GetSpellInfo(281404),icon = MER:GetIconFromID("spell", 281404),secure = {buttonType = "spell",ID = 281404}, UseTooltip = true},-- TP:Dazar'alor
[14] = {text = GetSpellInfo(344587),icon = MER:GetIconFromID("spell", 344587),secure = {buttonType = "spell",ID = 344587}, UseTooltip = true},-- TP:Oribos
},
["Alliance"] = {
[1] = {text = GetSpellInfo(3561),icon = MER:GetIconFromID("spell", 3561),secure = {buttonType = "spell",ID = 3561}, UseTooltip = true},-- TP:Stormwind
......@@ -193,6 +195,7 @@ module.Spells = {
[11] = {text = GetSpellInfo(176248),icon = MER:GetIconFromID("spell", 176248),secure = {buttonType = "spell",ID = 176248}, UseTooltip = true},-- TP:StormShield
[12] = {text = GetSpellInfo(224869),icon = MER:GetIconFromID("spell", 224869),secure = {buttonType = "spell",ID = 224869}, UseTooltip = true},-- TP:Dalaran - BI
[13] = {text = GetSpellInfo(281403),icon = MER:GetIconFromID("spell", 281403),secure = {buttonType = "spell",ID = 281403}, UseTooltip = true},-- TP:Boralus
[14] = {text = GetSpellInfo(344587),icon = MER:GetIconFromID("spell", 344587),secure = {buttonType = "spell",ID = 344587}, UseTooltip = true},-- TP:Oribos
},
},
["portals"] = {
......@@ -210,6 +213,7 @@ module.Spells = {
[11] = {text = GetSpellInfo(176244),icon = MER:GetIconFromID("spell", 176244),secure = {buttonType = "spell",ID = 176244}, UseTooltip = true},-- P:Warspear
[12] = {text = GetSpellInfo(224871),icon = MER:GetIconFromID("spell", 224871),secure = {buttonType = "spell",ID = 224871}, UseTooltip = true},-- P:Dalaran - BI
[13] = {text = GetSpellInfo(281402),icon = MER:GetIconFromID("spell", 281402),secure = {buttonType = "spell",ID = 281402}, UseTooltip = true},-- P:Dazar'alor
[14] = {text = GetSpellInfo(344597),icon = MER:GetIconFromID("spell", 344597),secure = {buttonType = "spell",ID = 344597}, UseTooltip = true},-- P:Oribos
},
["Alliance"] = {
[1] = {text = GetSpellInfo(10059),icon = MER:GetIconFromID("spell", 10059),secure = {buttonType = "spell",ID = 10059}, UseTooltip = true},-- P:Stormwind
......@@ -225,6 +229,7 @@ module.Spells = {
[11] = {text = GetSpellInfo(176246),icon = MER:GetIconFromID("spell", 176246),secure = {buttonType = "spell",ID = 176246}, UseTooltip = true},-- P:StormShield
[12] = {text = GetSpellInfo(224871),icon = MER:GetIconFromID("spell", 224871),secure = {buttonType = "spell",ID = 224871}, UseTooltip = true},-- P:Dalaran - BI
[13] = {text = GetSpellInfo(281400),icon = MER:GetIconFromID("spell", 281400),secure = {buttonType = "spell",ID = 281400}, UseTooltip = true},-- P:Boralus
[14] = {text = GetSpellInfo(344597),icon = MER:GetIconFromID("spell", 344597),secure = {buttonType = "spell",ID = 344597}, UseTooltip = true},-- P:Oribos
},
},
["challenge"] = {
......