fix: #2309 Additional assorted talent/spec errors on Classic Era.

Author: ascott18

.vscode/settings.json

@@ -2,5 +2,243 @@
     "python.pythonPath": "C:\\Python37\\python.exe",
     "cSpell.enableFiletypes": [
         "lua"
-    ]
+    ],
+    "Lua.runtime.version": "Lua 5.1",
+    "Lua.runtime.builtin": {
+        "basic": "disable",
+        "debug": "disable",
+        "io": "disable",
+        "math": "disable",
+        "os": "disable",
+        "package": "disable",
+        "string": "disable",
+        "table": "disable",
+        "utf8": "disable"
+    },
+    "Lua.workspace.library": [
+        "~\\.vscode\\extensions\\ketho.wow-api-0.21.0\\Annotations\\Core"
+    ],
+    "Lua.diagnostics.globals": [
+        "COMBAT",
+        "ROLE",
+        "SPECIALIZATION",
+        "CopyTable",
+        "ChatEdit_InsertLink",
+        "ChatFrameUtil",
+        "LE_EXPANSION_LEGION",
+        "HIGHLIGHT_FONT_COLOR",
+        "NORMAL_FONT_COLOR",
+        "StaticPopupDialogs",
+        "StaticPopup_Show",
+        "LE_EXPANSION_WRATH_OF_THE_LICH_KING",
+        "LE_EXPANSION_WARLORDS_OF_DRAENOR",
+        "GameFontNormal",
+        "OKAY",
+        "ENABLE",
+        "SOUNDKIT",
+        "CreateColor",
+        "tostringall",
+        "UIParent",
+        "RELOADUI",
+        "CANCEL",
+        "ReloadUI",
+        "NUM_TALENT_COLUMNS",
+        "MAX_TALENT_TIERS",
+        "WorldFrame",
+        "LE_PARTY_CATEGORY_HOME",
+        "NONE",
+        "GameTooltip",
+        "LE_EXPANSION_CATACLYSM",
+        "D_SECONDS",
+        "LE_EXPANSION_CLASSIC",
+        "GameTooltipDataMixin",
+        "LE_EXPANSION_MISTS_OF_PANDARIA",
+        "DAY_ONELETTER_ABBR",
+        "HOUR_ONELETTER_ABBR",
+        "MINUTE_ONELETTER_ABBR",
+        "SECONDS_ABBR",
+        "SECOND_ONELETTER_ABBR",
+        "PLAYER",
+        "LE_EXPANSION_BATTLE_FOR_AZEROTH",
+        "TALENT_FRAME_DROP_DOWN_STARTER_BUILD",
+        "TANK",
+        "HEALER",
+        "DAMAGER",
+        "UNKNOWN",
+        "CLASS_ICON_TCOORDS",
+        "TALENT_FRAME_DROP_DOWN_DEFAULT",
+        "PLAYER_CLASS_NO_SPEC",
+        "PLAYER_CLASS",
+        "LOCALIZED_CLASS_NAMES_MALE",
+        "RAID_CLASS_COLORS",
+        "LARGE_NUMBER_SEPERATOR",
+        "DECIMAL_SEPERATOR",
+        "EditBox_ClearHighlight",
+        "DropDownList1",
+        "INVSLOT_LAST_EQUIPPED",
+        "LE_EXPANSION_WAR_WITHIN",
+        "INVSLOT_FIRST_EQUIPPED",
+        "EncounterJournal",
+        "ENCOUNTER_JOURNAL_ENCOUNTER",
+        "EncounterJournal_OnEvent",
+        "INVTYPE_WEAPONMAINHAND",
+        "INVTYPE_WEAPONOFFHAND",
+        "STACKS",
+        "SOLO",
+        "PARTY",
+        "RAID",
+        "BATTLEGROUND",
+        "ARENA",
+        "DUNGEON_DIFFICULTY_5PLAYER",
+        "DUNGEON_DIFFICULTY_5PLAYER_HEROIC",
+        "GUILD_CHALLENGE_TYPE4",
+        "HEROIC_SCENARIO",
+        "DELVE_LABEL",
+        "PLAYER_DIFFICULTY6",
+        "RAID_DIFFICULTY_10PLAYER",
+        "RAID_DIFFICULTY_25PLAYER",
+        "RAID_DIFFICULTY_10PLAYER_HEROIC",
+        "RAID_DIFFICULTY_25PLAYER_HEROIC",
+        "RAID_DIFFICULTY_40PLAYER",
+        "SANCTUARY_TERRITORY",
+        "CONTESTED_TERRITORY",
+        "COMBAT_ZONE",
+        "CHALLENGE_MODE",
+        "PLAYER_DIFFICULTY3",
+        "FLEX_RAID",
+        "PLAYER_DIFFICULTY1",
+        "PLAYER_DIFFICULTY2",
+        "RAID_FINDER",
+        "FREE_FOR_ALL_TERRITORY",
+        "PLAYER_DIFFICULTY_TIMEWALKER",
+        "FACTION_CONTROLLED_TERRITORY",
+        "FRIENDLY",
+        "HOSTILE",
+        "GameTime_GetFormattedTime",
+        "PET",
+        "PET_ASSIST_TEXTURE",
+        "PET_MODE_DEFENSIVE",
+        "PET_MODE_PASSIVE",
+        "PET_PASSIVE_TEXTURE",
+        "PET_MODE_ASSIST",
+        "NUM_PET_ACTION_SLOTS",
+        "MAX_SPELL_SCHOOLS",
+        "STAT_CRITICAL_STRIKE",
+        "STAT_HASTE",
+        "STAT_MASTERY",
+        "STAT_MULTISTRIKE",
+        "STAT_LIFESTEAL",
+        "STAT_VERSATILITY",
+        "STAT_AVOIDANCE",
+        "STAT_ATTACK_POWER",
+        "STAT_SPELLPOWER",
+        "MANA_REGEN",
+        "MANA_REGEN_COMBAT",
+        "CR_EXPERTISE",
+        "CR_VERSATILITY_DAMAGE_DONE",
+        "MELEE_ATTACK_POWER",
+        "RANGED_ATTACK_POWER",
+        "LE_EXPANSION_DRAGONFLIGHT",
+        "LE_EXPANSION_SHADOWLANDS",
+        "HEALTH",
+        "MANA",
+        "ENERGY",
+        "RAGE",
+        "FOCUS",
+        "RUNIC_POWER",
+        "SOUL_SHARDS_POWER",
+        "HOLY_POWER",
+        "CHI_POWER",
+        "POWER_TYPE_ESSENCE",
+        "INSANITY_POWER",
+        "FURY",
+        "PAIN",
+        "MAELSTROM_POWER",
+        "LUNAR_POWER",
+        "ARCANE_CHARGES_POWER",
+        "SHADOW_ORBS",
+        "BURNING_EMBERS",
+        "DEMONIC_FURY",
+        "HAPPINESS",
+        "PET_HAPPINESS1",
+        "PET_HAPPINESS2",
+        "PET_HAPPINESS3",
+        "COMBATLOG_OBJECT_TYPE_PLAYER",
+        "LE_EXPANSION_BURNING_CRUSADE",
+        "BASE_MOVEMENT_SPEED",
+        "BOSS",
+        "COMBAT_TEXT_RUNE_DEATH",
+        "COMBATLOG_OBJECT_CONTROL_PLAYER",
+        "NUM_BAG_SLOTS",
+        "INVSLOT_RANGED",
+        "SPELL_RECAST_TIME_MIN",
+        "SPELL_RECAST_TIME_SEC",
+        "SPELL_CAST_CHANNELED",
+        "TRANSMOGRIFY_INVALID_NO_ITEM",
+        "TARGET",
+        "MAX_PARTY_MEMBERS",
+        "MAX_RAID_MEMBERS",
+        "GROUP",
+        "MAX_BOSS_FRAMES",
+        "CHAT_MSG_SAY",
+        "CHAT_MSG_YELL",
+        "WHISPER",
+        "CHAT_MSG_PARTY",
+        "CHAT_MSG_RAID",
+        "CHAT_MSG_RAID_WARNING",
+        "CHAT_MSG_BATTLEGROUND",
+        "INSTANCE_CHAT",
+        "CHAT_MSG_GUILD",
+        "CHAT_MSG_OFFICER",
+        "CHAT_MSG_EMOTE",
+        "COMBAT_TEXT_LABEL",
+        "RaidNotice_AddMessage",
+        "CombatText_AddMessage",
+        "DEFAULT_CHAT_FRAME",
+        "RaidWarningFrame",
+        "UIErrorsFrame",
+        "CombatText_StandardScroll",
+        "UIParentLoadAddOn",
+        "LE_PARTY_CATEGORY_INSTANCE",
+        "FCF_GetChatWindowInfo",
+        "ENABLE_SOUNDFX",
+        "MUSIC_VOLUME",
+        "AMBIENCE_VOLUME",
+        "DIALOG_VOLUME",
+        "MASTER_VOLUME",
+        "FrameStackTooltip",
+        "PowerBarColor",
+        "FROM",
+        "COMBATLOG_OBJECT_REACTION_FRIENDLY",
+        "COMBATLOG_OBJECT_REACTION_NEUTRAL",
+        "COMBATLOG_OBJECT_REACTION_HOSTILE",
+        "COMBATLOG_OBJECT_TYPE_NPC",
+        "COMBATLOG_OBJECT_TYPE_PET",
+        "COMBATLOG_OBJECT_TYPE_GUARDIAN",
+        "COMBATLOG_OBJECT_TYPE_OBJECT",
+        "COMBATLOG_OBJECT_CONTROL_NPC",
+        "COMBATLOG_OBJECT_AFFILIATION_MINE",
+        "COMBATLOG_OBJECT_AFFILIATION_PARTY",
+        "COMBATLOG_OBJECT_AFFILIATION_RAID",
+        "COMBATLOG_OBJECT_AFFILIATION_OUTSIDER",
+        "COMBATLOG_OBJECT_NONE",
+        "ACTION_SWING",
+        "COMBAT_TEXT_RUNE_BLOOD",
+        "COMBAT_TEXT_RUNE_FROST",
+        "COMBAT_TEXT_RUNE_UNHOLY",
+        "LE_EXPANSION_LEVEL_CURRENT",
+        "MAX_COMBO_POINTS",
+        "COMBO_POINTS",
+        "STAGGER",
+        "INVTYPE_THROWN",
+        "ECLIPSE",
+        "ERR_SPELL_COOLDOWN",
+        "FLOATING_COMBAT_SELF_LABEL",
+        "GUILD",
+        "LE_REALM_RELATION_COALESCED",
+        "ERR_PETITION_NOT_SAME_SERVER",
+        "GetUnitName",
+        "GENERAL"
+    ],
+    "Lua.type.weakUnionCheck": true
 }

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## v11.2.7
+* Fix #2309 Additional assorted talent/spec errors on Classic Era.
 
 ## v11.2.6
 * Fix #2307 C_SpecializationInfo.GetTalent: query.specializationIndex must be specified.

Components/Core/Conditions/Categories/Talents.lua

@@ -25,8 +25,6 @@ local _, pclass = UnitClass("Player")
 
 local wipe = 
       wipe
-local GetTalentInfo, GetNumTalents, GetGlyphLink = 
-      GetTalentInfo, GetNumTalents, GetGlyphLink
 local GetNumClasses = 
       GetNumClasses
 local GetNumBattlefieldScores, RequestBattlefieldScoreData, GetBattlefieldScore, GetNumArenaOpponents, GetArenaOpponentSpec =
@@ -392,7 +390,7 @@ ConditionCategory:RegisterCondition(8.1, "TREEROLE2", {
 
 CNDT.Env.TalentMap = {}
 CNDT.Env.PvpTalentMap = {}
-if C_ClassTalents and C_ClassTalents.GetActiveConfigID and C_Traits.GetDefinitionInfo then
+if ClassicExpansionAtLeast(LE_EXPANSION_DRAGONFLIGHT) then
 	-- Dragonflight
 
 	function CNDT:GetTalentRanksBySpellID()
@@ -606,14 +604,9 @@ elseif ClassicExpansionAtLeast(LE_EXPANSION_MISTS_OF_PANDARIA) then
 	function CNDT:PLAYER_TALENT_UPDATE()
 		wipe(Env.TalentMap)
 
-		local talentInfoQuery = {};
-		talentInfoQuery.specializationIndex = TMW.GetCurrentSpecialization();
-		for tier = 1, MAX_NUM_TALENT_TIERS do
-			for column = 1, NUM_TALENT_COLUMNS do
-				talentInfoQuery.tier = tier;
-				talentInfoQuery.column = column;
-				local talentInfo = C_SpecializationInfo.GetTalentInfo(talentInfoQuery);
-
+		for _, talentInfoQuery in TMW.GetTalentQueries(TMW.GetCurrentSpecialization()) do
+			local talentInfo = C_SpecializationInfo.GetTalentInfo(talentInfoQuery);
+			if talentInfo then
 				local name = talentInfo.name
 				local id = talentInfo.talentID
 				local lower = name and strlowerCache[name]
@@ -673,17 +666,19 @@ elseif ClassicExpansionAtLeast(LE_EXPANSION_MISTS_OF_PANDARIA) then
 		max = 5,
 	})
 
-elseif GetNumTalentTabs then
+else
 	-- Classic - Cata
 	Env.TalentMap = {}
 	function CNDT:CHARACTER_POINTS_CHANGED()
 		wipe(Env.TalentMap)
-		for tab = 1, GetNumTalentTabs() do
-			for talent = 1, GetNumTalents(tab) do
-				local name, _, _, _, rank = GetTalentInfo(tab, talent)
+		
+		for _, talentInfoQuery in TMW.GetTalentQueries() do
+			local talentInfo = C_SpecializationInfo.GetTalentInfo(talentInfoQuery);
+			if talentInfo then
+				local name = talentInfo.name
 				local lower = name and strlowerCache[name]
 				if lower then
-					Env.TalentMap[lower] = rank or 0
+					Env.TalentMap[lower] = talentInfo.rank or 0
 				end
 			end
 		end
@@ -698,7 +693,7 @@ elseif GetNumTalentTabs then
 			editbox:SetLabel(L["SPELLTOCHECK"])
 		end,
 		useSUG = "talents",
-		icon = function() return select(2, GetTalentInfo(1, 1)) end,
+		icon = "interface\\icons\\spell_fire_immolation",
 		tcoords = CNDT.COMMON.standardtcoords,
 		funcstr = function(c) 
 			-- this is handled externally because TalentMap is so extensive a process,