Skip to content

Fix Naxxramas slime damage using WMO ID instead of filename parsing #3118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kwsantiago wants to merge 2 commits into
base: development
Choose a base branch
from
+3 −4
Open

Fix Naxxramas slime damage using WMO ID instead of filename parsing #3118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b71d9e2
Changed from filename check to RootWMOID check
kwsantiago Sep 5, 2025
4835e73
Enabled slime damage, removed hackfix
kwsantiago Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/vmap_extractor/vmapextract/wmo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE* output, WMORoot* rootWMO, bool pPrecis
liquidEntry = 3; // magma
break;
case 3:
if (filename.find("Stratholme_raid") != string::npos)
if (rootWMO->RootWMOID == 4489) // Stratholme_raid.wmo WMOID == 4489
{
liquidEntry = 21; // Naxxramas slime
}
Expand Down
5 changes: 2 additions & 3 deletions src/game/Objects/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,9 +991,8 @@ void Player::OnMirrorTimerExpirationPulse(MirrorTimer::Type timer)
case MirrorTimer::ENVIRONMENTAL:
if (IsInMagma())
EnvironmentalDamage(DAMAGE_LAVA, urand(sWorld.getConfig(CONFIG_UINT32_ENVIRONMENTAL_DAMAGE_MIN), sWorld.getConfig(CONFIG_UINT32_ENVIRONMENTAL_DAMAGE_MAX)));
// FIXME: Need to skip slime damage in Undercity, maybe someone can find better way to handle environmental damage
//if (IsInSlime() && m_zoneUpdateId != 1497)
// EnvironmentalDamage(DAMAGE_SLIME, urand(sWorld.getConfig(CONFIG_UINT32_ENVIRONMENTAL_DAMAGE_MIN), sWorld.getConfig(CONFIG_UINT32_ENVIRONMENTAL_DAMAGE_MAX)));
if (IsInSlime())
EnvironmentalDamage(DAMAGE_SLIME, urand(sWorld.getConfig(CONFIG_UINT32_ENVIRONMENTAL_DAMAGE_MIN), sWorld.getConfig(CONFIG_UINT32_ENVIRONMENTAL_DAMAGE_MAX)));
break;
case MirrorTimer::FEIGNDEATH:
// Vanilla: kill player on feigning death for too long
Expand Down