refactor: use more robust expansion feature conditional logic

Author: ascott18

Components/Core/Common/PlayerNames.lua

@@ -93,11 +93,13 @@ function NAMES:OnInitialize()
 	self:RegisterEvent("UPDATE_MOUSEOVER_UNIT")
 end
 
+local scoreHasRankReturn = type(select(7, GetBattlefieldScore(1))) == 'number'
 function NAMES:UPDATE_BATTLEFIELD_SCORE()
 	for i = 1, GetNumBattlefieldScores() do
 		local name, class, _
-		if not TMW.isRetail then
+		if scoreHasRankReturn then
 			-- There's an extra "rank" return that's not there in retail.
+			-- Its there in classic up through at least MOP.
 			name, _, _, _, _, _, _, _, _, class = GetBattlefieldScore(i)
 		else
 			name, _, _, _, _, _, _, _, class = GetBattlefieldScore(i)

Components/Core/Common/SpellUsable.lua

@@ -30,7 +30,7 @@ local SpellUsable = TMW.COMMON.SpellUsable
 local Actions = TMW.COMMON.Actions
 
 -- todo: can we feature detect hasPreciseActionEvents?
-local hasPreciseActionEvents = select(4, GetBuildInfo()) >= 110000
+local hasPreciseActionEvents = ClassicExpansionAtLeast(LE_EXPANSION_WAR_WITHIN)
 
 if hasPreciseActionEvents then
     SpellUsable:RegisterEvent("ACTION_USABLE_CHANGED")

Components/Core/Common/SwingTimerMonitor.lua

@@ -58,23 +58,21 @@ TMW:RegisterCallback("TMW_GLOBAL_UPDATE", function()
 	pGUID = UnitGUID("player")
 end)
 
-local swingSpells = 
-	not TMW.isRetail and {
-		[strlowerCache[GetSpellName(78)]] = 1, -- Heroic Strike
-		[strlowerCache[GetSpellName(845)]] = 1, -- Cleave
-		[strlowerCache[GetSpellName(6807)]] = 1, -- Maul
-	} or {
-		-- Retail spells:
-        [strlowerCache[GetSpellName(404542)]] = 1, -- Crusading Strikes (ret talent)
-    }
-
-if GetSpellName(56815) then
-	swingSpells[strlowerCache[GetSpellName(56815)]] = 1 -- Rune Strike
-end
-if GetSpellName(2973) then
-	swingSpells[strlowerCache[GetSpellName(2973)]] = 1 -- Raptor Strike (vanilla - cata)
+local swingSpells = {}
+local function addSwingSpell(spell)
+	local name = GetSpellName(spell)
+	if name then
+		swingSpells[strlowerCache[name]] = 1
+	end
 end
 
+addSwingSpell(78) -- Heroic Strike
+addSwingSpell(845) -- Cleave
+addSwingSpell(6807) -- Maul
+addSwingSpell(56815) -- Rune Strike
+addSwingSpell(2973) -- Raptor Strike (vanilla - cata)
+addSwingSpell(404542) -- Crusading Strikes (ret talent)
+
 -- ---------------------------------
 -- Misc state update functions
 -- ---------------------------------

Components/Core/Conditions/Categories/BuffsDebuffs.lua

@@ -448,7 +448,7 @@ for i = 1, 3 do -- BUFFTOOLTIPSCAN
 		check = function(check)
 			check:SetTexts(L["ONLYCHECKMINE"], L["ONLYCHECKMINE_DESC"])
 		end,
-		icon = not TMW.isRetail and "Interface\\Icons\\spell_ice_lament" or "Interface\\Icons\\ability_priest_clarityofwill",
+		icon = ClassicExpansionAtLeast(LE_EXPANSION_WARLORDS_OF_DRAENOR) and "Interface\\Icons\\ability_priest_clarityofwill" or "Interface\\Icons\\spell_ice_lament",
 		tcoords = CNDT.COMMON.standardtcoords,
 		funcstr = function(c)
 			if CanUsePackedAuras(c) then
@@ -591,7 +591,7 @@ ConditionCategory:RegisterCondition(12.5,"DEBUFFPERC", {
 		check:SetTexts(L["ONLYCHECKMINE"], L["ONLYCHECKMINE_DESC"])
 	end,
 	formatter = TMW.C.Formatter.PERCENT,
-	icon = not TMW.isRetail and "Interface\\Icons\\ability_rogue_dualweild" or "Interface\\Icons\\spell_priest_voidshift",
+	icon = ClassicExpansionAtLeast(LE_EXPANSION_MISTS_OF_PANDARIA) and "Interface\\Icons\\spell_priest_voidshift" or "Interface\\Icons\\ability_rogue_dualweild",
 	tcoords = CNDT.COMMON.standardtcoords,
 	funcstr = function(c)
 		if CanUsePackedAuras(c) then

Components/Core/Conditions/Categories/Location.lua

@@ -61,7 +61,7 @@ ConditionCategory:RegisterCondition(1,	 "INSTANCE2", {
 
 	unit = false,
 	bitFlagTitle = L["CONDITIONPANEL_BITFLAGS_CHOOSEMENU_TYPES"],
-	bitFlags = not TMW.isRetail and {
+	bitFlags = ClassicExpansionAtMost(LE_EXPANSION_WRATH_OF_THE_LICH_KING) and {
 		[01] = {order=01, text=L["CONDITIONPANEL_INSTANCETYPE_NONE"],                                space=true,   }, -- None (Outside)
 		[02] = {order=02, text=BATTLEGROUND,                                                                       }, -- Battleground
 		[03] = {order=03, text=ARENA,                                                                space=true,   }, -- Arena

Components/Core/Conditions/Categories/Misc.lua

@@ -222,7 +222,7 @@ ConditionCategory:RegisterCondition(12,	 "TIMEOFDAY", {
 		--return CNDT.COMMON.formatSeconds(k*60)
 	end,
 	unit = false,
-	icon = not TMW.isRetail and "Interface\\Icons\\inv_misc_pocketwatch_02" or "Interface\\Icons\\Ability_Racial_TimeIsMoney",
+	icon = ClassicExpansionAtLeast(LE_EXPANSION_MISTS_OF_PANDARIA) and "Interface\\Icons\\Ability_Racial_TimeIsMoney" or "Interface\\Icons\\inv_misc_pocketwatch_02",
 	tcoords = CNDT.COMMON.standardtcoords,
 	Env = {
 		GetDaysElapsedMinutes = function()

Components/Core/Conditions/Categories/PlayerAttributes.lua

@@ -141,7 +141,7 @@ if C_PvP.IsWarModeDesired then
 		funcstr = [[BOOLCHECK( IsWarModeDesired() )]],
 		events = function(ConditionObject, c)
 			return
-				ConditionObject:GenerateNormalEventString("PLAYER_FLAGS_CHANGED")
+			ConditionObject:GenerateNormalEventString("PLAYER_FLAGS_CHANGED")
 		end,
 	})
 end
@@ -155,22 +155,9 @@ end)
 
 ConditionCategory:RegisterSpacer(5.5)
 
-local FirstStances = not TMW.isRetail and {
-	DRUID = 5487, 		-- Bear Form
-	PRIEST = 15473, 	-- Shadowform
-	ROGUE = 1784, 		-- Stealth
-	WARRIOR = 2457, 	-- Battle Stance
-	PALADIN = 19746, 	-- Concentration Aura
-	DEATHKNIGHT = 48266,-- Blood Presence
-} or {
-	DRUID = 5487, 		-- Bear Form
-	ROGUE = 1784, 		-- Stealth
-	WARRIOR = 386208,   -- Defensive Stance
-}
 ConditionCategory:RegisterCondition(6,	 "STANCE", {
-	text = 	pclass == "DRUID" and L["SHAPESHIFT"] or
-			L["STANCE"],
-
+	text = L["STANCE"],
+	
 	bool = true,
 
 	name = function(editbox)
@@ -180,9 +167,7 @@ ConditionCategory:RegisterCondition(6,	 "STANCE", {
 	useSUG = "stances",
 	allowMultipleSUGEntires = true,
 	unit = PLAYER,
-	icon = function()
-		return GetSpellTexture(FirstStances[pclass] or FirstStances.WARRIOR) or GetSpellTexture(FirstStances.WARRIOR)
-	end,
+	icon = "Interface\\Icons\\Ability_warrior_offensivestance",
 	tcoords = CNDT.COMMON.standardtcoords,
 	Env = {
 		StanceHelper = function(spellSet)
@@ -223,7 +208,6 @@ ConditionCategory:RegisterCondition(6,	 "STANCE", {
 		return
 			ConditionObject:GenerateNormalEventString("UPDATE_SHAPESHIFT_FORM")
 	end,
-	hidden = not FirstStances[pclass],
 })
 
 ConditionCategory:RegisterSpacer(6.5)
@@ -280,13 +264,13 @@ ConditionCategory:RegisterCondition(13.1, "PETMODE2", {
 	bitFlagTitle = L["CONDITIONPANEL_BITFLAGS_CHOOSEMENU_TYPES"],
 	bitFlags = {
 		[0] = L["CONDITIONPANEL_PETMODE_NONE"],
-		[1] = not TMW.isRetail and PET_MODE_AGRESSIVE or PET_MODE_ASSIST,
+		[1] = ClassicExpansionAtMost(LE_EXPANSION_WRATH_OF_THE_LICH_KING) and PET_MODE_AGRESSIVE or PET_MODE_ASSIST,
 		[2] = PET_MODE_DEFENSIVE,
 		[3] = PET_MODE_PASSIVE
 	},
 
 	unit = false,
-	icon = not TMW.isRetail and PET_PASSIVE_TEXTURE or PET_ASSIST_TEXTURE,
+	icon = ClassicExpansionAtMost(LE_EXPANSION_WRATH_OF_THE_LICH_KING) and PET_PASSIVE_TEXTURE or PET_ASSIST_TEXTURE,
 	tcoords = CNDT.COMMON.standardtcoords,
 
 	Env = {

Components/Core/Conditions/Categories/PlayerAttributes_config.lua

@@ -31,134 +31,63 @@ Module.noMin = true
 Module.showColorHelp = false
 Module.helpText = L["SUG_TOOLTIPTITLE_GENERIC"]
 
-Module.stances = TMW.isMop and {
-	WARRIOR = {
-		[2457] = 	GetSpellName(2457), 	-- Battle Stance
-		[71] = 		GetSpellName(71),		-- Defensive Stance
-		[2458] = 	GetSpellName(2458), 	-- Berserker Stance
-	},
-	DRUID = {
-		[5487] = 	GetSpellName(5487), 	-- Bear Form
-		[768] = 	GetSpellName(768),		-- Cat Form
-		[1066] = 	GetSpellName(1066), 	-- Aquatic Form
-		[783] = 	GetSpellName(783),		-- Travel Form
-		[24858] = 	GetSpellName(24858), 	-- Moonkin Form
-		[33891] = 	GetSpellName(33891), 	-- Tree of Life
-		[33943] = 	GetSpellName(33943), 	-- Flight Form
-		[40120] = 	GetSpellName(40120), 	-- Swift Flight Form	
-	},
-	PRIEST = {
-		[15473] = 	GetSpellName(15473), 	-- Shadowform	
-	},
-	ROGUE = {
-		[1784] = 	GetSpellName(1784), 	-- Stealth	
-	},
-	HUNTER = {
-		[13165] = 	GetSpellName(13165), 	-- Aspect of the Hawk
-		[109260] = 	GetSpellName(109260), 	-- Aspect of the Iron Hawk
-		[5118] = 	GetSpellName(5118), 	-- Aspect of the Cheetah
-		[13159] = 	GetSpellName(13159), 	-- Aspect of the Pack
-	},
-	DEATHKNIGHT = {
-		[48263] = 	GetSpellName(48263), 	-- Blood Presence
-		[48266] = 	GetSpellName(48266), 	-- Frost Presence
-		[48265] = 	GetSpellName(48265), 	-- Unholy Presence	
-	},
-	PALADIN = {
-		[105361] = 	GetSpellName(105361), 	-- Seal of Command
-		[20165] = 	GetSpellName(20165), 	-- Seal of Insight
-		[20164] = 	GetSpellName(20164),	-- Seal of Justice
-		[20154] = 	GetSpellName(20154), 	-- Seal of Righteousness
-		[31801] = 	GetSpellName(31801),	-- Seal of Truth
-	},
-	WARLOCK = {
-		[103958] = 	GetSpellName(103958),	-- Metamorphosis
-		[114168] = 	GetSpellName(114168),	-- Dark Apotheosis
-	},
-	MONK = {
-		[115069] = 	GetSpellName(115069),	-- Sturdy Ox
-		[115070] = 	GetSpellName(115070),	-- Wise Serpent
-		[103985] = 	GetSpellName(103985),	-- Fierce Tiger
-	},
-} or (TMW.isWrath or TMW.isCata) and {
-	WARRIOR = {
-		[2457] = 	GetSpellName(2457), 	-- Battle Stance
-		[71] = 		GetSpellName(71),		-- Defensive Stance
-		[2458] = 	GetSpellName(2458), 	-- Berserker Stance
-	},
-	DRUID = {
-		[5487] = 	GetSpellName(5487), 	-- Bear Form
-		[9634] = 	GetSpellName(9634), 	-- Dire Bear Form
-		[768] = 	GetSpellName(768),		-- Cat Form
-		[783] = 	GetSpellName(783),		-- Travel Form
-		[1066] = 	GetSpellName(1066),		-- Aquatic Form
-		[24858] = 	GetSpellName(24858), 	-- Moonkin Form
-		[33891] = 	GetSpellName(33891), 	-- Tree of Life
-		[33943] = 	GetSpellName(33943), 	-- Flight Form
-		[40120] = 	GetSpellName(40120), 	-- Swift Flight Form	
-	},
-	PRIEST = {
-		[15473] = 	GetSpellName(15473), 	-- Shadowform	
-	},
-	ROGUE = {
-		[1784] = 	GetSpellName(1784), 	-- Stealth	
-	},
-	PALADIN = {
-		[19746] = 	GetSpellName(19746), 	-- Concentration Aura
-		[32223] = 	GetSpellName(32223), 	-- Crusader Aura
-		[465] = 	GetSpellName(465),		-- Devotion Aura
-		[19900] = 	GetSpellName(19891), 	-- Fire Resistance Aura
-		[19898] = 	GetSpellName(19891), 	-- Frost Resistance Aura
-		[19896] = 	GetSpellName(19891), 	-- Shadow Resistance Aura
-		[7294] = 	GetSpellName(7294),		-- Retribution Aura	
-	},
-	DEATHKNIGHT = {
-		[48266] = 	GetSpellName(48266), 	-- Blood
-		[48263] = 	GetSpellName(48263), 	-- Frost
-		[48265] = 	GetSpellName(48265), 	-- Unholy
-	},
-} or TMW.isClassic and {
-	WARRIOR = {
-		[2457] = 	GetSpellName(2457), 	-- Battle Stance
-		[71] = 		GetSpellName(71),		-- Defensive Stance
-		[2458] = 	GetSpellName(2458), 	-- Berserker Stance
-	},
-	DRUID = {
-		[5487] = 	GetSpellName(5487), 	-- Bear Form
-		[768] = 	GetSpellName(768),		-- Cat Form
-		[783] = 	GetSpellName(783),		-- Travel Form
-		[24858] = 	GetSpellName(24858), 	-- Moonkin Form
-	},
-	PRIEST = {
-		[15473] = 	GetSpellName(15473), 	-- Shadowform	
-	},
-	ROGUE = {
-		[1784] = 	GetSpellName(1784), 	-- Stealth	
-	},
-} or {
-	DRUID = {
-		[5487] = 	GetSpellName(5487), 	-- Bear Form
-		[768] = 	GetSpellName(768),		-- Cat Form
-		[783] = 	GetSpellName(783),		-- Travel Form
-		[24858] = 	GetSpellName(24858), 	-- Moonkin Form
-		[33891] = 	GetSpellName(33891), 	-- Incarnation: Tree of Life
-		[171745] = 	GetSpellName(171745), 	-- Claws of Shirvallah	
-	},
-	ROGUE = {
-		[1784] = 	GetSpellName(1784), 	-- Stealth	
-	},
-	WARRIOR = {
-		[386164] = 	GetSpellName(386164), 	-- Battle Stance
-		[386208] = 	GetSpellName(386208),	-- Defensive Stance
-		[386196] = 	GetSpellName(386196), 	-- Berserker Stance
-	},
+Module.stances = {
+	[2457] = 	GetSpellName(2457), 	-- Battle Stance
+	[71] = 		GetSpellName(71),		-- Defensive Stance
+	[2458] = 	GetSpellName(2458), 	-- Berserker Stance
+	[386164] = 	GetSpellName(386164), 	-- Battle Stance (dragonflight)
+	[386208] = 	GetSpellName(386208),	-- Defensive Stance (dragonflight)
+	[386196] = 	GetSpellName(386196), 	-- Berserker Stance (dragonflight)
+	
+	[5487] = 	GetSpellName(5487), 	-- Bear Form
+	[768] = 	GetSpellName(768),		-- Cat Form
+	[1066] = 	GetSpellName(1066), 	-- Aquatic Form
+	[783] = 	GetSpellName(783),		-- Travel Form
+	[24858] = 	GetSpellName(24858), 	-- Moonkin Form
+	[33891] = 	GetSpellName(33891), 	-- Tree of Life
+	[33943] = 	GetSpellName(33943), 	-- Flight Form
+	[40120] = 	GetSpellName(40120), 	-- Swift Flight Form	
+	[9634] = 	GetSpellName(9634), 	-- Dire Bear Form
+	[171745] = 	GetSpellName(171745), 	-- Claws of Shirvallah	
+
+	[1784] = 	GetSpellName(1784), 	-- Stealth	
+
+	[13165] = 	GetSpellName(13165), 	-- Aspect of the Hawk
+	[109260] = 	GetSpellName(109260), 	-- Aspect of the Iron Hawk
+	[5118] = 	GetSpellName(5118), 	-- Aspect of the Cheetah
+	[13159] = 	GetSpellName(13159), 	-- Aspect of the Pack
+
+	[48263] = 	GetSpellName(48263), 	-- Blood Presence
+	[48266] = 	GetSpellName(48266), 	-- Frost Presence
+	[48265] = 	GetSpellName(48265), 	-- Unholy Presence	
+
+	[103958] = 	GetSpellName(103958),	-- Metamorphosis
+	[114168] = 	GetSpellName(114168),	-- Dark Apotheosis
+
+	[15473] = 	GetSpellName(15473), 	-- Shadowform	
+
+	[115069] = 	GetSpellName(115069),	-- Sturdy Ox
+	[115070] = 	GetSpellName(115070),	-- Wise Serpent
+	[103985] = 	GetSpellName(103985),	-- Fierce Tiger
+
+	[105361] = 	GetSpellName(105361), 	-- Seal of Command
+	[20165] = 	GetSpellName(20165), 	-- Seal of Insight
+	[20164] = 	GetSpellName(20164),	-- Seal of Justice
+	[20154] = 	GetSpellName(20154), 	-- Seal of Righteousness
+	[31801] = 	GetSpellName(31801),	-- Seal of Truth
+	[19746] = 	GetSpellName(19746), 	-- Concentration Aura
+	[32223] = 	GetSpellName(32223), 	-- Crusader Aura
+	[465] = 	GetSpellName(465),		-- Devotion Aura
+	[19900] = 	GetSpellName(19891), 	-- Fire Resistance Aura
+	[19898] = 	GetSpellName(19891), 	-- Frost Resistance Aura
+	[19896] = 	GetSpellName(19891), 	-- Shadow Resistance Aura
+	[7294] = 	GetSpellName(7294),		-- Retribution Aura	
 }
+
 function Module:Table_Get()
 	local allStances = {}
-	for class, stances in pairs(self.stances) do
-		for spellID, name in pairs(stances) do
-			allStances[spellID] = name
-		end
+	for spellID, name in pairs(Module.stances) do
+		allStances[spellID] = name
 	end
 	return allStances
 end

Components/Core/Conditions/Categories/PlayerCombatStats-Wrath.lua

@@ -186,7 +186,7 @@ if GetExpertise and CR_EXPERTISE then
 	})
 end
 
-if select(4, GetBuildInfo()) < 60000 and UnitRangedAttackPower and GetRangedCritChance and GetRangedHaste then
+if ClassicExpansionAtMost(LE_EXPANSION_MISTS_OF_PANDARIA) and UnitRangedAttackPower and GetRangedCritChance and GetRangedHaste then
 	-- Mop and below
 	ConditionCategory:RegisterSpacer(20)