From b54d42c817196581903258924eec9aa5301fc6c2 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Wed, 5 Nov 2025 21:20:31 +0100 Subject: [PATCH] Fix Deadmines Patrols (#845) - patrols now spawn behind you after killing bosses instead of already being active when you step into the instance. - fixed many patrols in the first part of the dungeon, it now looks exactly like VMangos. --- data/sql/world/base/dungeon_deadmines.sql | 342 +++++++++++++++++++++- src/IndividualProgression.h | 5 +- src/IndividualProgressionPlayer.cpp | 25 ++ 3 files changed, 367 insertions(+), 5 deletions(-) diff --git a/data/sql/world/base/dungeon_deadmines.sql b/data/sql/world/base/dungeon_deadmines.sql index 285eb0d..cf9cfe8 100644 --- a/data/sql/world/base/dungeon_deadmines.sql +++ b/data/sql/world/base/dungeon_deadmines.sql @@ -45,10 +45,12 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (642, 0, 0, 0, 0, 0, 100, 0, 9000, 14000, 15000, 21000, 0, 0, 11, 7399, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 'Sneeds Shredder - In Combat - Cast Terrify'), (642, 0, 1, 0, 0, 0, 100, 0, 8000, 12000, 48000, 54000, 0, 0, 11, 3603, 0, 0, 0, 0, 0, 21, 5, 0, 0, 0, 0, 0, 0, 0, 'Sneeds Shredder - Within 0-5 Range - Cast Distracting Pain'), (642, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 11, 5141, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Sneeds Shredder - On Just Died - Cast Eject Sneed'), -(644, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Rhahk\'Zor - On Aggro - Say Line 0'), -(644, 0, 1, 0, 0, 0, 100, 0, 1000, 8000, 17000, 27000, 0, 0, 11, 6304, 0, 0, 0, 0, 0, 21, 5, 0, 0, 0, 0, 0, 0, 0, 'Rhahk\'Zor - Within 0-5 Range - Cast Rhahk Zor Slam'), -(644, 0, 2, 3, 6, 0, 100, 514, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 14, 30533, 13965, 0, 0, 0, 0, 0, 0, 'Rhahk\'Zor - On Just Died - Activate Gameobject (Normal Dungeon)'), -(644, 0, 3, 0, 61, 0, 100, 514, 0, 0, 0, 0, 0, 0, 34, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Rhahk\'Zor - On Just Died - Set Instance Data 0 to 3 (Normal Dungeon)'), +-- +(644, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Rhahk Zor - On Aggro - Say Line 0'), +(644, 0, 1, 0, 0, 0, 100, 0, 1000, 8000, 17000, 27000, 0, 0, 11, 6304, 0, 0, 0, 0, 0, 21, 5, 0, 0, 0, 0, 0, 0, 0, 'Rhahk Zor - Within 0-5 Range - Cast Rhahk Zor Slam'), +(644, 0, 2, 3, 6, 0, 100, 514, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 14, 30533, 13965, 0, 0, 0, 0, 0, 0, 'Rhahk Zor - On Just Died - Activate Gameobject (Normal Dungeon)'), +(644, 0, 3, 0, 61, 0, 100, 514, 0, 0, 0, 0, 0, 0, 34, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Rhahk Zor - On Just Died - Set Instance Data 0 to 3 (Normal Dungeon)'), +-- (645, 0, 0, 0, 0, 0, 100, 0, 5000, 5000, 27000, 36000, 0, 0, 11, 6306, 64, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cookie - In Combat - Cast Acid Splash'), (645, 0, 1, 0, 2, 0, 100, 0, 0, 50, 10000, 15000, 0, 0, 11, 5174, 64, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cookie - In Combat - Cast Cookies Cooking'), (645, 0, 2, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Cookie - Between 0-15% Health - Flee For Assist'), @@ -87,3 +89,335 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (4418, 0, 1, 0, 0, 0, 100, 0, 3000, 8000, 10000, 15000, 0, 0, 11, 113, 96, 0, 0, 0, 0, 5, 30, 0, 0, 0, 0, 0, 0, 0, 'Defias Wizard - In Combat - Cast Chains of Ice'), (4418, 0, 2, 0, 0, 0, 100, 0, 1000, 1000, 40000, 65000, 0, 0, 11, 4979, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Defias Wizard - In Combat - Cast Quick Flame Ward'), (4418, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Defias Wizard - Between 0-15% Health - Flee For Assist (No Repeat)'); + + +-- fix parols +SET @IPPPHASE := 65536; +SET @IPPPHASE_II := 131072; +SET @IPPPHASE_III := 262144; + +DELETE FROM `creature` WHERE guid IN +(79139, 79144, 79151, 79152, 79170, 79171, 79177, 79188, 79189, 79207, 79229, 79230, 79233, 79244, 79245, 79273, 79277, 79280, 79281, 79283, 79284, 79285, 79373, 79374, 79376, 79377); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, +`wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES +-- +(79244, 634, 0, 0, 36, 0, 0, 1, @IPPPHASE, 1, -90.571, -400.149, 58.4755, 3.20291, 86400, 0, 1, 1158, 0, 2, 0, 0, 0, '', 0, 0, NULL), +(79245, 1729, 0, 0, 36, 0, 0, 1, @IPPPHASE, 1, -93.0234, -400.3, 58.0467, 3.03687, 86400, 0, 0, 990, 1876, 0, 0, 0, 0, '', 0, 0, NULL), +-- +(79170, 634, 0, 0, 36, 0, 0, 1, @IPPPHASE_II, 1, -185.334, -481.715, 54.1287, 3.17113, 86400, 0, 1, 1158, 0, 2, 0, 0, 0, '', 0, 0, NULL), +(79171, 1729, 0, 0, 36, 0, 0, 1, @IPPPHASE_II, 1, -189.049, -481.524, 54.1313, 5.43224, 86400, 0, 0, 990, 1876, 0, 0, 0, 0, '', 0, 0, NULL), +(79373, 634, 0, 0, 36, 0, 0, 1, @IPPPHASE_II, 1, -170.144, -403.045, 57.0869, 0.192994, 86400, 0, 1, 1158, 0, 2, 0, 0, 0, '', 0, 0, NULL), +(79374, 1729, 0, 0, 36, 0, 0, 1, @IPPPHASE_II, 1, -173.48, -402.487, 57.1029, 0.305933, 86400, 0, 0, 990, 1876, 0, 0, 0, 0, '', 0, 0, NULL), +-- +(79283, 4418, 0, 0, 36, 0, 0, 1, @IPPPHASE_III, 1, -229.584, -578.362, 51.2588, 1.44671, 86400, 0, 1, 1137, 2236, 2, 0, 0, 0, '', 0, 0, NULL), +(79284, 4417, 0, 0, 36, 0, 0, 1, @IPPPHASE_III, 1, -239.833, -578.879, 51.1657, 6.24575, 86400, 0, 0, 1251, 0, 0, 0, 0, 0, '', 0, 0, NULL), +(79285, 4417, 0, 0, 36, 0, 0, 1, @IPPPHASE_III, 1, -228.095, -576.564, 51.2145, 2.12069, 86400, 0, 0, 1251, 0, 0, 0, 0, 0, '', 0, 0, NULL), +-- +(79139, 1729, 0, 0, 36, 0, 0, 1, 1, 1, -58.9532, -390.73, 53.9482, 5.2709, 86400, 0, 1, 990, 1876, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Evoker +(79144, 598, 0, 0, 36, 0, 0, 1, 1, 1, -40.12, -370.386, 56.5668, 2.35619, 86400, 0, 1, 386, 0, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Miner +(79152, 634, 0, 0, 36, 0, 0, 1, 1, 1, -116.45, -406.916, 59.5309, 0.895679, 86400, 0, 1, 1158, 0, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Overseer +(79177, 1729, 0, 0, 36, 0, 0, 1, 1, 1, -188.074, -486.698, 54.044, 1.56971, 86400, 0, 1, 990, 1876, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Evoker +(79188, 1729, 0, 0, 36, 0, 0, 1, 1, 1, -49.1843, -392.156, 55.9103, 4.36221, 86400, 0, 1, 990, 1876, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Evoker +(79189, 634, 0, 0, 36, 0, 0, 1, 1, 1, -94.3284, -402.581, 57.4746, 0.820305, 86400, 0, 1, 1158, 0, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Overseer +(79207, 641, 0, 0, 36, 0, 0, 1, 1, 1, -281.279, -502.013, 49.3831, 1.4796, 86400, 0, 1, 1251, 0, 2, 0, 0, 0, '', 0, 0, NULL), -- Goblin Woodcarver +(79229, 4418, 0, 0, 36, 0, 0, 1, 1, 1, -272.331, -583.156, 50.1907, 0.925193, 86400, 0, 1, 1137, 2236, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Wizard +(79230, 4417, 0, 0, 36, 0, 0, 1, 1, 1, -290.57, -561.45, 48.85, 4.6, 86400, 0, 1, 1251, 0, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Taskmaster +(79233, 4417, 0, 0, 36, 0, 0, 1, 1, 1, -263.805, -578.193, 50.5558, 6.26195, 86400, 0, 1, 1251, 0, 2, 0, 0, 0, '', 0, 0, NULL), -- Defias Taskmaster +(79277, 1729, 0, 0, 36, 0, 0, 1, 1, 1, -91.77, -376.14, 57.83, 0.1, 86400, 0, 1, 990, 1876, 2, 0, 0, 0, '', 0, 0, NULL); -- Defias Evoker + +DELETE FROM `linked_respawn` WHERE `guid` IN (79151, 79273, 79280, 79281, 79376, 79377); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (79170, 79244, 79283, 79373, 79230); +INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES +-- +(79170, 79170, 0, 0, 515, 0, 0), +(79170, 79171, 2, 200, 515, 0, 0), +(79244, 79244, 0, 0, 515, 0, 0), +(79244, 79245, 2, 200, 515, 0, 0), +(79373, 79373, 0, 0, 515, 0, 0), +(79373, 79374, 2, 200, 515, 0, 0), +(79283, 79283, 0, 0, 515, 0, 0), +(79283, 79284, 2, 135, 515, 0, 0), +(79283, 79285, 2, 225, 515, 0, 0); + +DELETE FROM `creature_addon` WHERE `guid` IN (79139, 79144, 79152, 79170, 79177, 79188, 79189, 79207, 79229, 79230, 79233, 79244, 79245, 79273, 79277, 79280, 79283, 79373, 79374, 79376); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +-- +(79139, 791390, 0, 0, 1, 0, 0, ''), +(79144, 791440, 0, 0, 1, 0, 0, ''), +(79152, 791520, 0, 0, 1, 0, 0, ''), +(79177, 791770, 0, 0, 1, 0, 0, ''), +(79188, 791880, 0, 0, 1, 0, 0, ''), +(79189, 791890, 0, 0, 1, 0, 0, ''), +(79207, 792070, 0, 0, 1, 0, 0, ''), +(79229, 792290, 0, 0, 1, 0, 0, ''), +(79230, 792300, 0, 0, 1, 0, 0, ''), +(79233, 792330, 0, 0, 1, 0, 0, ''), +(79277, 792770, 0, 0, 1, 0, 0, ''), +(79244, 792440, 0, 0, 1, 0, 0, ''), -- active after Rhahk Zor dies +(79170, 791700, 0, 0, 1, 0, 0, ''), -- active after Sneed dies +(79373, 793730, 0, 0, 1, 0, 0, ''), -- active after Sneed dies +(79283, 792830, 0, 0, 1, 0, 0, ''); -- active after Gilnid dies + +DELETE FROM `waypoint_data` WHERE `id` IN (791390, 791440, 791520, 791700, 791770, 791880, 791890, 792070, 792290, 792300, 792330, 792440, 792450, 792730, 792770, 792800, 792830, 793730, 793740, 793760); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +-- +(792440, 1, -105.885, -386.061, 57.0374, 5.40025, 0, 0, 0, 100, 0), -- Rhahk'Zor patrol +(792440, 2, -99.1898, -380.021, 58.7239, 0.375672, 0, 0, 0, 100, 0), +(792440, 3, -90.7018, -377.509, 58.2497, 0.102742, 0, 0, 0, 100, 0), +(792440, 4, -81.8864, -377.98, 56.243, 6.02263, 0, 0, 0, 100, 0), +(792440, 5, -71.9643, -382.058, 54.9508, 5.95588, 0, 0, 0, 100, 0), +(792440, 6, -61.4807, -383.732, 53.731, 0.141929, 0, 0, 0, 100, 0), +(792440, 7, -52.6182, -380.694, 54.7347, 0.304887, 0, 0, 0, 100, 0), +(792440, 8, -44.8872, -379.544, 55.5523, 0.289197, 0, 0, 0, 100, 0), +(792440, 9, -53.2952, -379.191, 54.4481, 3.27175, 0, 0, 0, 100, 0), +(792440, 10, -61.5043, -381.726, 53.9484, 3.2266, 0, 0, 0, 100, 0), +(792440, 11, -70.2717, -380.618, 54.2406, 2.88102, 0, 0, 0, 100, 0), +(792440, 12, -81.8268, -375.453, 56.0498, 2.99294, 0, 0, 0, 100, 0), +(792440, 13, -91.612, -375.159, 58.017, 3.25607, 0, 0, 0, 100, 0), +(792440, 14, -100.605, -378.47, 58.1362, 3.79406, 0, 0, 0, 100, 0), +(792440, 15, -107.223, -385.269, 56.9783, 4.01201, 0, 0, 0, 100, 0), +(792440, 16, -111.184, -390.34, 56.8833, 3.99437, 0, 0, 0, 100, 0), +(792440, 17, -118.906, -396.424, 57.097, 3.75877, 0, 0, 0, 100, 0), +(792440, 18, -126.694, -402.704, 58.7403, 3.71558, 0, 0, 0, 100, 0), +(792440, 19, -131.922, -405.904, 57.5064, 3.5487, 0, 0, 0, 100, 0), +(792440, 20, -124.92, -404.545, 58.7515, 0.54062, 0, 0, 0, 100, 0), +(792440, 21, -117.256, -397.715, 57.2524, 0.642722, 0, 0, 0, 100, 0), +(792440, 22, -109.424, -391.573, 57.2004, 0.660394, 0, 0, 0, 100, 0), +-- +(791700, 1, -190.081, -480.93, 54.0442, 4.72042, 0, 0, 0, 100, 0), -- Sneed patrol 1 +(791700, 2, -187.47, -492.907, 53.563, 4.92698, 0, 0, 0, 100, 0), +(791700, 3, -193.975, -504.087, 53.1475, 3.58002, 0, 0, 0, 100, 0), +(791700, 4, -209.675, -506.274, 51.2768, 2.98312, 0, 0, 0, 100, 0), +(791700, 5, -220.823, -492.074, 48.2184, 2.27233, 0, 0, 0, 100, 0), +(791700, 6, -235.942, -483.635, 49.0422, 3.03809, 0, 0, 0, 100, 0), +(791700, 7, -244.61, -482.027, 48.8547, 0.104633, 0, 0, 0, 100, 0), +(791700, 8, -229.791, -484.612, 48.8188, 5.98727, 0, 0, 0, 100, 0), +(791700, 9, -217.823, -497.897, 49.23, 5.36681, 0, 0, 0, 100, 0), +(791700, 10, -206.083, -505.612, 51.9032, 5.88517, 0, 0, 0, 100, 0), +(791700, 11, -191.232, -503.006, 52.9131, 0.253858, 0, 0, 0, 100, 0), +(791700, 12, -187.267, -492.515, 53.5679, 0.540529, 0, 0, 0, 100, 0), +(791700, 13, -189.152, -483.356, 54.0488, 1.53798, 0, 0, 0, 100, 0), +-- +(793730, 1, -164.558, -400.443, 56.7705, 0.149922, 0, 0, 0, 100, 0), -- Sneed patrol 2 +(793730, 2, -158.347, -399.586, 56.3125, 6.11699, 0, 0, 0, 100, 0), +(793730, 3, -149.121, -402.949, 56.9735, 5.93633, 0, 0, 0, 100, 0), +(793730, 4, -151.234, -399.159, 56.7516, 2.84383, 0, 0, 0, 100, 0), +(793730, 5, -160.264, -396.618, 56.6574, 3.23455, 0, 0, 0, 100, 0), +(793730, 6, -167.164, -398.439, 57.2954, 3.64687, 0, 0, 0, 100, 0), +(793730, 7, -174.915, -405.601, 56.4655, 4.0317, 0, 0, 0, 100, 0), +(793730, 8, -182.109, -415.769, 54.9732, 4.15738, 0, 0, 0, 100, 0), +(793730, 9, -188.333, -426.058, 53.9842, 4.20058, 0, 0, 0, 100, 0), +(793730, 10, -193.178, -434.586, 53.3664, 4.42246, 0, 0, 0, 100, 0), +(793730, 11, -194.276, -445.181, 54.0619, 4.83284, 0, 0, 0, 100, 0), +(793730, 12, -192.278, -459.332, 54.5998, 4.86033, 0, 0, 0, 100, 0), +(793730, 13, -189.77, -472.617, 54.0449, 4.81126, 0, 0, 0, 100, 0), +(793730, 14, -189.769, -478.574, 54.0453, 4.68387, 0, 0, 0, 100, 0), +(793730, 15, -187.202, -472.422, 54.0442, 1.6326, 0, 0, 0, 100, 0), +(793730, 16, -189.931, -459.185, 54.6009, 1.78183, 0, 0, 0, 100, 0), +(793730, 17, -192.156, -444.909, 54.0954, 1.70918, 0, 0, 0, 100, 0), +(793730, 18, -191.306, -435.284, 53.2804, 1.10246, 0, 0, 0, 100, 0), +(793730, 19, -186.48, -426.263, 53.9539, 1.00821, 0, 0, 0, 100, 0), +(793730, 20, -180.007, -416.785, 54.8724, 0.845252, 0, 0, 0, 100, 0), +(793730, 21, -171.419, -405.611, 56.9207, 0.876666, 0, 0, 0, 100, 0), +-- +(792830, 1, -228.812, -569.757, 51.2314, 1.25402, 0, 0, 0, 100, 0), -- Gilnid patrol +(792830, 2, -225.332, -562.401, 51.23, 1.0184, 0, 0, 0, 100, 0), +(792830, 3, -220.089, -556.916, 51.23, 0.807909, 0, 0, 0, 100, 0), +(792830, 4, -211.182, -553.736, 51.23, 0.342954, 0, 0, 0, 100, 0), +(792830, 5, -203.248, -553.507, 51.23, 0.028794, 0, 0, 0, 100, 0), +(792830, 6, -194.853, -555.999, 51.23, 5.99468, 0, 0, 0, 100, 0), +(792830, 7, -187.356, -561.157, 51.23, 5.68052, 0, 0, 0, 100, 0), +(792830, 8, -182.826, -567.105, 51.072, 5.36322, 0, 0, 0, 100, 0), +(792830, 9, -179.251, -573.939, 48.0013, 5.13153, 0, 0, 0, 100, 0), +(792830, 10, -179.25, -581.854, 45.0103, 4.69799, 0, 0, 0, 100, 0), +(792830, 11, -180.508, -588.861, 42.1844, 4.53462, 0, 0, 0, 100, 0), +(792830, 12, -185.547, -596.173, 38.7453, 4.11993, 0, 0, 0, 100, 0), +(792830, 13, -193.62, -601.311, 34.4809, 3.70838, 0, 0, 0, 100, 0), +(792830, 14, -202.36, -605.164, 30.8329, 3.57487, 0, 0, 0, 100, 0), +(792830, 15, -212.195, -603.824, 26.463, 3.00624, 0, 0, 0, 100, 0), +(792830, 16, -219.832, -602.784, 23.3996, 3.00624, 0, 0, 0, 100, 0), +(792830, 17, -226.192, -596.772, 20.6368, 2.40462, 0, 0, 0, 100, 0), +(792830, 18, -228.849, -592.655, 19.4674, 2.14387, 0, 0, 0, 100, 0), +(792830, 19, -222.017, -602.068, 22.7777, 5.42134, 0, 0, 0, 100, 0), +(792830, 20, -215.955, -606.225, 25.5062, 6.15333, 0, 0, 0, 100, 0), +(792830, 21, -206.392, -607.716, 28.9385, 6.11327, 0, 0, 0, 100, 0), +(792830, 22, -195.975, -605.079, 33.3159, 0.247918, 0, 0, 0, 100, 0), +(792830, 23, -190.92, -602.234, 35.448, 0.493747, 0, 0, 0, 100, 0), +(792830, 24, -186.186, -599.686, 37.3745, 0.493747, 0, 0, 0, 100, 0), +(792830, 25, -181.845, -593.462, 40.1753, 0.961845, 0, 0, 0, 100, 0), +(792830, 26, -179.362, -585.189, 43.6891, 1.27915, 0, 0, 0, 100, 0), +(792830, 27, -180.207, -574.755, 47.8364, 1.7386, 0, 0, 0, 100, 0), +(792830, 28, -183.317, -567.58, 51.0124, 2.03234, 0, 0, 0, 100, 0), +(792830, 29, -188.935, -559.687, 51.2296, 2.18942, 0, 0, 0, 100, 0), +(792830, 30, -195.706, -554.703, 51.2296, 2.54678, 0, 0, 0, 100, 0), +(792830, 31, -204.469, -552.705, 51.2296, 2.91749, 0, 0, 0, 100, 0), +(792830, 32, -213.906, -554.141, 51.2296, 3.34082, 0, 0, 0, 100, 0), +(792830, 33, -222.241, -558.84, 51.2296, 3.65498, 0, 0, 0, 100, 0), +(792830, 34, -227.752, -566.248, 51.2296, 4.07281, 0, 0, 0, 100, 0), +(792830, 35, -230.554, -574.552, 51.223, 4.38697, 0, 0, 0, 100, 0), +(792830, 36, -230.624, -583.197, 51.2233, 4.70427, 0, 0, 0, 100, 0), +-- +(791440, 1, -49.1406, -380.152, 54.8732, 5.71195, 0, 0, 0, 100, 0), -- Defias Miner +(791440, 2, -44.0293, -383.437, 55.5099, 5.71195, 0, 0, 0, 100, 0), +(791440, 3, -48.0472, -391.257, 55.8773, 4.2354, 0, 0, 0, 100, 0), +(791440, 4, -52.4945, -401.038, 55.5619, 4.28566, 0, 0, 0, 100, 0), +(791440, 5, -59.1642, -403.186, 53.9912, 3.45314, 0, 0, 0, 100, 0), +(791440, 6, -69.0763, -401.558, 54.7464, 2.97876, 0, 0, 0, 100, 0), +(791440, 7, -68.6572, -397.85, 55.1056, 1.45823, 0, 0, 0, 100, 0), +(791440, 8, -58.4723, -392.667, 54.1193, 0.462342, 0, 0, 0, 100, 0), +(791440, 9, -53.6889, -382.146, 54.6699, 1.14407, 0, 0, 0, 100, 0), +(791440, 10, -49.8211, -373.639, 55.291, 1.14407, 0, 0, 0, 100, 0), +(791440, 11, -57.1299, -367.638, 55.3325, 2.45411, 0, 0, 0, 100, 0), +(791440, 12, -62.892, -358.569, 54.3333, 2.13681, 0, 0, 0, 100, 0), +(791440, 13, -62.7853, -349.7, 55.955, 1.55876, 0, 0, 0, 100, 0), +(791440, 14, -63.644, -358.635, 54.3321, 4.59982, 0, 0, 0, 100, 0), +(791440, 15, -63.6918, -366.936, 55.0531, 3.5034, 0, 0, 0, 100, 0), +(791440, 16, -68.797, -369.171, 55.6588, 3.49555, 0, 0, 0, 100, 0), +(791440, 17, -75.1762, -373.704, 55.0443, 3.75944, 0, 0, 0, 100, 0), +(791440, 18, -76.815, -378.574, 55.231, 4.38776, 0, 0, 0, 100, 0), +(791440, 19, -67.4685, -383.845, 53.6905, 5.73708, 0, 0, 0, 100, 0), +(791440, 20, -60.7481, -384.712, 53.679, 6.15491, 0, 0, 0, 100, 0), +(791440, 21, -53.467, -377.178, 54.2938, 0.79771, 0, 0, 0, 100, 0), +-- +(791520, 1, -108.408, -401.056, 59.7252, 0.607648, 0, 0, 0, 100, 0), -- Defias Overseer +(791520, 2, -118.798, -408.026, 59.1646, 3.83485, 0, 0, 0, 100, 0), +(791520, 3, -120.495, -414.875, 58.2067, 4.57391, 0, 0, 0, 100, 0), +(791520, 4, -115.331, -424.561, 55.383, 5.20223, 0, 0, 0, 100, 0), +(791520, 5, -107.488, -431.728, 55.1959, 5.52974, 0, 0, 0, 100, 0), +(791520, 6, -114.273, -441.777, 54.9943, 4.14901, 0, 0, 0, 100, 0), +(791520, 7, -119.865, -438.626, 54.718, 2.62848, 0, 0, 0, 100, 0), +(791520, 8, -116.703, -429.971, 54.9343, 1.21476, 0, 0, 0, 100, 0), +(791520, 9, -118.322, -422.801, 55.9285, 1.79281, 0, 0, 0, 100, 0), +(791520, 10, -124.19, -418.18, 57.6147, 2.47454, 0, 0, 0, 100, 0), +(791520, 11, -131.87, -410.675, 57.9201, 2.36772, 0, 0, 0, 100, 0), +(791520, 12, -125.211, -405.184, 58.613, 0.701108, 0, 0, 0, 100, 0), +(791520, 13, -119.058, -408.537, 59.0034, 5.7842, 0, 0, 0, 100, 0), +-- +(791890, 1, -94.8127, -396.214, 58.8776, 1.90355, 0, 0, 0, 100, 0), -- Defias Overseer +(791890, 2, -103.299, -389.301, 57.3192, 2.46119, 0, 0, 0, 100, 0), +(791890, 3, -107.61, -382.619, 56.955, 2.14388, 0, 0, 0, 100, 0), +(791890, 4, -122.753, -383.213, 59.2935, 3.15548, 0, 0, 0, 100, 0), +(791890, 5, -125.399, -390.451, 58.8986, 4.36185, 0, 0, 0, 100, 0), +(791890, 6, -130, -398.722, 59.154, 4.20477, 0, 0, 0, 100, 0), +(791890, 7, -125.478, -403.119, 58.6467, 5.51167, 0, 0, 0, 100, 0), +(791890, 8, -116.097, -397.341, 57.1664, 0.475701, 0, 0, 0, 100, 0), +(791890, 9, -105.905, -394.793, 57.6366, 0.231442, 0, 0, 0, 100, 0), +(791890, 10, -100.374, -398.889, 58.6393, 5.6287, 0, 0, 0, 100, 0), +(791890, 11, -98.5197, -399.054, 58.4361, 5.57843, 0, 0, 0, 100, 0), +-- +(791390, 1, -58.1086, -394.012, 54.3026, 5.04986, 0, 0, 0, 100, 0), -- Defias Evoker +(791390, 2, -55.9432, -400.184, 54.5487, 5.04986, 0, 0, 0, 100, 0), +(791390, 3, -67.441, -401.846, 54.3231, 3.24501, 0, 0, 0, 100, 0), +(791390, 4, -65.5066, -395.733, 54.4282, 1.22575, 0, 0, 0, 100, 0), +(791390, 5, -59.4698, -391.136, 53.7281, 0.650839, 0, 0, 0, 100, 0), +(791390, 6, -57.744, -386.926, 53.9151, 1.18177, 0, 0, 0, 100, 0), +(791390, 7, -57.6061, -381.321, 54.0338, 1.54619, 0, 0, 0, 100, 0), +(791390, 8, -68.0747, -382.217, 53.8005, 3.22695, 0, 0, 0, 100, 0), +(791390, 9, -75.5928, -378.18, 55.1468, 2.64889, 0, 0, 0, 100, 0), +(791390, 10, -87.6686, -376.04, 57.5502, 2.96619, 0, 0, 0, 100, 0), +(791390, 11, -97.0305, -377.378, 58.0518, 3.28349, 0, 0, 0, 100, 0), +(791390, 12, -103.849, -380.893, 57.4528, 3.76573, 0, 0, 0, 100, 0), +(791390, 13, -94.3324, -377.236, 57.7877, 0.032731, 0, 0, 0, 100, 0), +(791390, 14, -82.0819, -376.835, 56.2085, 0.032731, 0, 0, 0, 100, 0), +(791390, 15, -68.3509, -374.365, 55.0867, 0.011525, 0, 0, 0, 100, 0), +(791390, 16, -60.5492, -376.377, 54.3032, 6.03082, 0, 0, 0, 100, 0), +(791390, 17, -54.3384, -379.355, 54.2581, 5.83604, 0, 0, 0, 100, 0), +(791390, 18, -58.7368, -385.684, 53.8661, 4.10502, 0, 0, 0, 100, 0), +(791390, 19, -57.8513, -390.019, 53.7836, 4.8268, 0, 0, 0, 100, 0), +-- +(791880, 1, -51.3118, -396.944, 55.8147, 4.13392, 0, 0, 0, 100, 0), -- Defias Evoker +(791880, 2, -57.2547, -404.149, 54.2062, 0.748848, 0, 0, 0, 100, 0), +(791880, 3, -65.3862, -400.428, 54.146, 1.01588, 0, 0, 0, 100, 0), +(791880, 4, -64.646, -389.761, 53.3425, 5.68508, 0, 0, 0, 100, 0), +(791880, 5, -57.4758, -372.724, 54.6762, 1.53033, 0, 0, 0, 100, 0), +(791880, 6, -57.5201, -373.34, 54.5743, 4.26744, 0, 0, 0, 100, 0), +(791880, 7, -55.1105, -379.222, 54.1917, 5.05271, 0, 0, 0, 100, 0), +(791880, 8, -45.4417, -382.343, 55.3743, 4.5324, 0, 0, 0, 100, 0), +-- +(792770, 1, -66.3997, -374.192, 55.0522, 0.020987, 0, 0, 0, 100, 0), -- Defias Evoker +(792770, 2, -49.8071, -380.806, 54.922, 6.01751, 0, 0, 0, 100, 0), +(792770, 3, -67.0024, -374.014, 55.075, 3.07814, 0, 0, 0, 100, 0), +(792770, 4, -90.4155, -376.029, 57.943, 3.28824, 0, 0, 0, 100, 0), +(792770, 5, -105.951, -381.901, 57.0388, 0.580571, 0, 0, 0, 100, 0), +(792770, 6, -96.1954, -401.304, 57.8538, 5.27725, 0, 0, 0, 100, 0), +(792770, 7, -109.357, -385.638, 56.9081, 5.47951, 0, 0, 0, 100, 0), +(792770, 8, -98.3517, -378.074, 58.3458, 0.498122, 0, 0, 0, 100, 0), +(792770, 9, -90.0838, -375.904, 57.9489, 0.12113, 0, 0, 0, 100, 0), +-- +(791770, 1, -153.951, -517.067, 52.5085, 1.98408, 0, 0, 0, 100, 0), -- Defias Evoker +(791770, 2, -158.165, -508.746, 53.4221, 4.72905, 0, 0, 0, 100, 0), +(791770, 3, -171.265, -505.67, 53.7993, 2.74199, 0, 0, 0, 100, 0), +(791770, 4, -182.304, -499.904, 53.5155, 2.21577, 0, 0, 0, 100, 0), +(791770, 5, -188.829, -484.756, 54.0488, 1.89376, 0, 0, 0, 100, 0), +(791770, 6, -189.451, -497.05, 53.3645, 4.27352, 0, 0, 0, 100, 0), +(791770, 7, -195.512, -504.183, 53.144, 3.73159, 0, 0, 0, 100, 0), +(791770, 8, -209.55, -505.987, 51.3288, 2.47888, 0, 0, 0, 100, 0), +(791770, 9, -222.604, -490.607, 48.3476, 2.30609, 0, 0, 0, 100, 0), +(791770, 10, -234.403, -483.539, 49.0352, 2.84802, 0, 0, 0, 100, 0), +(791770, 11, -250.934, -482.922, 49.4486, 3.10327, 0, 0, 0, 100, 0), +(791770, 12, -229.54, -486.109, 48.6882, 5.7807, 0, 0, 0, 100, 0), +(791770, 13, -218.519, -496.638, 48.9294, 5.36837, 0, 0, 0, 100, 0), +(791770, 14, -205.659, -505.366, 51.9966, 6.0713, 0, 0, 0, 100, 0), +(791770, 15, -187.638, -497.089, 53.4258, 1.64558, 0, 0, 0, 100, 0), +(791770, 16, -188.134, -483.888, 54.0488, 1.58668, 0, 0, 0, 100, 0), +(791770, 17, -181.332, -500.802, 53.497, 5.28983, 0, 0, 0, 100, 0), +(791770, 18, -170.014, -506.459, 53.6273, 6.0281, 0, 0, 0, 100, 0), +(791770, 19, -156.823, -509.046, 53.4042, 4.77539, 0, 0, 0, 100, 0), +(791770, 20, -153.8, -518.653, 52.458, 5.04242, 0, 0, 0, 100, 0), +-- +(792070, 1, -283.242, -513.183, 49.0546, 4.79239, 0, 0, 0, 100, 0), -- Goblin Woodcarver +(792070, 2, -284.152, -531.136, 49.2175, 1.70813, 0, 0, 0, 100, 0), +(792070, 3, -290.872, -533.825, 49.4501, 0.121625, 0, 0, 0, 100, 0), +(792070, 4, -290.716, -504.662, 50.0333, 4.60232, 0, 0, 0, 100, 0), +(792070, 5, -271.187, -482.45, 48.921, 3.95043, 0, 0, 0, 100, 0), +(792070, 6, -282.772, -496.034, 49.2864, 4.18212, 0, 0, 0, 100, 0), +-- +(792290, 1, -280.138, -594.26, 50.7037, 4.0028, 0, 0, 0, 100, 0), -- Defias Wizard +(792290, 2, -289.896, -600.261, 47.841, 3.64937, 0, 0, 0, 100, 0), +(792290, 3, -296.93, -600.848, 47.5709, 2.3888, 0, 0, 0, 100, 0), +(792290, 4, -302.057, -598.565, 48.1454, 2.52232, 0, 0, 0, 100, 0), +(792290, 5, -304.543, -594.692, 47.9971, 2.10999, 0, 0, 0, 100, 0), +(792290, 6, -305.492, -590.467, 47.5502, 1.7919, 0, 0, 0, 100, 0), +(792290, 7, -304.441, -587.034, 47.753, 1.27354, 0, 0, 0, 100, 0), +(792290, 8, -293.184, -571.881, 48.7963, 0.93189, 0, 0, 0, 100, 0), +(792290, 9, -290.811, -557.946, 48.8195, 1.40922, 0, 0, 0, 100, 0), +(792290, 10, -295.064, -572.702, 48.5532, 4.49191, 0, 0, 0, 100, 0), +(792290, 11, -294.039, -572.283, 48.6867, 4.38193, 0, 0, 0, 100, 0), +(792290, 12, -304.129, -588.154, 47.5499, 4.27198, 0, 0, 0, 100, 0), +(792290, 13, -304.129, -588.154, 47.5499, 4.27198, 0, 0, 0, 100, 0), +(792290, 14, -306.109, -591.026, 47.5453, 5.15555, 0, 0, 0, 100, 0), +(792290, 15, -304.373, -594.919, 48.0358, 5.46971, 0, 0, 0, 100, 0), +(792290, 16, -302.149, -597.884, 48.1524, 5.68176, 0, 0, 0, 100, 0), +(792290, 17, -297.488, -600.913, 47.6013, 6.09016, 0, 0, 0, 100, 0), +(792290, 18, -289.964, -600.085, 47.8222, 0.352827, 0, 0, 0, 100, 0), +-- +(792300, 1, -292.798, -571.739, 48.8452, 4.14746, 0, 0, 0, 100, 0), -- Defias Taskmaster +(792300, 2, -305.029, -587.441, 47.7194, 0.7781, 0, 0, 0, 100, 0), +(792300, 3, -305.552, -590.665, 47.5501, 4.90537, 0, 0, 0, 100, 0), +(792300, 4, -304.772, -594.871, 48.0355, 5.13706, 0, 0, 0, 100, 0), +(792300, 5, -302.382, -598.524, 48.1595, 5.5651, 0, 0, 0, 100, 0), +(792300, 6, -297.178, -601.038, 47.5607, 6.0599, 0, 0, 0, 100, 0), +(792300, 7, -290.317, -600.633, 47.8026, 0.216531, 0, 0, 0, 100, 0), +(792300, 8, -280.261, -594.782, 50.661, 0.762388, 0, 0, 0, 100, 0), +(792300, 9, -271.886, -580.742, 49.8973, 0.478069, 0, 0, 0, 100, 0), +(792300, 10, -280.559, -594.761, 50.5776, 3.78616, 0, 0, 0, 100, 0), +(792300, 11, -289.665, -600.984, 47.9087, 3.42488, 0, 0, 0, 100, 0), +(792300, 12, -296.794, -601.399, 47.4805, 2.94892, 0, 0, 0, 100, 0), +(792300, 13, -302.015, -598.92, 48.0812, 2.0732, 0, 0, 0, 100, 0), +(792300, 14, -304.635, -595.232, 48.0998, 1.68836, 0, 0, 0, 100, 0), +(792300, 15, -305.85, -591.028, 47.549, 1.13858, 0, 0, 0, 100, 0), +(792300, 16, -304.688, -587.72, 47.6487, 0.934376, 0, 0, 0, 100, 0), +(792300, 17, -293.211, -572.466, 48.79, 1.31137, 0, 0, 0, 100, 0), +(792300, 18, -291.114, -559.338, 48.8479, 1.49201, 0, 0, 0, 100, 0), +-- +(792330, 1, -270.347, -583.559, 49.9629, 5.63651, 0, 0, 0, 100, 0), -- Defias Taskmaster +(792330, 2, -275.479, -592.516, 51.2754, 4.22123, 0, 0, 0, 100, 0), +(792330, 3, -278.652, -592.354, 50.9278, 3.98325, 0, 0, 0, 100, 0), +(792330, 4, -279.293, -588.709, 50.7539, 1.24064, 0, 0, 0, 100, 0), +(792330, 5, -275.266, -581.112, 50.2998, 1.02937, 0, 0, 0, 100, 0), +(792330, 6, -269.277, -575.118, 50.3089, 0.075108, 0, 0, 0, 100, 0), +(792330, 7, -258.154, -574.293, 51.1511, 0.07118, 0, 0, 0, 100, 0), +(792330, 8, -252.396, -579.794, 51.1481, 3.29918, 0, 0, 0, 100, 0), +(792330, 9, -261.17, -582.182, 50.66, 3.17273, 0, 0, 0, 100, 0); + diff --git a/src/IndividualProgression.h b/src/IndividualProgression.h index ecd7cf1..87541dd 100644 --- a/src/IndividualProgression.h +++ b/src/IndividualProgression.h @@ -45,7 +45,10 @@ enum ProgressionBossIDs YOGGSARON = 33288, ANUBARAK = 34564, LICH_KING = 36597, - HALION = 39863 + HALION = 39863, + RHAHK_ZOR = 644, + SNEED = 643, + GILNID = 1763 }; enum BuffSpells diff --git a/src/IndividualProgressionPlayer.cpp b/src/IndividualProgressionPlayer.cpp index e24a13b..fa036c2 100644 --- a/src/IndividualProgressionPlayer.cpp +++ b/src/IndividualProgressionPlayer.cpp @@ -457,6 +457,31 @@ public: void OnPlayerCreatureKill(Player* killer, Creature* killed) override { + switch (killed->GetEntry()) + { + case RHAHK_ZOR: + killer->RemoveAura(IPP_PHASE); + killer->RemoveAura(IPP_PHASE_II); + killer->RemoveAura(IPP_PHASE_III); + killer->CastSpell(killer, IPP_PHASE, false); + break; + case SNEED: + killer->RemoveAura(IPP_PHASE); + killer->RemoveAura(IPP_PHASE_II); + killer->RemoveAura(IPP_PHASE_III); + killer->CastSpell(killer, IPP_PHASE, false); + killer->CastSpell(killer, IPP_PHASE_II, false); + break; + case GILNID: + killer->RemoveAura(IPP_PHASE); + killer->RemoveAura(IPP_PHASE_II); + killer->RemoveAura(IPP_PHASE_III); + killer->CastSpell(killer, IPP_PHASE, false); + killer->CastSpell(killer, IPP_PHASE_II, false); + killer->CastSpell(killer, IPP_PHASE_III, false); + break; + } + if (killed->GetCreatureTemplate()->rank > CREATURE_ELITE_NORMAL) { sIndividualProgression->checkKillProgression(killer, killed);