From c9a841d4df9224b912fda6401b398ae52543b405 Mon Sep 17 00:00:00 2001 From: Crow Date: Sat, 15 Nov 2025 00:15:30 -0600 Subject: [PATCH] fix vashj bridge access (#852) now properly checks all 5 bosses and unlocks the console if all 5 are dead --- src/tbcScripts/serpentshrine_cavern.cpp | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/tbcScripts/serpentshrine_cavern.cpp b/src/tbcScripts/serpentshrine_cavern.cpp index 9b2a900..7bea35b 100644 --- a/src/tbcScripts/serpentshrine_cavern.cpp +++ b/src/tbcScripts/serpentshrine_cavern.cpp @@ -12,8 +12,7 @@ enum SSCMisc { GO_LADY_VASHJ_BRIDGE_CONSOLE = 184568, MAP_SSC = 548, - DATA_LURKER = 1, - DATA_VASHJ = 6 + DATA_VASHJ = 5 }; class GlobalSerpentshrineScript : public GlobalScript @@ -27,19 +26,13 @@ public: { if (InstanceScript* instance = instanceMap->GetInstanceScript()) { - uint32 bossCount = instance->GetEncounterCount() - 3; - for (uint8 id = 0; id <= bossCount; ++id) + for (uint8 id = 0; id <= 4; ++id) // check boss data id 0-4 { if (id == bossId && newState == DONE) { continue; } - if (id == DATA_LURKER) - { - continue; - } - if (instance->GetBossState(id) != DONE) { return true; @@ -65,16 +58,6 @@ public: } } - void OnLoadSpellCustomAttr(SpellInfo* spellInfo) override - { - switch (spellInfo->Id) - { - case 38236: // Tidalvess - Spawn Spitfire Totem - spellInfo->Effects[EFFECT_0].BasePoints = 25000; - break; - } - } - void OnBeforeSetBossState(uint32 bossId, EncounterState newState, EncounterState /*oldState*/, Map* map) override { if (sConfigMgr->GetOption("IndividualProgression.SerpentshrineCavern.RequireAllBosses", 1))