Merge branch 'dev'

ls- · Mar 1, 2022 · 4430133 · 4430133
2 parents 70a43e1 + bba786d
commit 4430133
Show file tree

Hide file tree

Showing 17 changed files with 285 additions and 110 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## Version 90200.01
+
+- Added options to toggle and reverse cooldown swipes on UF buffs, player buffs and debuffs, action bars, and the aura
+  tracker;
+- Fixed "Buffs and Debuffs" config. It seems that it's broken for quite some time, sorry about that T_T;
+- Player and pet castbars are now detached in the rectangular layout by default;
+- Updated embeds.
+
+![Imgur](https://i.imgur.com/Wgl6p5f.png)
+
+NOTE: If you're affected by this Russian-Ukrainian conflict or know someone who is, please, stay safe and help each
+other out. You aren't alone, we all are gonna make it ❤
+
 ## Version 90105.06
 
 - Preemptively updated buffs and debuffs to work with 9.2 changes.

diff --git a/config/auras.lua b/config/auras.lua
@@ -347,7 +347,7 @@ function CONFIG.CreateAurasPanel(_, order)
 			cooldown = {
 				order = 10,
 				type = "group",
-				name = L["COOLDOWN_TEXT"],
+				name = L["COOLDOWN"],
 				inline = true,
 				disabled = isModuleDisabled,
 				get = function(info)
@@ -356,8 +356,8 @@ function CONFIG.CreateAurasPanel(_, order)
 				set = function(info, value)
 					if C.db.profile.auras.cooldown[info[#info]] ~= value then
 						C.db.profile.auras.cooldown[info[#info]] = value
-						AURAS:UpdateHeaders("UpdateConfig")
-						AURAS:UpdateHeaders("UpdateCooldownConfig")
+						AURAS:ForEach("UpdateConfig")
+						AURAS:ForEach("UpdateCooldownConfig")
 					end
 				end,
 				args = {
@@ -368,8 +368,8 @@ function CONFIG.CreateAurasPanel(_, order)
 						confirm = CONFIG.ConfirmReset,
 						func = function()
 							CONFIG:CopySettings(D.profile.auras.cooldown, C.db.profile.auras.cooldown)
-							AURAS:UpdateHeaders("UpdateConfig")
-							AURAS:UpdateHeaders("UpdateCooldownConfig")
+							AURAS:ForEach("UpdateConfig")
+							AURAS:ForEach("UpdateCooldownConfig")
 						end,
 					},
 					spacer_1 = {
@@ -397,8 +397,8 @@ function CONFIG.CreateAurasPanel(_, order)
 								end
 
 								C.db.profile.auras.cooldown[info[#info]] = value
-								AURAS:UpdateHeaders("UpdateConfig")
-								AURAS:UpdateHeaders("UpdateCooldownConfig")
+								AURAS:ForEach("UpdateConfig")
+								AURAS:ForEach("UpdateCooldownConfig")
 							end
 						end,
 					},
@@ -412,10 +412,46 @@ function CONFIG.CreateAurasPanel(_, order)
 							if C.db.profile.auras.cooldown[info[#info]] ~= value then
 								C.db.profile.auras.cooldown[info[#info]] = value
 
-								AURAS:UpdateHeaders("UpdateConfig")
-								AURAS:UpdateHeaders("UpdateCooldownConfig")
+								AURAS:ForEach("UpdateConfig")
+								AURAS:ForEach("UpdateCooldownConfig")
+							end
+						end,
+					},
+					spacer_2 = {
+						order = 19,
+						type = "description",
+						name = " ",
+					},
+					swipe = {
+						order = 20,
+						type = "group",
+						name = L["COOLDOWN_SWIPE"],
+						inline = true,
+						get = function(info)
+							return C.db.profile.auras.cooldown.swipe[info[#info]]
+						end,
+						set = function(info, value)
+							if C.db.profile.auras.cooldown.swipe[info[#info]] ~= value then
+								C.db.profile.auras.cooldown.swipe[info[#info]] = value
+								AURAS:ForEach("UpdateConfig")
+								AURAS:ForEach("UpdateCooldownConfig")
 							end
 						end,
+						args = {
+							enabled = {
+								order = 1,
+								type = "toggle",
+								name = L["SHOW"],
+							},
+							reversed = {
+								order = 2,
+								type = "toggle",
+								disabled = function()
+									return not C.db.profile.auras.cooldown.swipe.enabled
+								end,
+								name = L["REVERSE"],
+							},
+						},
 					},
 				},
 			},

diff --git a/config/auratracker.lua b/config/auratracker.lua
@@ -125,7 +125,7 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 				confirm = CONFIG.ConfirmReset,
 				disabled = isModuleDisabled,
 				func = function()
-					CONFIG:CopySettings(D.char.auratracker, PrC.db.profile.auratracker, {enabled = true, filter = true})
+					CONFIG:CopySettings(PrD.profile.auratracker, PrC.db.profile.auratracker, {enabled = true, filter = true})
 					AURATRACKER:Update()
 				end,
 			},
@@ -282,15 +282,15 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 			cooldown = {
 				order = 40,
 				type = "group",
-				name = L["COOLDOWN_TEXT"],
+				name = L["COOLDOWN"],
 				inline = true,
 				disabled = isModuleDisabled,
 				get = function(info)
-					return PrC.db.profile.auratracker.cooldown.text[info[#info]]
+					return PrC.db.profile.auratracker.cooldown[info[#info]]
 				end,
 				set = function(info, value)
-					if PrC.db.profile.auratracker.cooldown.text[info[#info]] ~= value then
-						PrC.db.profile.auratracker.cooldown.text[info[#info]] = value
+					if PrC.db.profile.auratracker.cooldown[info[#info]] ~= value then
+						PrC.db.profile.auratracker.cooldown[info[#info]] = value
 						AURATRACKER:GetTracker():UpdateConfig()
 						AURATRACKER:GetTracker():UpdateCooldownConfig()
 					end
@@ -302,7 +302,7 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 						name = L["RESTORE_DEFAULTS"],
 						confirm = CONFIG.ConfirmReset,
 						func = function()
-							CONFIG:CopySettings(D.char.auratracker.cooldown, PrC.db.profile.auratracker.cooldown)
+							CONFIG:CopySettings(PrD.profile.auratracker.cooldown, PrC.db.profile.auratracker.cooldown)
 							AURATRACKER:GetTracker():UpdateConfig()
 							AURATRACKER:GetTracker():UpdateCooldownConfig()
 						end,
@@ -312,26 +312,11 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 						type = "description",
 						name = " ",
 					},
-					enabled = {
-						order = 10,
-						type = "toggle",
-						name = L["SHOW"],
-					},
 					exp_threshold = {
 						order = 11,
 						type = "range",
 						name = L["EXP_THRESHOLD"],
 						min = 1, max = 10, step = 1,
-						get = function()
-							return PrC.db.profile.auratracker.cooldown.exp_threshold
-						end,
-						set = function(_, value)
-							if PrC.db.profile.auratracker.cooldown.exp_threshold ~= value then
-								PrC.db.profile.auratracker.cooldown.exp_threshold = value
-								AURATRACKER:GetTracker():UpdateConfig()
-								AURATRACKER:GetTracker():UpdateCooldownConfig()
-							end
-						end,
 					},
 					m_ss_threshold = {
 						order = 12,
@@ -340,9 +325,6 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 						desc = L["M_SS_THRESHOLD_DESC"],
 						min = 0, max = 3599, step = 1,
 						softMin = 91,
-						get = function()
-							return PrC.db.profile.auratracker.cooldown.m_ss_threshold
-						end,
 						set = function(info, value)
 							if PrC.db.profile.auratracker.cooldown.m_ss_threshold ~= value then
 								if value < info.option.softMin then
@@ -361,29 +343,82 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 						name = L["S_MS_THRESHOLD"],
 						desc = L["S_MS_THRESHOLD_DESC"],
 						min = 1, max = 10, step = 1,
-						get = function()
-							return PrC.db.profile.auratracker.cooldown.s_ms_threshold
+					},
+					spacer_2 = {
+						order = 19,
+						type = "description",
+						name = " ",
+					},
+					swipe = {
+						order = 20,
+						type = "group",
+						name = L["COOLDOWN_SWIPE"],
+						inline = true,
+						get = function(info)
+							return PrC.db.profile.auratracker.cooldown.swipe[info[#info]]
 						end,
-						set = function(_, value)
-							if PrC.db.profile.auratracker.cooldown.s_ms_threshold ~= value then
-								PrC.db.profile.auratracker.cooldown.s_ms_threshold = value
-
+						set = function(info, value)
+							if PrC.db.profile.auratracker.cooldown.swipe[info[#info]] ~= value then
+								PrC.db.profile.auratracker.cooldown.swipe[info[#info]] = value
 								AURATRACKER:GetTracker():UpdateConfig()
 								AURATRACKER:GetTracker():UpdateCooldownConfig()
 							end
 						end,
+						args = {
+							enabled = {
+								order = 1,
+								type = "toggle",
+								name = L["SHOW"],
+							},
+							reversed = {
+								order = 2,
+								type = "toggle",
+								disabled = function()
+									return not PrC.db.profile.auratracker.cooldown.swipe.enabled
+								end,
+								name = L["REVERSE"],
+							},
+						},
 					},
-					size = {
-						order = 14,
-						type = "range",
-						name = L["SIZE"],
-						min = 8, max = 48, step = 1,
+					spacer_3 = {
+						order = 29,
+						type = "description",
+						name = " ",
 					},
-					v_alignment = {
-						order = 15,
-						type = "select",
-						name = L["TEXT_VERT_ALIGNMENT"],
-						values = V_ALIGNMENTS,
+					text = {
+						order = 30,
+						type = "group",
+						name = L["TEXT"],
+						inline = true,
+						get = function(info)
+							return PrC.db.profile.auratracker.cooldown.text[info[#info]]
+						end,
+						set = function(info, value)
+							if PrC.db.profile.auratracker.cooldown.text[info[#info]] ~= value then
+								PrC.db.profile.auratracker.cooldown.text[info[#info]] = value
+								AURATRACKER:GetTracker():UpdateConfig()
+								AURATRACKER:GetTracker():UpdateCooldownConfig()
+							end
+						end,
+						args = {
+							enabled = {
+								order = 1,
+								type = "toggle",
+								name = L["SHOW"],
+							},
+							size = {
+								order = 2,
+								type = "range",
+								name = L["SIZE"],
+								min = 8, max = 48, step = 1,
+							},
+							v_alignment = {
+								order = 3,
+								type = "select",
+								name = L["TEXT_VERT_ALIGNMENT"],
+								values = V_ALIGNMENTS,
+							},
+						},
 					},
 				},
 			},

diff --git a/config/bars.lua b/config/bars.lua
@@ -852,7 +852,7 @@ function CONFIG.CreateActionBarsPanel(_, order)
 			cooldown = {
 				order = 30,
 				type = "group",
-				name = L["COOLDOWN_TEXT"],
+				name = L["COOLDOWN"],
 				inline = true,
 				disabled = isModuleDisabled,
 				get = function(info)
@@ -916,12 +916,47 @@ function CONFIG.CreateActionBarsPanel(_, order)
 						set = function(info, value)
 							if C.db.profile.bars.cooldown[info[#info]] ~= value then
 								C.db.profile.bars.cooldown[info[#info]] = value
-
 								BARS:UpdateBars("UpdateConfig")
 								BARS:UpdateBars("UpdateCooldownConfig")
 							end
 						end,
 					},
+					spacer_2 = {
+						order = 19,
+						type = "description",
+						name = " ",
+					},
+					swipe = {
+						order = 20,
+						type = "group",
+						name = L["COOLDOWN_SWIPE"],
+						inline = true,
+						get = function(info)
+							return C.db.profile.bars.cooldown.swipe[info[#info]]
+						end,
+						set = function(info, value)
+							if C.db.profile.bars.cooldown.swipe[info[#info]] ~= value then
+								C.db.profile.bars.cooldown.swipe[info[#info]] = value
+								BARS:ForEach("UpdateConfig")
+								BARS:ForEach("UpdateCooldownConfig")
+							end
+						end,
+						args = {
+							enabled = {
+								order = 1,
+								type = "toggle",
+								name = L["SHOW"],
+							},
+							reversed = {
+								order = 2,
+								type = "toggle",
+								disabled = function()
+									return not C.db.profile.bars.cooldown.swipe.enabled
+								end,
+								name = L["REVERSE"],
+							},
+						},
+					},
 				},
 			},
 			action_bar_1 = getOptionsTable_Bar("bar1", 50, L["BAR_1"]),