From b71d9e20445ce63423f1197dece5559ce356b468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kyle=20=F0=9F=90=86?= Date: Fri, 5 Sep 2025 14:18:39 -0500 Subject: [PATCH 1/2] Changed from filename check to RootWMOID check --- contrib/vmap_extractor/vmapextract/wmo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/vmap_extractor/vmapextract/wmo.cpp b/contrib/vmap_extractor/vmapextract/wmo.cpp index 1546b252fab..d97ca2b64c8 100644 --- a/contrib/vmap_extractor/vmapextract/wmo.cpp +++ b/contrib/vmap_extractor/vmapextract/wmo.cpp @@ -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 } From 4835e73380ee186156524b02aab678be7114ad87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kyle=20=F0=9F=90=86?= Date: Fri, 5 Sep 2025 14:18:49 -0500 Subject: [PATCH 2/2] Enabled slime damage, removed hackfix --- src/game/Objects/Player.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp index 394c6e03e0f..968a0b5a82b 100644 --- a/src/game/Objects/Player.cpp +++ b/src/game/Objects/Player.cpp @@ -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