aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/master/2022_09_30_03_world_2022_09_20_03_world.sql22
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h32
3 files changed, 39 insertions, 17 deletions
diff --git a/sql/updates/world/master/2022_09_30_03_world_2022_09_20_03_world.sql b/sql/updates/world/master/2022_09_30_03_world_2022_09_20_03_world.sql
new file mode 100644
index 00000000000..8e92c39b35c
--- /dev/null
+++ b/sql/updates/world/master/2022_09_30_03_world_2022_09_20_03_world.sql
@@ -0,0 +1,22 @@
+DELETE FROM `spawn_group_template` WHERE `groupId` BETWEEN 176 AND 178;
+INSERT INTO `spawn_group_template` (`groupId`,`groupName`,`groupFlags`) VALUES
+(176,'Coilfang: The Slave Pens - Mennu the Betrayer',4),
+(177,'Coilfang: The Slave Pens - Rokmar the Crackler',4),
+(178,'Coilfang: The Slave Pens - Quagmirran',4);
+
+DELETE FROM `instance_spawn_groups` WHERE `spawnGroupId` BETWEEN 176 AND 178;
+INSERT INTO `instance_spawn_groups` (`instanceMapId`,`bossStateId`,`bossStates`,`spawnGroupId`,`flags`) VALUES
+(547,0,23,176,1),
+(547,1,23,177,1),
+(547,2,23,178,1);
+
+DELETE FROM `spawn_group` WHERE `groupId` BETWEEN 176 AND 178;
+INSERT INTO `spawn_group` SELECT 176, 0, `guid` FROM `linked_respawn` WHERE `linkedGuid`=79362 AND `linkType` IN (0,3);
+INSERT INTO `spawn_group` SELECT 177, 0, `guid` FROM `linked_respawn` WHERE `linkedGuid`=79339 AND `linkType` IN (0,3);
+INSERT INTO `spawn_group` SELECT 178, 0, `guid` FROM `linked_respawn` WHERE `linkedGuid`=80260 AND `linkType` IN (0,3);
+INSERT INTO `spawn_group` (`groupId`,`spawnType`,`spawnId`) VALUES
+(176,0,79362),
+(177,0,79339),
+(178,0,80260);
+
+DELETE FROM `linked_respawn` WHERE `linkedGuid` IN (79362,79339,80260);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
index 02cfb18bd55..45768c64463 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
@@ -43,7 +43,7 @@ enum Events
struct boss_rokmar_the_crackler : public BossAI
{
- boss_rokmar_the_crackler(Creature* creature) : BossAI(creature, DATA_MENNU_THE_BETRAYER)
+ boss_rokmar_the_crackler(Creature* creature) : BossAI(creature, DATA_ROKMAR_THE_CRACKLER)
{
Initialize();
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
index 41ce07342e0..2d69f06be9b 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h
@@ -27,22 +27,22 @@ uint32 const EncounterCount = 3;
enum SPDataTypes
{
- DATA_MENNU_THE_BETRAYER = 1,
- DATA_ROKMAR_THE_CRACKLER = 2,
- DATA_QUAGMIRRAN = 3,
- DATA_AHUNE = 4,
- DATA_AHUNE_BUNNY = 5,
- DATA_FROZEN_CORE = 6,
- DATA_FLAMECALLER_000 = 7,
- DATA_FLAMECALLER_001 = 8,
- DATA_FLAMECALLER_002 = 9,
- DATA_BONFIRE_BUNNY_000 = 10,
- DATA_BONFIRE_BUNNY_001 = 11,
- DATA_BONFIRE_BUNNY_002 = 12,
- DATA_BEAM_BUNNY_000 = 13,
- DATA_BEAM_BUNNY_001 = 14,
- DATA_BEAM_BUNNY_002 = 15,
- DATA_LUMA_SKYMOTHER = 16
+ DATA_MENNU_THE_BETRAYER = 0,
+ DATA_ROKMAR_THE_CRACKLER = 1,
+ DATA_QUAGMIRRAN = 2,
+ DATA_AHUNE = 3,
+ DATA_AHUNE_BUNNY = 4,
+ DATA_FROZEN_CORE = 5,
+ DATA_FLAMECALLER_000 = 6,
+ DATA_FLAMECALLER_001 = 7,
+ DATA_FLAMECALLER_002 = 8,
+ DATA_BONFIRE_BUNNY_000 = 9,
+ DATA_BONFIRE_BUNNY_001 = 10,
+ DATA_BONFIRE_BUNNY_002 = 11,
+ DATA_BEAM_BUNNY_000 = 12,
+ DATA_BEAM_BUNNY_001 = 13,
+ DATA_BEAM_BUNNY_002 = 14,
+ DATA_LUMA_SKYMOTHER = 15
};
enum SPCreaturesIds