diff --git a/sql/updates/world/4.3.4/2023_06_02_00_world.sql b/sql/updates/world/4.3.4/2023_06_02_00_world.sql new file mode 100644 index 0000000000..c3c78e9e29 --- /dev/null +++ b/sql/updates/world/4.3.4/2023_06_02_00_world.sql @@ -0,0 +1,16 @@ +SET @CGUID := 396673; +DELETE FROM `creature` WHERE `guid`= @CGUID+0; +INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `PhaseId`, `PhaseGroup`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES +(@CGUID+0, 10808, 329, 5916, 0, 1, 169, 0, 0, 0, 3729.45068359375, -3263.729736328125, 128.183258056640625, 3.28591012954711914, 7200, 5, 0, 49750, 0, 1, 0, 0, 0, 15595); -- 10808 (Area: 0 - Difficulty: 1) + +DELETE FROM `spawn_group_template` WHERE `groupId`= 461; +INSERT INTO `spawn_group_template` (`groupId`, `groupName`, `groupFlags`) VALUES +(461, 'Stratholme - Timmy the Cruel', 4); + +DELETE FROM `spawn_group` WHERE `groupId`= 461; +INSERT INTO `spawn_group` (`groupId`, `spawnType`, `spawnId`) VALUES +(461, 0, @CGUID+0); + +DELETE FROM `instance_spawn_groups` WHERE `spawnGroupId`= 461; +INSERT INTO `instance_spawn_groups` (`instanceMapId`, `bossStateId`, `bossStates`, `spawnGroupId`, `flags`) VALUES +(329, 1, 17, 461, 1); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 39971cf0a9..12e9ba3015 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -39,9 +39,6 @@ enum StratholmeMisc SAY_YSIDA_SAVED = 0 }; -Position const timmyTheCruelSpawnPosition = { 3625.358f, -3188.108f, 130.3985f, 4.834562f }; -EllipseBoundary const beforeScarletGate(Position(3671.158f, -3181.79f), 60.0f, 40.0f); - ObjectData const creatureData[] = { { NPC_HEARTSINGER_FORRESTEN, BOSS_HEARTHSINGER_FORRESTEN }, @@ -71,16 +68,11 @@ class instance_stratholme : public InstanceMapScript for (uint8 i = 0; i < 5; ++i) IsSilverHandDead[i] = false; - - timmySpawned = false; - scarletsKilled = 0; } uint32 EncounterState[MAX_ENCOUNTER_OLD]; - uint8 scarletsKilled; bool IsSilverHandDead[5]; - bool timmySpawned; ObjectGuid serviceEntranceGUID; ObjectGuid gauntletGate1GUID; @@ -101,33 +93,6 @@ class instance_stratholme : public InstanceMapScript GuidSet abomnationGUID; EventMap events; - void OnUnitDeath(Unit* who) override - { - switch (who->GetEntry()) - { - case NPC_CRIMSON_GUARDSMAN: - case NPC_CRIMSON_CONJUROR: - case NPC_CRIMSON_INITATE: - case NPC_CRIMSON_GALLANT: - { - if (!timmySpawned) - { - Position pos = who->ToCreature()->GetHomePosition(); - // check if they're in front of the entrance - if (beforeScarletGate.IsWithinBoundary(pos)) - { - if (++scarletsKilled >= TIMMY_THE_CRUEL_CRUSADERS_REQUIRED) - { - instance->SummonCreature(NPC_TIMMY_THE_CRUEL, timmyTheCruelSpawnPosition); - timmySpawned = true; - } - } - } - break; - } - } - } - bool StartSlaugtherSquare() { //change to DONE when crystals implemented diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h index 80dd925036..5905cadcc5 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h @@ -85,13 +85,7 @@ enum STRCreatureIds NPC_ABOM_BILE = 10416, NPC_ABOM_VENOM = 10417, NPC_BLACK_GUARD = 10394, - NPC_YSIDA = 16031, - - // Scarlet side creatures - NPC_CRIMSON_GUARDSMAN = 10418, - NPC_CRIMSON_CONJUROR = 10419, - NPC_CRIMSON_INITATE = 10420, - NPC_CRIMSON_GALLANT = 10424 + NPC_YSIDA = 16031 }; enum STRGameobjectIds @@ -125,8 +119,6 @@ enum STRSpellIds enum STRMisc { - //! amount of crusade monsters required to be killed in order for timmy the cruel to spawn - TIMMY_THE_CRUEL_CRUSADERS_REQUIRED = 15, MAX_ENCOUNTER_OLD = 6 };