phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-27 05:23:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NPC voices and add tavern music support

Browse source 
NPC voice fixes:
- Changed sound paths from "Greeting" to "Hello" emote (more reliable)
- Added warning log when no voice samples load
- Voice files should now play when clicking NPCs

Tavern music:
- Detect tavern WMOs by model ID (inn buildings)
- Play tavern-specific music when inside taverns
- Crossfade back to zone music when exiting taverns
- Adds cozy ambient music to inn/tavern buildings
This commit is contained in:
Kelsi 2026-02-09 01:39:12 -08:00
parent e40ea0c47a
commit becc94d4ba
3 changed files with 71 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/audio/npc_voice_manager.cpp
View file

@ -39,17 +39,17 @@ void NpcVoiceManager::shutdown() {
void NpcVoiceManager::loadVoiceSounds() {
if (!assetManager_) return;
// Generic NPC greetings (various creature sounds that work as greetings)
// Generic NPC greetings using Hello emote (more reliable than Greeting)
std::vector<std::string> genericPaths = {
"Sound\\Character\\Human\\HumanMaleGreeting01.wav",
"Sound\\Character\\Human\\HumanMaleGreeting02.wav",
"Sound\\Character\\Human\\HumanMaleGreeting03.wav",
"Sound\\Character\\Human\\HumanFemaleGreeting01.wav",
"Sound\\Character\\Human\\HumanFemaleGreeting02.wav",
"Sound\\Character\\Dwarf\\DwarfMaleGreeting01.wav",
"Sound\\Character\\Dwarf\\DwarfMaleGreeting02.wav",
"Sound\\Character\\NightElf\\NightElfMaleGreeting01.wav",
"Sound\\Character\\NightElf\\NightElfFemaleGreeting01.wav",
"Sound\\Character\\Human\\HumanMaleHello01.wav",
"Sound\\Character\\Human\\HumanMaleHello02.wav",
"Sound\\Character\\Human\\HumanMaleHello03.wav",
"Sound\\Character\\Human\\HumanFemaleHello01.wav",
"Sound\\Character\\Human\\HumanFemaleHello02.wav",
"Sound\\Character\\Dwarf\\DwarfMaleHello01.wav",
"Sound\\Character\\Dwarf\\DwarfMaleHello02.wav",
"Sound\\Character\\NightElf\\NightElfMaleHello01.wav",
"Sound\\Character\\NightElf\\NightElfFemaleHello01.wav",
};
auto& genericVoices = voiceLibrary_[VoiceType::GENERIC];
@ -62,9 +62,9 @@ void NpcVoiceManager::loadVoiceSounds() {
// Human male
std::vector<std::string> humanMalePaths = {
"Sound\\Character\\Human\\HumanMaleGreeting01.wav",
"Sound\\Character\\Human\\HumanMaleGreeting02.wav",
"Sound\\Character\\Human\\HumanMaleGreeting03.wav",
"Sound\\Character\\Human\\HumanMaleHello01.wav",
"Sound\\Character\\Human\\HumanMaleHello02.wav",
"Sound\\Character\\Human\\HumanMaleHello03.wav",
"Sound\\Character\\Human\\HumanMaleYes01.wav",
"Sound\\Character\\Human\\HumanMaleYes02.wav",
};
@ -78,8 +78,8 @@ void NpcVoiceManager::loadVoiceSounds() {
// Human female
std::vector<std::string> humanFemalePaths = {
"Sound\\Character\\Human\\HumanFemaleGreeting01.wav",
"Sound\\Character\\Human\\HumanFemaleGreeting02.wav",
"Sound\\Character\\Human\\HumanFemaleHello01.wav",
"Sound\\Character\\Human\\HumanFemaleHello02.wav",
"Sound\\Character\\Human\\HumanFemaleYes01.wav",
};
auto& humanFemale = voiceLibrary_[VoiceType::HUMAN_FEMALE];
@ -92,8 +92,8 @@ void NpcVoiceManager::loadVoiceSounds() {
// Dwarf male
std::vector<std::string> dwarfMalePaths = {
"Sound\\Character\\Dwarf\\DwarfMaleGreeting01.wav",
"Sound\\Character\\Dwarf\\DwarfMaleGreeting02.wav",
"Sound\\Character\\Dwarf\\DwarfMaleHello01.wav",
"Sound\\Character\\Dwarf\\DwarfMaleHello02.wav",
"Sound\\Character\\Dwarf\\DwarfMaleYes01.wav",
};
auto& dwarfMale = voiceLibrary_[VoiceType::DWARF_MALE];
@ -106,7 +106,7 @@ void NpcVoiceManager::loadVoiceSounds() {
// Night elf male
std::vector<std::string> nelfMalePaths = {
"Sound\\Character\\NightElf\\NightElfMaleGreeting01.wav",
"Sound\\Character\\NightElf\\NightElfMaleHello01.wav",
"Sound\\Character\\NightElf\\NightElfMaleYes01.wav",
};
auto& nelfMale = voiceLibrary_[VoiceType::NIGHTELF_MALE];
@ -119,7 +119,7 @@ void NpcVoiceManager::loadVoiceSounds() {
// Night elf female
std::vector<std::string> nelfFemalePaths = {
"Sound\\Character\\NightElf\\NightElfFemaleGreeting01.wav",
"Sound\\Character\\NightElf\\NightElfFemaleHello01.wav",
"Sound\\Character\\NightElf\\NightElfFemaleYes01.wav",
};
auto& nelfFemale = voiceLibrary_[VoiceType::NIGHTELF_FEMALE];
@ -131,11 +131,17 @@ void NpcVoiceManager::loadVoiceSounds() {
}
// Log loaded voice types
int totalLoaded = 0;
for (const auto& [type, samples] : voiceLibrary_) {
if (!samples.empty()) {
LOG_INFO("Loaded ", samples.size(), " voice samples for type ", static_cast<int>(type));
totalLoaded += samples.size();
}
}
if (totalLoaded == 0) {
LOG_WARNING("NPC voice manager: no voice samples loaded (files may not exist in MPQ)");
}
}
bool NpcVoiceManager::loadSound(const std::string& path, VoiceSample& sample) {