Skip to content

Commit

Permalink
👌 IMPROVE: Added some new openables; Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Merathilis committed Aug 25, 2024
1 parent b1eaac1 commit ac6bccc
Show file tree
Hide file tree
Showing 17 changed files with 70 additions and 35 deletions.
2 changes: 1 addition & 1 deletion ElvUI_MerathilisUI/Core/Profile/Profile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ P.autoButtons = {
b = 1,
},
},
include = "QUEST,BANNER,EQUIP,PROF,MOPREMIX,OPENABLE",
include = "QUEST,BANNER,EQUIP,PROF,OPENABLE",
},
bar2 = {
enable = true,
Expand Down
7 changes: 7 additions & 0 deletions ElvUI_MerathilisUI/Locales/deDE.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,13 @@ L["Advanced Skin Settings"] = "Erweiterte Skin Einstellungen"
L["Queue Timer"] = "Warteschlangen Timer"
L["Gradient Bars"] = "Farbverlaufsleisten"
L["Open Details"] = "Öffne Details"
L["Ease"] = "Übergang"
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] =
"Im Allgemeinen führt das Aktivieren dieser Option dazu, dass der Wert in der ersten Hälfte der Animation schneller ansteigt."
L["Invert Ease"] = "Übergang umkehren"
L["The easing function used for colorize the button."] =
"Die Übergangs Funktion, die zum Einfärben der Schaltfläche verwendet wird."
L["UI Widget"] = true -- no need to translate

-- Panels
L["Panels"] = "Leisten"
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/enUS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/esMX.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/frFR.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/itIT.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/koKR.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1208,6 +1208,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/ptBR.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/ruRU.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1360,6 +1360,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = "Таймер очереди"
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = "Панели"
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/zhCN.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
5 changes: 5 additions & 0 deletions ElvUI_MerathilisUI/Locales/zhTW.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,11 @@ L["Advanced Skin Settings"] = true
L["Queue Timer"] = true
L["Gradient Bars"] = true
L["Open Details"] = true
L["Ease"] = true
L["Generally, enabling this option makes the value increase faster in the first half of the animation."] = true
L["Invert Ease"] = true
L["The easing function used for colorize the button."] = true
L["UI Widget"] = true

-- Panels
L["Panels"] = true
Expand Down
26 changes: 5 additions & 21 deletions ElvUI_MerathilisUI/Modules/AutoButtons/AutoButtons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -919,26 +919,11 @@ local openableItems = {
217242,
217243,
217728,
}

local mopRemix = {
211279,
217722,
219264,
219273,
219282,
223904,
223905,
223906,
223907,
223908,
223909,
223910,
223911,
226142,
226143,
226144,
226145,
-- TWW
225249,
227450,
228361,
228741,
}

local bigDig = {
Expand Down Expand Up @@ -1323,7 +1308,6 @@ local moduleList = {
["FOODDF"] = foodDragonflight,
["SEEDS"] = seeds,
["BIGDIG"] = bigDig,
["MOPREMIX"] = mopRemix,
["ENGINEER"] = engineerItems,
}

Expand Down
1 change: 0 additions & 1 deletion ElvUI_MerathilisUI/Modules/MicroBar/MicroBar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ local GetCVar = C_CVar.GetCVar
local GetCVarBool = C_CVar.GetCVarBool
local SetCVar = C_CVar.SetCVar
local GetNumFriends = C_FriendList.GetNumFriends
local GetNumOnlineFriends = C_FriendList.GetNumOnlineFriends
local GetCompleteMissions = C_Garrison.GetCompleteMissions
local NewTicker = C_Timer.NewTicker
local IsToyUsable = C_ToyBox.IsToyUsable
Expand Down
1 change: 0 additions & 1 deletion ElvUI_MerathilisUI/Modules/Skins/Widgets/Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.Widgets = WS
local abs = abs
local pcall = pcall
local pairs, type = pairs, type
local strlower = strlower
local wipe = wipe

WS.LazyLoadTable = {}
Expand Down
18 changes: 9 additions & 9 deletions ElvUI_MerathilisUI/Options/Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,13 @@ function MER:OptionsCallback()
end

MER.AnimationEaseTable = {
["linear"] = L["Linear"],
["quadratic"] = L["Quadratic"],
["cubic"] = L["Cubic"],
["quartic"] = L["Quartic"],
["quintic"] = L["Quintic"],
["sinusoidal"] = L["Sinusoidal"],
["exponential"] = L["Exponential"],
["circular"] = L["Circular"],
["bounce"] = L["Bounce"],
["linear"] = L["Linear Ease"],
["quadratic"] = L["Quadratic Ease"],
["cubic"] = L["Cubic Ease"],
["quartic"] = L["Quartic Ease"],
["quintic"] = L["Quintic Ease"],
["sinusoidal"] = L["Sinusoidal Ease"],
["exponential"] = L["Exponential Ease"],
["circular"] = L["Circular Ease"],
["bounce"] = L["Bounce Ease"],
}
1 change: 1 addition & 0 deletions ElvUI_MerathilisUI/Options/Modules/MicroBar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ options.microBar = {
order = 2,
type = "select",
name = L["Ease"],
width = 1.3,
desc = L["The easing function used for colorize the button."]
.. "\n"
.. L["You can preview the ease type in https://easings.net/"],
Expand Down
4 changes: 2 additions & 2 deletions ElvUI_MerathilisUI/Options/Skins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@ for _, widget in pairs({ "button", "treeGroupButton", "tab" }) do
order = 4,
type = "select",
name = L["Ease"],
width = 1.2,
width = 1.3,
desc = L["The easing function used for fading the backdrop."]
.. "\n"
.. L["You can preview the ease type in https://easings.net/"],
Expand All @@ -1352,7 +1352,7 @@ for _, widget in pairs({ "button", "treeGroupButton", "tab" }) do
.. " "
.. L["(e.g., 'in-quadratic' becomes 'out-quadratic' and vice versa)"]
.. "\n"
.. L["Generally, enabling this option makes the texture appear sooner in the animation."],
.. L["Generally, enabling this option makes the value increase faster in the first half of the animation."],
},
},
}
Expand Down

0 comments on commit ac6bccc

Please sign in to comment.