Quantcast

Should stop switching gear on zone_change.

Darthpred [10-08-16 - 16:50]
Should stop switching gear on zone_change.
Filename
ElvUI_SLE/defaults/private.lua
ElvUI_SLE/modules/equipmanager.lua
ElvUI_SLE/options/equipmanager_c.lua
diff --git a/ElvUI_SLE/defaults/private.lua b/ElvUI_SLE/defaults/private.lua
index b28a9b2..7dd2c0f 100644
--- a/ElvUI_SLE/defaults/private.lua
+++ b/ElvUI_SLE/defaults/private.lua
@@ -11,6 +11,7 @@ V["sle"] = {
 		["instanceSet"] = false,
 		["pvpSet"] = false,
 		["timewalkingSet"] = false,
+		["onlyTalent"] = false,
 		["firstSpec"] = {
 			["general"] = "NONE",
 			["pvp"] = "NONE",
diff --git a/ElvUI_SLE/modules/equipmanager.lua b/ElvUI_SLE/modules/equipmanager.lua
index a3a4c26..a53d27f 100644
--- a/ElvUI_SLE/modules/equipmanager.lua
+++ b/ElvUI_SLE/modules/equipmanager.lua
@@ -97,6 +97,7 @@ end

 local function Equip(event)
 	if EM.Processing or EM.lock then return end
+	if event == "ZONE_CHANGED" and EM.db.onlyTalent then return end
 	EM.Processing = true
 	local inCombat = false
 	E:Delay(1, function() EM.Processing = false end)
@@ -108,7 +109,7 @@ local function Equip(event)
 		EM:UnregisterEvent(event)
 		EM.ErrorShown = false
 	end
-
+
 	local spec, equipSet = EM:GetData()

 	local shouldHandleUnitAura = E.private.sle.equip.FishingRaft.enable and (EM:HasFishingRaftAura() and equipSet ~= E.private.sle.equip.FishingRaft.set) or (not EM:HasFishingRaftAura() and equipSet == E.private.sle.equip.FishingRaft.set);
diff --git a/ElvUI_SLE/options/equipmanager_c.lua b/ElvUI_SLE/options/equipmanager_c.lua
index 5bf1db1..5f6cc85 100644
--- a/ElvUI_SLE/options/equipmanager_c.lua
+++ b/ElvUI_SLE/options/equipmanager_c.lua
@@ -129,9 +129,18 @@ local function configTable()
 				get = function(info) return EM.db.lockbutton end,
 				set = function(info, value) EM.db.lockbutton = value; E:StaticPopup_Show("PRIVATE_RL") end
 			},
-			instanceSet = {
+			onlyTalent = {
 				type = "toggle",
 				order = 7,
+				name = L["Ignore zone change"],
+				desc = L["Swap sets only on specialization change ignoring location change when. Does not influence entering/leaving instances and bg/arena."],
+				disabled = function() return not EM.db.enable end,
+				get = function(info) return EM.db.onlyTalent end,
+				set = function(info, value) EM.db.onlyTalent = value; end,
+			},
+			instanceSet = {
+				type = "toggle",
+				order = 8,
 				name = L["Use Instance Set"],
 				desc = L["Use a dedicated set for instances and raids."],
 				disabled = function() return not EM.db.enable end,
@@ -140,7 +149,7 @@ local function configTable()
 			},
 			timewalkingSet = {
 				type = "toggle",
-				order = 7,
+				order = 9,
 				name = L["Use Timewalking Set"],
 				desc = L["Use a dedicated set for timewalking instances."],
 				disabled = function() return not EM.db.enable end,
@@ -149,7 +158,7 @@ local function configTable()
 			},
 			pvpSet = {
 				type = "toggle",
-				order = 9,
+				order = 10,
 				name = L["Use PvP Set"],
 				desc = L["Use a dedicated set for PvP situations."],
 				disabled = function() return not EM.db.enable end,
@@ -159,7 +168,7 @@ local function configTable()
 			equipsets = {
 				type = "group",
 				name = PAPERDOLL_EQUIPMENTMANAGER,
-				order = 10,
+				order = 11,
 				disabled = function() return not EM.db.enable end,
 				guiInline = true,
 				args = {