Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 00:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Deadmines: move entrance faction spawns to instance_spawn_groups and handle them via faction flags instead

Browse Source
This commit is contained in:
Ovahlord
2021-07-31 21:42:10 +02:00
parent 0792739a98
commit f9fafbab7d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/4.3.4/2021_07_31_00_world.sql Normal file
View File

@@ -0,0 +1,4 @@
DELETE FROM `instance_spawn_groups` WHERE `spawnGroupId` IN (409, 410);
INSERT INTO `instance_spawn_groups` (`instanceMapId`, `bossStateId`, `bossStates`, `spawnGroupId`, `flags`) VALUES
(36, 4, 0x1 | 0x2 | 0x4 | 0x8, 409, 0x1 | 0x4),
(36, 4, 0x1 | 0x2 | 0x4 | 0x8, 410, 0x1 | 0x8);

8
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
View File

@@ -130,7 +130,6 @@ class instance_deadmines : public InstanceMapScript
SetBossNumber(map->IsHeroic() ? EncounterCount : EncounterCount - 1); // Vanessa van Cleef only in heroic mode
LoadDoorData(doorData);
LoadObjectData(creatureData, gameobjectData);
_teamInInstance = 0;
_foeReaper5000Intro = 0;
_ironCladDoorState = 0;
_goblinEventState = 0;
@@ -146,12 +145,6 @@ class instance_deadmines : public InstanceMapScript
void OnPlayerEnter(Player* player) override
{
instance->LoadGrid(-205.75f, -579.09f);
if (!_teamInInstance && !instance->IsHeroic())
{
_teamInInstance = player->GetTeam();
instance->SpawnGroupSpawn(_teamInInstance == ALLIANCE ? SPAWN_GROUP_ALLIANCE_ENTRANCE : SPAWN_GROUP_HORDE_ENTRANCE);
}
if (!_cookieSpawnChecked)
{
if (GetBossState(DATA_ADMIRAL_RIPSNARL) == DONE && GetBossState(DATA_CAPTAIN_COOKIE) != DONE)
@@ -914,7 +907,6 @@ class instance_deadmines : public InstanceMapScript
uint8 _activatedVentCounter;
uint8 _deadEnragedWorgen;
uint8 _goblinEventState;
uint32 _teamInInstance;
uint32 _foeReaper5000Intro;
uint32 _ironCladDoorState;
uint32 _vanessaVanCleefEncounterState;