Skip to content

Scripts/Gruul's Lair: Handle respawn of Maulgar's ogres with spawn groups #31986

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
offl wants to merge 1 commit into
base: 3.3.5
Choose a base branch
from
+30 −65
Open

Scripts/Gruul's Lair: Handle respawn of Maulgar's ogres with spawn groups #31986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions sql/updates/world/3.3.5/2026_08_230_00_world.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--
SET @SPAWN_GROUP_ID := 419; -- 4

UPDATE `spawn_group` SET `groupId` = @SPAWN_GROUP_ID+0 WHERE `spawnId` = 81651 AND `spawnType` = 0;
UPDATE `spawn_group` SET `groupId` = @SPAWN_GROUP_ID+1 WHERE `spawnId` = 81652 AND `spawnType` = 0;
UPDATE `spawn_group` SET `groupId` = @SPAWN_GROUP_ID+2 WHERE `spawnId` = 81643 AND `spawnType` = 0;
UPDATE `spawn_group` SET `groupId` = @SPAWN_GROUP_ID+3 WHERE `spawnId` = 48348 AND `spawnType` = 0;

DELETE FROM `spawn_group_template` WHERE `groupId` BETWEEN @SPAWN_GROUP_ID+0 AND @SPAWN_GROUP_ID+3;
INSERT INTO `spawn_group_template` (`groupId`, `groupName`, `groupFlags`) VALUES
(@SPAWN_GROUP_ID+0,"Gruul's Lair - Krosh Firehand",4), -- 419
(@SPAWN_GROUP_ID+1,"Gruul's Lair - Olm the Summoner",4), -- 420
(@SPAWN_GROUP_ID+2,"Gruul's Lair - Kiggler the Crazed",4), -- 421
(@SPAWN_GROUP_ID+3,"Gruul's Lair - Blindeye the Seer",4); -- 422
22 changes: 15 additions & 7 deletions src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,20 @@ enum MaulgarMisc
ACTION_OGRE_DEATH = 0
};

static constexpr std::array<uint32, 4> OgreData =
enum MaulgarSpawnGroups
{
DATA_KROSH_FIREHAND,
DATA_OLM_THE_SUMMONER,
DATA_KIGGLER_THE_CRAZED,
DATA_BLINDEYE_THE_SEER
SPAWN_GROUP_KROSH = 419,
SPAWN_GROUP_OLM = 420,
SPAWN_GROUP_KIGGLER = 421,
SPAWN_GROUP_BLINDEYE = 422
};

static constexpr std::array<uint32, 4> OgreSpawnGroupsData =
{
SPAWN_GROUP_KROSH,
SPAWN_GROUP_OLM,
SPAWN_GROUP_KIGGLER,
SPAWN_GROUP_BLINDEYE
};

// 18831 - High King Maulgar
Expand All @@ -92,8 +100,8 @@ struct boss_high_king_maulgar : public BossAI
_enraged = false;
SetEquipmentSlots(true);

for (uint32 data : OgreData)
me->GetMap()->Respawn(SPAWN_TYPE_CREATURE, instance->GetData64(data));
for (uint32 group : OgreSpawnGroupsData)
me->GetMap()->SpawnGroupSpawn(group, true);
}

void JustEngagedWith(Unit* who) override
Expand Down
14 changes: 1 addition & 13 deletions src/server/scripts/Outland/GruulsLair/gruuls_lair.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,9 @@ enum GLEncounters
DATA_GRUUL = 1
};

enum GLDataTypes
{
DATA_KROSH_FIREHAND,
DATA_OLM_THE_SUMMONER,
DATA_KIGGLER_THE_CRAZED,
DATA_BLINDEYE_THE_SEER
};

enum GLCreatureIds
{
NPC_MAULGAR = 18831,
NPC_KROSH_FIREHAND = 18832,
NPC_OLM_THE_SUMMONER = 18834,
NPC_KIGGLER_THE_CRAZED = 18835,
NPC_BLINDEYE_THE_SEER = 18836
NPC_MAULGAR = 18831
};

enum GLGameObjectIds
Expand Down
45 changes: 0 additions & 45 deletions src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,51 +47,6 @@ class instance_gruuls_lair : public InstanceMapScript
LoadDoorData(doorData);
LoadObjectData(creatureData, nullptr);
}

void OnCreatureCreate(Creature* creature) override
{
InstanceScript::OnCreatureCreate(creature);

switch (creature->GetEntry())
{
case NPC_KROSH_FIREHAND:
MaulgarOgreSpawnId[0] = creature->GetSpawnId();
break;
case NPC_OLM_THE_SUMMONER:
MaulgarOgreSpawnId[1] = creature->GetSpawnId();
break;
case NPC_KIGGLER_THE_CRAZED:
MaulgarOgreSpawnId[2] = creature->GetSpawnId();
break;
case NPC_BLINDEYE_THE_SEER:
MaulgarOgreSpawnId[3] = creature->GetSpawnId();
break;
default:
break;
}
}

uint64 GetData64(uint32 type) const override
{
switch (type)
{
case DATA_KROSH_FIREHAND:
return MaulgarOgreSpawnId[0];
case DATA_OLM_THE_SUMMONER:
return MaulgarOgreSpawnId[1];
case DATA_KIGGLER_THE_CRAZED:
return MaulgarOgreSpawnId[2];
case DATA_BLINDEYE_THE_SEER:
return MaulgarOgreSpawnId[3];
default:
break;
}

return InstanceScript::GetData64(type);
}

protected:
ObjectGuid::LowType MaulgarOgreSpawnId[4] = { };
};

InstanceScript* GetInstanceScript(InstanceMap* map) const override
Expand Down
Loading