release: cut v0.6.1-alpha

Author: sys010101

BElfRestore.lua

@@ -232,7 +232,6 @@ BLOOD_ELF_FALLBACK_ZONES = BuildNormalizedStringSet(
 
 BLOOD_ELF_VOICE_SCOPE_TOKENS = BuildNormalizedStringSet(
     GetConfigValue("voice", "scope", "scopeTokens") or {
-        "quelthalas",
         "silvermooncity",
         "eversongwoods",
         "ghostlands",
@@ -241,6 +240,12 @@ BLOOD_ELF_VOICE_SCOPE_TOKENS = BuildNormalizedStringSet(
     }
 )
 
+BLOOD_ELF_VOICE_NATIVE_ONLY_TOKENS = BuildNormalizedStringList(
+    GetConfigValue("voice", "scope", "nativeOnlyTokens") or {
+        "harandar",
+    }
+)
+
 BLOOD_ELF_TOOLTIP_RACE_TOKENS = BuildNormalizedStringList(
     GetConfigValue("voice", "classification", "tooltipBloodElfRaceTokens") or {
         "blood elf",
@@ -261,6 +266,17 @@ CHILD_NAME_TOKENS = BuildNormalizedStringList(
     }
 )
 
+BLOOD_ELF_HIDDEN_RACE_NAME_TOKENS = BuildNormalizedStringList(
+    GetConfigValue("voice", "classification", "hiddenRaceNameTokens") or {
+        "silvermoon",
+        "sindorei",
+        "farstrider",
+        "magister",
+        "spellbreaker",
+        "bloodknight",
+    }
+)
+
 KNOWN_NON_BLOOD_ELF_RACE_TOKENS = BuildNormalizedStringList(
     GetConfigValue("voice", "classification", "knownNonBloodElfRaceTokens") or {
         "human",
@@ -448,13 +464,13 @@ function NormalizeAreaMatchToken(text)
     return normalized
 end
 
-function AreaHasNativeOnlyMusic(text)
+local function AreaMatchesTokenList(text, tokenList)
     local normalized = NormalizeAreaMatchToken(text)
-    if normalized == "" then
+    if normalized == "" or not tokenList then
         return false
     end
 
-    for _, token in ipairs(BLOOD_ELF_MUSIC_NATIVE_ONLY_TOKENS) do
+    for _, token in ipairs(tokenList) do
         if strfind(normalized, token, 1, true) ~= nil then
             return true
         end
@@ -463,6 +479,14 @@ function AreaHasNativeOnlyMusic(text)
     return false
 end
 
+function AreaHasVoiceNativeOnly(text)
+    return AreaMatchesTokenList(text, BLOOD_ELF_VOICE_NATIVE_ONLY_TOKENS)
+end
+
+function AreaHasNativeOnlyMusic(text)
+    return AreaMatchesTokenList(text, BLOOD_ELF_MUSIC_NATIVE_ONLY_TOKENS)
+end
+
 function GetCurrentMapLineageTokens()
     local tokens = {}
     if not (C_Map and C_Map.GetBestMapForUnit and C_Map.GetMapInfo) then
@@ -1075,11 +1099,22 @@ local function GetNPCIDFromGUID(guid)
     return npcID
 end
 
-local function IsInBloodElfFallbackArea()
+local function IsInBloodElfVoiceArea()
     local zoneName = GetRealZoneText() or GetZoneText() or ""
     local subZoneName = GetSubZoneText() or ""
     local zoneKey = string.lower(zoneName)
     local subZoneKey = string.lower(subZoneName)
+    local mapTokens = GetCurrentMapLineageTokens()
+
+    if AreaHasVoiceNativeOnly(zoneName) or AreaHasVoiceNativeOnly(subZoneName) then
+        return false, "native-only", zoneName, subZoneName
+    end
+
+    for _, token in ipairs(BLOOD_ELF_VOICE_NATIVE_ONLY_TOKENS) do
+        if mapTokens[token] then
+            return false, "native-only-map", zoneName, subZoneName
+        end
+    end
 
     if BLOOD_ELF_FALLBACK_ZONES[zoneKey] == true then
         return true, "zone", zoneName, subZoneName
@@ -1099,7 +1134,6 @@ local function IsInBloodElfFallbackArea()
         return true, "subzone-token", zoneName, subZoneName
     end
 
-    local mapTokens = GetCurrentMapLineageTokens()
     for token in pairs(mapTokens) do
         if BLOOD_ELF_VOICE_SCOPE_TOKENS[token] then
             return true, "map", zoneName, subZoneName
@@ -1177,25 +1211,47 @@ local function GetUnitTooltipIdentity(unit)
     return info
 end
 
+local function IsUnitDeadForVoice(unit)
+    return UnitExists(unit) and UnitIsDeadOrGhost and UnitIsDeadOrGhost(unit)
+end
+
+local NameLooksLikeBloodElfHiddenRaceFallback
+
 local function IsLikelyBloodElfFallback(unit, allowWithoutGossip)
     if not UnitExists(unit) or UnitIsPlayer(unit) then
         return false
     end
 
+    if IsUnitDeadForVoice(unit) then
+        if BElfVRDB and BElfVRDB.verbose then
+            Log("Fallback blocked because target is dead.")
+        end
+        return false
+    end
+
     local creatureType = UnitCreatureType(unit)
     local sex = UnitSex(unit)
     local canGossip = GossipFrame and GossipFrame:IsShown()
+    local attackable = UnitCanAttack and UnitCanAttack("player", unit)
 
     if BElfVRDB and BElfVRDB.verbose then
         Log("Fallback check: creatureType=" .. tostring(creatureType or "?") ..
             " sex=" .. tostring(sex or "?") ..
-            " gossipShown=" .. tostring(canGossip))
+            " gossipShown=" .. tostring(canGossip) ..
+            " attackable=" .. tostring(attackable))
+    end
+
+    if attackable then
+        if BElfVRDB and BElfVRDB.verbose then
+            Log("Fallback blocked because target is hostile/attackable.")
+        end
+        return false
     end
 
-    local zoneAllowed, scopeSource, zoneName, subZoneName = IsInBloodElfFallbackArea()
+    local zoneAllowed, scopeSource, zoneName, subZoneName = IsInBloodElfVoiceArea()
     if not zoneAllowed then
         if BElfVRDB and BElfVRDB.verbose then
-            Log("Fallback blocked outside Blood Elf zones: zone=" ..
+            Log("Fallback blocked outside supported Blood Elf voice scope (" .. tostring(scopeSource) .. "): zone=" ..
                 tostring(zoneName ~= "" and string.lower(zoneName) or "?") ..
                 " subzone=" .. tostring(subZoneName ~= "" and string.lower(subZoneName) or "?"))
         end
@@ -1206,8 +1262,21 @@ local function IsLikelyBloodElfFallback(unit, allowWithoutGossip)
         Log("Fallback zone scope accepted via " .. tostring(scopeSource))
     end
 
-    if creatureType == "Humanoid" and (sex == 2 or sex == 3) and (canGossip or allowWithoutGossip) then
-        return true
+    if creatureType == "Humanoid" and (sex == 2 or sex == 3) then
+        if canGossip then
+            return true
+        end
+
+        if allowWithoutGossip and NameLooksLikeBloodElfHiddenRaceFallback(unit) then
+            if BElfVRDB and BElfVRDB.verbose then
+                Log("Fallback accepted before gossip because target name/profile matches Blood Elf hints.")
+            end
+            return true
+        end
+    end
+
+    if BElfVRDB and BElfVRDB.verbose and allowWithoutGossip and not canGossip then
+        Log("Fallback blocked before gossip because target name/profile lacks Blood Elf hints.")
     end
 
     return false
@@ -2120,6 +2189,24 @@ local function GetUnitVORangeTier(unit)
     return nil
 end
 
+local function CanPlayTargetSelectGreeting(unit)
+    if not UnitExists(unit) then
+        return false
+    end
+
+    if IsUnitDeadForVoice(unit) then
+        Log("Skipping target-select greet because target is dead.")
+        return false
+    end
+
+    if UnitCanAttack and UnitCanAttack("player", unit) then
+        Log("Skipping target-select greet because target is hostile/attackable.")
+        return false
+    end
+
+    return true
+end
+
 local function ShouldPlayForRangeTier(rangeTier)
     if rangeTier == "close" then
         return true
@@ -2235,6 +2322,26 @@ local function NameLooksLikeChildNPC(unit)
     return false
 end
 
+NameLooksLikeBloodElfHiddenRaceFallback = function(unit)
+    local nameKey = NormalizeUserConfigKey(UnitName(unit))
+    if nameKey == "" then
+        return false
+    end
+
+    local profile = GetDefaultNameProfile(unit)
+    if profile and not profile.exclude then
+        return true
+    end
+
+    for _, token in ipairs(BLOOD_ELF_HIDDEN_RACE_NAME_TOKENS) do
+        if strfind(nameKey, token, 1, true) ~= nil then
+            return true
+        end
+    end
+
+    return false
+end
+
 local function GetConfiguredNameGenderOverride(unit)
     local name = UnitName(unit)
     if not name then
@@ -2487,6 +2594,19 @@ local function GetBloodElfNPCGender(unit, allowHiddenRaceFallbackWithoutGossip)
     -- We only want NPCs, not player characters
     if UnitIsPlayer(unit) then return nil end
 
+    if IsUnitDeadForVoice(unit) then
+        Log("Target is dead; keeping native voice: " .. tostring(UnitName(unit)))
+        return nil
+    end
+
+    local zoneAllowed, scopeSource, zoneName, subZoneName = IsInBloodElfVoiceArea()
+    if not zoneAllowed then
+        Log("Skipping TBC voice outside supported areas (" .. tostring(scopeSource) .. "): zone=" ..
+            tostring(zoneName ~= "" and string.lower(zoneName) or "?") ..
+            " subzone=" .. tostring(subZoneName ~= "" and string.lower(subZoneName) or "?"))
+        return nil
+    end
+
     if IsExcludedByNameProfile(unit) then
         Log("Target is excluded by built-in name profile: " .. tostring(UnitName(unit)))
         return nil
@@ -2525,6 +2645,10 @@ local function GetBloodElfNPCGender(unit, allowHiddenRaceFallbackWithoutGossip)
 
     local tooltipIdentity = GetUnitTooltipIdentity(unit)
 
+    if BElfVRDB and BElfVRDB.verbose then
+        Log("Voice scope accepted via " .. tostring(scopeSource))
+    end
+
     if tooltipIdentity.hasChildMarker then
         Log("Target looks like a child NPC; keeping native voice: " .. tostring(UnitName(unit)))
         return nil
@@ -2826,15 +2950,30 @@ local function BeginStartupMusicChannelPurge(reason)
 
     C_Timer.After(MUSIC_STARTUP_PURGE_DELAY_SECONDS, function()
         local restoreValue = GetPendingCVarRestore("Sound_EnableMusic") or currentMusicEnabled
+        local resumedReason = state.musicStartupPurgeReason or "startup purge"
+        local resumeContext = GetMusicContext()
+        local shouldMuteTrackedMusic = resumeContext.supported and IsMusicReplacementActive()
+
+        SetTrackedMusicMutesActive(shouldMuteTrackedMusic, resumeContext.regionKey, resumedReason .. " pre-enable")
+
+        if StopMusic then
+            StopMusic()
+            state.musicLastNativeStopAt = GetTime()
+        end
+
         if GetCVar("Sound_EnableMusic") ~= tostring(restoreValue) then
             state.musicStartupPurgeIgnoreNextCVar = true
             SetCVar("Sound_EnableMusic", tostring(restoreValue))
+
+            if StopMusic then
+                StopMusic()
+                state.musicLastNativeStopAt = GetTime()
+            end
         end
 
         ClearPendingCVarRestore("Sound_EnableMusic")
         state.musicStartupPurgeInProgress = false
 
-        local resumedReason = state.musicStartupPurgeReason or "startup purge"
         state.musicStartupPurgeReason = nil
 
         EvaluateMusicState(resumedReason .. " resume", true)
@@ -3476,6 +3615,10 @@ local function OnTargetChanged()
         return
     end
 
+    if not CanPlayTargetSelectGreeting("target") then
+        return
+    end
+
     local rangeTier = GetUnitVORangeTier("target")
     if not rangeTier then
         Log("Skipping target-select greet because target is out of VO range.")
@@ -3492,6 +3635,8 @@ local function OnTargetChanged()
         return
     end
 
+    -- Hidden-race fallback on target-select is restricted to positive
+    -- Blood Elf name/profile hints, not generic humanoids.
     local gender = GetBloodElfNPCGender("target", true)
     if not gender then
         return

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.6.1-alpha - 2026-03-08
+
+- Applied voice-area gating to all TBC replacement playback so out-of-scope NPCs no longer inherit Blood Elf voices just because their tooltip exposes Blood Elf race text.
+- Added voice-side native-only exclusions so areas such as `Harandar` stay on Blizzard voice just like they already do on the music side.
+- Narrowed hidden-race target-select fallback from generic humanoids to positive Blood Elf name/profile hints, preventing false positives on unrelated nearby humanoids.
+- Blocked target-select TBC playback for dead and hostile or attackable units.
+- Restored hidden-race target-select recognition for `Doomsayer` and `Household Attendant` via exact built-in Blood Elf name profiles.
+- Fixed the Lua reload crash caused by a forward-referenced hidden-race fallback helper.
+- Tightened startup music purge ordering so tracked music mutes are armed before music is re-enabled, reducing Silvermoon intro overlap on login and `/reload`.
+- Reworked the README testing guidance around exploratory issue-tracker-driven testing and trimmed the README limitations list to durable user-facing constraints.
+
 ## 0.6.0-alpha - 2026-03-07
 
 - Tightened music ownership to Midnight Quel'Thalas only by adding scope checks from zone text, subzone text, and parent map lineage.
@@ -121,11 +132,3 @@
 - Added NPC names to key verbose trigger logs for easier troubleshooting.
 - Restricted the hidden-race humanoid fallback to Blood Elf zones to prevent false positives like Zul'Aman trolls.
 
-## Notes For Next Iteration
-
-- Expand the Silvermoon music allow-list using trace recordings from more interiors and subzones.
-- Validate whether additional Midnight music FileDataIDs still need muting.
-- Consider exposing music timing values in the UI once the zone map stabilizes.
-- Consider one-time migration cleanup for legacy saved variables instead of clearing them every load.
-- Replace placeholder TOC metadata before any public release.
-