diff --git a/data/sql/db-world/zone_difficulty_info_content.sql b/data/sql/db-world/zone_difficulty_info_content.sql index 188aceba..ba56952d 100644 --- a/data/sql/db-world/zone_difficulty_info_content.sql +++ b/data/sql/db-world/zone_difficulty_info_content.sql @@ -12,6 +12,8 @@ INSERT INTO `zone_difficulty_info` (`MapId`, `PhaseMask`, `HealingNerfValue`, `A (565, 0, '0.80', '0.80', '1.20', '1.20', 64, 'Mythic Mode Gruul Healing 80% / Absorb 80% Nerf / 20% physical & 20% spell damage buff'), (544, 0, '0.90', '0.90', '1.10', '1.10', 1, 'Normal Mode Magtheridon Healing 90% / Absorb 90% Nerf / 10% physical & 10% spell damage buff'), (544, 0, '0.80', '0.80', '1.20', '1.20', 64, 'Mythic Mode Magtheridon Healing 80% / Absorb 80% Nerf / 20% physical & 20% spell damage buff'), +(564, 0, '0.75', '0.75', '1.20', '1.15', 1, 'Normal Mode Black Temple Healing 75% / Absorb 75% Nerf / 20% physical & 15% spell damage buff'), +(564, 0, '0.75', '0.75', '1.34', '1.32', 64, 'Mythic Mode Black Temple Healing 75% / Absorb 75% Nerf / 34% physical & 32% spell damage buff'), -- TBC Heroics (269, 0, '0.90', '0.90', '1.20', '1.10', 1, 'Heroic Mode Black Morass Healing 90% / Absorb 90% Nerf / 20% physical & 10% spell damage buff'), (269, 0, '0.80', '0.80', '1.30', '1.20', 64, 'Mythic Mode Black Morass Healing 80% / Absorb 80% Nerf / 30% physical & 20% spell damage buff'), diff --git a/data/sql/db-world/zone_difficulty_mythicmode_bt_creatureoverrides.sql b/data/sql/db-world/zone_difficulty_mythicmode_bt_creatureoverrides.sql new file mode 100644 index 00000000..ff462812 --- /dev/null +++ b/data/sql/db-world/zone_difficulty_mythicmode_bt_creatureoverrides.sql @@ -0,0 +1,18 @@ +DELETE FROM `zone_difficulty_mythicmode_creatureoverrides` WHERE CreatureEntry IN (22887, 22898, 22841, 22871, 22948, 22856, 23418, 23419, 23420, 22947, 23426, 22949, 22950, 22951, 22952, 22917); +INSERT INTO `zone_difficulty_mythicmode_creatureoverrides` (`CreatureEntry`, `HPModifier`, `Enabled`, `Comment`) VALUES +(22887, 3.5, 1, 'Najentus, Black Temple HPx3.5'), +(22898, 3.5, 1, 'Supremus, Black Temple HPx3.5'), +(22841, 3.5, 1, 'Shade of Akama, Black Temple HPx3.5'), +(22871, 3.2, 1, 'Teron Gorefiend, Black Temple HPx3.2'), +(22948, 3.2, 1, 'Gurtogg Bloodboil, Black Temple HPx3.2'), +(22856, 3, 1, 'Reliquary of the Lost, Black Temple HPx3'), +(23418, 3, 1, 'Essence of Suffering, Black Temple HPx3'), +(23419, 2, 1, 'Essence of Desire, Black Temple HPx2'), +(23420, 3, 1, 'Essence of Anger, Black Temple HPx3'), +(22947, 3.5, 1, 'Mother Shahraz, Black Temple HPx3.5'), +(23426, 3.5, 1, 'Illidari Council, Black Temple HPx3.5'), +(22949, 3.5, 1, 'Gathios, Black Temple HPx3.5'), +(22950, 3.5, 1, 'Zerevor, Black Temple HPx3.5'), +(22951, 3.5, 1, 'Malande, Black Temple HPx3.5'), +(22952, 3.5, 1, 'Veras, Black Temple HPx3.5'), +(22917, 3.2, 1, 'Illidan, Black Temple HPx3.2'); diff --git a/data/sql/db-world/zone_difficulty_mythicmode_creatures.sql b/data/sql/db-world/zone_difficulty_mythicmode_creatures.sql index cad528a0..f37bfe32 100644 --- a/data/sql/db-world/zone_difficulty_mythicmode_creatures.sql +++ b/data/sql/db-world/zone_difficulty_mythicmode_creatures.sql @@ -2,7 +2,7 @@ DELETE FROM `creature_template` WHERE `entry` IN (1128001,1128002); DELETE FROM `creature_template_model` WHERE `CreatureID` IN (1128001,1128002); DELETE FROM `creature` WHERE `guid` IN -(303000,303001,303002,303003,303004,303005,303006,303007,303008,303009,303010,303011,303012,303013,303014,303015,303016,303017,303018); +(303000,303001,303002,303003,303004,303005,303006,303007,303008,303009,303010,303011,303012,303013,303014,303015,303016,303017,303018, 303019); DELETE FROM `npc_text` WHERE `ID` IN (91301,91302,91303,91304,91305,91306,91307,91308,91309,91310,91311); @@ -52,7 +52,9 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, -- The Mechanar (303017, 1128001, 0, 0, 554, 3849, 3849, 2, 1024, 0, -25.95, 14.52, -1.81, 5.08, 1000000, 0, 0, 0, 0, 0, 0, 0, 0, 'mod_zone_difficulty_dungeonmaster', 0), -- The Steamvault -(303018, 1128001, 0, 0, 545, 3715, 3715, 2, 1024, 0, 9.83, 9.14, -3.86, 3.32, 1000000, 0, 0, 0, 0, 0, 0, 0, 0, 'mod_zone_difficulty_dungeonmaster', 0); +(303018, 1128001, 0, 0, 545, 3715, 3715, 2, 1024, 0, 9.83, 9.14, -3.86, 3.32, 1000000, 0, 0, 0, 0, 0, 0, 0, 0, 'mod_zone_difficulty_dungeonmaster', 0), + -- The Black Temple +(303019, 1128001, 0, 0, 564, 3959, 3959, 1, 1, 0, 106.39765, 1010.8968, -83.56905, 3.9945135, 1000000, 0, 0, 0, 0, 0, 0, 0, 0, 'mod_zone_difficulty_dungeonmaster', 0); INSERT INTO `npc_text` (`ID`, `text0_0`, `BroadcastTextID0`, `lang0`, `Probability0`, `em0_0`, `em0_1`, `em0_2`, `em0_3`, `em0_4`, `em0_5`, `BroadcastTextID1`, `lang1`, `Probability1`, `em1_0`, `em1_1`, `em1_2`, `em1_3`, `em1_4`, `em1_5`, `BroadcastTextID2`, `lang2`, `Probability2`, `em2_0`, `em2_1`, `em2_2`, `em2_3`, `em2_4`, `em2_5`, `BroadcastTextID3`, `lang3`, `Probability3`, `em3_0`, `em3_1`, `em3_2`, `em3_3`, `em3_4`, `em3_5`, `BroadcastTextID4`, `lang4`, `Probability4`, `em4_0`, `em4_1`, `em4_2`, `em4_3`, `em4_4`, `em4_5`, `BroadcastTextID5`, `lang5`, `Probability5`, `em5_0`, `em5_1`, `em5_2`, `em5_3`, `em5_4`, `em5_5`, `BroadcastTextID6`, `lang6`, `Probability6`, `em6_0`, `em6_1`, `em6_2`, `em6_3`, `em6_4`, `em6_5`, `BroadcastTextID7`, `lang7`, `Probability7`, `em7_0`, `em7_1`, `em7_2`, `em7_3`, `em7_4`, `em7_5`, `VerifiedBuild`) VALUES (91301, 'Hello, $n. How strong do you think you are? I am offering 2 different versions to witness the events of the past. If you don\'t tell me otherwise, i will show you the cinematic one.', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), diff --git a/data/sql/db-world/zone_difficulty_spelloverrides.sql b/data/sql/db-world/zone_difficulty_spelloverrides.sql index 71d31217..e63e953a 100644 --- a/data/sql/db-world/zone_difficulty_spelloverrides.sql +++ b/data/sql/db-world/zone_difficulty_spelloverrides.sql @@ -7,7 +7,7 @@ CREATE TABLE `zone_difficulty_spelloverrides` ( `Comment` TEXT ); -DELETE FROM `zone_difficulty_spelloverrides` WHERE `SpellID` IN (53652, 53654, 52752, 47753, 18562, 25516, 36240, 31850, 31851, 31852, 66235); +DELETE FROM `zone_difficulty_spelloverrides` WHERE `SpellID` IN (53652, 53654, 52752, 47753, 18562, 25516, 36240, 31850, 31851, 31852, 66235, 39878, 42052, 40314, 40175, 40175, 41303, 41360, 40827, 40869, 40870, 40871, 41001, 42005, 41078, 41131); INSERT INTO `zone_difficulty_spelloverrides` (`SpellID`, `MapId`, `NerfValue`, `Enabled`, `Comment`) VALUES (53652, 0, 1, 1, 'Beacon of Light - Skip nerf.'), (53654, 0, 1, 1, 'Beacon of Light 2 (Flash of Light, Holy Shock) - Skip nerf.'), @@ -20,4 +20,19 @@ INSERT INTO `zone_difficulty_spelloverrides` (`SpellID`, `MapId`, `NerfValue`, ` (31850, 0, 1, 1, 'Ardent Defender - Absorb - Skip nerf'), (31851, 0, 1, 1, 'Ardent Defender - Absorb - Skip nerf'), (31852, 0, 1, 1, 'Ardent Defender - Absorb - Skip nerf'), -(66235, 0, 1, 1, 'Ardent Defender - Heal - Skip nerf'); +(66235, 0, 1, 1, 'Ardent Defender - Heal - Skip nerf'), +(39878, 0, 1, 1, 'Black Temple - Najentus - Tidal Burst Effect'), +(42052, 0, 1, 1, 'Black Temple - Supremus - Volcanic Geyser'), +(40314, 0, 1, 1, 'Black Temple - Vengeful Spirit - Spirit Volley'), +(40175, 0, 1, 1, 'Black Temple - Vengeful Spirit - Spirit Chains'), +(40157, 0, 1, 1, 'Black Temple - Vengeful Spirit - Spirit Lance'), +(41303, 0, 1, 1, 'Black Temple - Reliquary of the Lost - Essence of Suffering - Soul Drain'), +(41360, 0, 1, 1, 'Black Temple - Promenade Sentinel - Arcane charge'), -- may not work +(40827, 0, 1, 1, 'Black Temple - Mother Shahraz - Sinful Beam'), +(40869, 0, 1, 1, 'Black Temple - Mother Shahraz - Fatal Attraction'), +(40870, 0, 1, 1, 'Black Temple - Mother Shahraz - Fatal Attraction'), +(40871, 0, 1, 1, 'Black Temple - Mother Shahraz - Fatal Attraction'), +(41001, 0, 1, 1, 'Black Temple - Mother Shahraz - Fatal Attraction'), +(42005, 0, 1, 1, 'Black Temple - Gurtogg Bloodboil - Bloodboil'), +(41078, 0, 1.1, 1, 'Black Temple - Illidan - Shadow Blast'), +(41131, 0, 1.1, 1, 'Black Temple - Illidan - Flame Burst'); diff --git a/src/mod_zone_difficulty_scripts.cpp b/src/mod_zone_difficulty_scripts.cpp index 87b81bb3..2a099511 100644 --- a/src/mod_zone_difficulty_scripts.cpp +++ b/src/mod_zone_difficulty_scripts.cpp @@ -1181,7 +1181,7 @@ class mod_zone_difficulty_playerscript : public PlayerScript sZoneDifficulty->SelectionCache.erase(player->GetGUID()); } - void OnBeforeBuyItemFromVendor(Player* player, ObjectGuid vendorguid, uint32 vendorslot, uint32& itemEntry, uint8 /*count*/, uint8 /*bag*/, uint8 /*slot*/) override + void OnBeforeBuyItemFromVendor(Player* player, ObjectGuid vendorguid, uint32 /*vendorslot*/, uint32& itemEntry, uint8 /*count*/, uint8 /*bag*/, uint8 /*slot*/) override { Creature* vendor = player->GetMap()->GetCreature(vendorguid);