fix(Scripts/SSC): Fix console panel gate not opening (#21047)

This commit is contained in:
Andrew
2024-12-26 14:20:52 -03:00
committed by GitHub
parent bff594c4f5
commit 8ed7c5aa1f
3 changed files with 30 additions and 24 deletions

View File

@@ -26,14 +26,6 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
DoorData const doorData[] =
{
{ GO_LADY_VASHJ_BRIDGE_CONSOLE, DATA_BRIDGE_EMERGED, DOOR_TYPE_PASSAGE },
{ GO_COILFANG_BRIDGE1, DATA_BRIDGE_EMERGED, DOOR_TYPE_PASSAGE },
{ GO_COILFANG_BRIDGE2, DATA_BRIDGE_EMERGED, DOOR_TYPE_PASSAGE },
{ GO_COILFANG_BRIDGE3, DATA_BRIDGE_EMERGED, DOOR_TYPE_PASSAGE }
};
ObjectData const creatureData[] =
{
{ NPC_LEOTHERAS_THE_BLIND, DATA_LEOTHERAS_THE_BLIND },
@@ -45,8 +37,12 @@ ObjectData const creatureData[] =
ObjectData const gameObjectData[] =
{
{ GO_STRANGE_POOL, DATA_STRANGE_POOL },
{ 0, 0 }
{ GO_STRANGE_POOL, DATA_STRANGE_POOL },
{ GO_LADY_VASHJ_BRIDGE_CONSOLE, DATA_CONSOLE },
{ GO_COILFANG_BRIDGE1, DATA_BRIDGE_PART1 },
{ GO_COILFANG_BRIDGE2, DATA_BRIDGE_PART2 },
{ GO_COILFANG_BRIDGE3, DATA_BRIDGE_PART3 },
{ 0, 0 }
};
MinionData const minionData[] =
@@ -86,7 +82,6 @@ public:
{
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTERS);
LoadDoorData(doorData);
LoadObjectData(creatureData, gameObjectData);
LoadMinionData(minionData);
LoadBossBoundaries(boundaries);
@@ -118,6 +113,12 @@ public:
case GO_SHIELD_GENERATOR4:
_shieldGeneratorGUID[go->GetEntry() - GO_SHIELD_GENERATOR1] = go->GetGUID();
break;
case GO_LADY_VASHJ_BRIDGE_CONSOLE:
case GO_COILFANG_BRIDGE1:
case GO_COILFANG_BRIDGE2:
case GO_COILFANG_BRIDGE3:
go->AllowSaveToDB(true);
break;
}
InstanceScript::OnGameObjectCreate(go);
@@ -157,10 +158,6 @@ public:
if (_aliveKeepersCount > MIN_KEEPER_COUNT)
--_aliveKeepersCount;
break;
case DATA_BRIDGE_ACTIVATED:
SetBossState(DATA_BRIDGE_EMERGED, NOT_STARTED);
SetBossState(DATA_BRIDGE_EMERGED, DONE);
break;
case DATA_ACTIVATE_SHIELD:
if (Creature* vashj = GetCreature(DATA_LADY_VASHJ))
{

View File

@@ -31,17 +31,19 @@ enum DataTypes
DATA_LEOTHERAS_THE_BLIND = 2,
DATA_FATHOM_LORD_KARATHRESS = 3,
DATA_MOROGRIM_TIDEWALKER = 4,
DATA_BRIDGE_EMERGED = 5,
DATA_LADY_VASHJ = 6,
MAX_ENCOUNTERS = 7,
DATA_LADY_VASHJ = 5,
MAX_ENCOUNTERS = 6,
DATA_PLATFORM_KEEPER_RESPAWNED = 20,
DATA_PLATFORM_KEEPER_DIED = 21,
DATA_ALIVE_KEEPERS = 22,
DATA_BRIDGE_ACTIVATED = 23,
DATA_ACTIVATE_SHIELD = 24,
DATA_STRANGE_POOL = 25,
DATA_SEER_OLUM = 26
DATA_ACTIVATE_SHIELD = 23,
DATA_STRANGE_POOL = 24,
DATA_SEER_OLUM = 25,
DATA_CONSOLE = 26, // Used by the console SAI.
DATA_BRIDGE_PART1 = 27, // Used by the console SAI.
DATA_BRIDGE_PART2 = 28, // Used by the console SAI.
DATA_BRIDGE_PART3 = 29 // Used by the console SAI.
};
enum SSNPCs
@@ -91,8 +93,8 @@ enum SSSpells
enum KeeperCount
{
MIN_KEEPER_COUNT = 0,
MAX_KEEPER_COUNT = 24
MIN_KEEPER_COUNT = 0,
MAX_KEEPER_COUNT = 24
};
template <class AI, class T>