From 572a7ea60d7d9b727b20cec1291ca2933cdac7cc Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Mon, 3 Apr 2023 23:29:51 -0300 Subject: [PATCH 01/10] feat(Scripts/IcecrownCitadel): Allow game masters to skip boss checks (#15810) --- .../IcecrownCitadel/instance_icecrown_citadel.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 458847e0a..1b07ed48d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1445,8 +1445,13 @@ public: return false; } - bool CheckRequiredBosses(uint32 bossId, Player const* /*player*/) const override + bool CheckRequiredBosses(uint32 bossId, Player const* player) const override { + if (player->GetSession()->GetSecurity() >= SEC_MODERATOR) + { + return true; + } + switch (bossId) { case DATA_THE_LICH_KING: From 6099915c644a0093509fec103e1e60bde96f0f38 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Tue, 4 Apr 2023 06:18:27 +0300 Subject: [PATCH 02/10] fix(DB/creature_addon): Remove deprecated bytes2 flags. (#15788) * fix(DB/creature_addon): Remove deprecated bytes2 flags. * Update rev_1680463160388009300.sql * update * Update data/sql/updates/pending_db_world/rev_1680463160388009300.sql * remove auras from 50009 * creature_template_addon * creature_template_addon --- .../rev_1680463160388009300.sql | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680463160388009300.sql diff --git a/data/sql/updates/pending_db_world/rev_1680463160388009300.sql b/data/sql/updates/pending_db_world/rev_1680463160388009300.sql new file mode 100644 index 000000000..e60ba57f4 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680463160388009300.sql @@ -0,0 +1,27 @@ +-- Remove old/deprecated bytes2 flags. +UPDATE `creature_addon` SET `bytes2` = 1 WHERE `bytes2` IN (257,733,4097,301993985,318771201,285216769,234885121); +UPDATE `creature_addon` SET `bytes2` = 0 WHERE `bytes2` IN (256,4092,4096); +UPDATE `creature_addon` SET `bytes2` = 2 WHERE `bytes2` IN (258,4098); + +UPDATE `creature_template_addon` SET `bytes2` = 1 WHERE `bytes2` IN (3,69,257,2049,2305,4097,10241,133121,234885121,285216769); +UPDATE `creature_template_addon` SET `bytes2` = 0 WHERE `bytes2` IN (256,4092,4096,65536); +UPDATE `creature_template_addon` SET `bytes2` = 2 WHERE `bytes2` IN (258,4098); + +-- Creature where neither of the values in creature_addon were used. +DELETE FROM `creature_addon` WHERE `guid` IN (75829,77583,77606,77607,82379,73192,80419,81738,82004,32943); + +-- Incorrect mob spawns (wrong zone/area/sniffed as a pet (with spirit bond)) +-- Blackwind Sabercat +DELETE FROM `creature` WHERE (`guid` = 75829 AND `id1` = 21723); +-- Scorpid Bonecrawler +DELETE FROM `creature` WHERE (`guid` = 77583 AND `id1` = 22100); +-- Elder Springpaw +DELETE FROM `creature` WHERE (`guid` = 82379 AND `id1` = 15652); +-- Scalewing Serpent +DELETE FROM `creature` WHERE (`guid` = 73192 AND `id1` = 20749); +-- Stunetusk Boar +DELETE FROM `creature` WHERE (`guid` = 80419 AND `id1` = 113); + + +-- Hatecrest Warrior defensive stance, Grimtotem Raider berserk stance, handled by SAI +UPDATE `creature_addon` SET `auras` = '' WHERE `guid` IN (51476,50009); From 15635860410b014e7c9bbb4aa0c7ce1ffc7198f0 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Mon, 3 Apr 2023 22:19:15 -0500 Subject: [PATCH 03/10] fix(DB/SAI): Slow down Darkshire City Hall broadcasts (#15791) * fix(db/SAI): Slow down Darkshire City Hall broadcasts * Update rev_1680487892209055100.sql --- .../pending_db_world/rev_1680487892209055100.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680487892209055100.sql diff --git a/data/sql/updates/pending_db_world/rev_1680487892209055100.sql b/data/sql/updates/pending_db_world/rev_1680487892209055100.sql new file mode 100644 index 000000000..a63a8d6a3 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680487892209055100.sql @@ -0,0 +1,10 @@ +-- +-- Slows the repeat behavior of NPCs 263 (Lord Ello Ebonlocke), 269 (Role Dreuger), 270 (Councilman Millstripe), 271 (Ambassador Berrybuck), and 325 (Hogan Ference) dialogue to be more correctly timed +UPDATE `smart_scripts` SET `event_param3`=1306000, `event_param4`=1407000 WHERE `entryorguid`=263 AND `source_type`=0 AND `id`=1 AND `link`=0 AND `action_type`=1; +UPDATE `smart_scripts` SET `event_param3`=1052000, `event_param4`=1634000 WHERE `entryorguid`=269 AND `source_type`=0 AND `id`=0 AND `link`=0 AND `action_type`=1; +UPDATE `smart_scripts` SET `event_param3`=1394000, `event_param4`=1604000 WHERE `entryorguid`=270 AND `source_type`=0 AND `id`=0 AND `link`=0 AND `action_type`=1; +UPDATE `smart_scripts` SET `event_param3`=721000, `event_param4`=1607000 WHERE `entryorguid`=271 AND `source_type`=0 AND `id`=0 AND `link`=0 AND `action_type`=1; +UPDATE `smart_scripts` SET `event_param3`=305000, `event_param4`=355000 WHERE `entryorguid`=325 AND `source_type`=0 AND `id`=0 AND `link`=0 AND `action_type`=1; + +-- Slows repeat behavior of Commander Althea Ebonlocke (NPC 264) text broadcasts +UPDATE `smart_scripts` SET `event_param3`=1202000, `event_param4`=3026000 WHERE `entryorguid`=264 AND `source_type`=0 AND `id`=1 AND `link`=0 AND `action_type`=1; From 4833dd01a9bfdfef2da3173204a431606f8828af Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Tue, 4 Apr 2023 06:19:26 +0300 Subject: [PATCH 04/10] fix(DB/SAI): Correct Bael'dun creatures not fleeing. (#15794) * fix(DB/SAI): Correct Bael'dun creatures not fleeing. * comment * order --- .../rev_1680504193702080400.sql | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680504193702080400.sql diff --git a/data/sql/updates/pending_db_world/rev_1680504193702080400.sql b/data/sql/updates/pending_db_world/rev_1680504193702080400.sql new file mode 100644 index 000000000..72743defc --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680504193702080400.sql @@ -0,0 +1,36 @@ +-- ID 3374 (Bael'dun Excavator) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3374); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3374, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Excavator - Between 0-15% Health - Flee For Assist (No Repeat)'), +(3374, 0, 1, 0, 4, 0, 100, 1, 0, 0, 0, 0, 0, 11, 7164, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Excavator - On Aggro - Cast \'Defensive Stance\' (No Repeat)'), +(3374, 0, 2, 0, 0, 0, 100, 0, 5000, 20000, 10000, 30000, 0, 11, 7386, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Excavator - In Combat - Cast \'Sunder Armor\''); + +-- ID 3375 (Bael'dun Foreman) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3375); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3375, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Foreman - Between 0-15% Health - Flee For Assist (No Repeat)'), +(3375, 0, 1, 0, 0, 0, 100, 0, 0, 20000, 27000, 35000, 0, 11, 6257, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Foreman - In Combat - Cast \'Torch Toss\''); + +-- ID 3376 (Bael'dun Soldier) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3376); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3376, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Soldier - Between 0-15% Health - Flee For Assist (No Repeat)'); + +-- ID 3377 (Bael'dun Rifleman) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3377); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3377, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Rifleman - Between 0-15% Health - Flee For Assist (No Repeat)'), +(3377, 0, 1, 0, 0, 0, 100, 0, 0, 0, 2300, 3900, 0, 11, 6660, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Rifleman - In Combat - Cast \'Shoot\''); + +-- ID 3378 (Bael'dun Officer) -- Thrash (2 attacks) - move from SAI to _addon +UPDATE `creature_template_addon` SET `auras` = '8876' WHERE (`entry` = 3378); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3378); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3378, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Officer - Between 0-15% Health - Flee For Assist (No Repeat)'), +(3378, 0, 1, 0, 0, 0, 100, 0, 0, 20000, 45000, 60000, 0, 11, 6264, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bael\'dun Officer - In Combat - Cast \'Nimble Reflexes\''); + +-- ID 3392 (Prospector Khazgorm) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3392); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3392, 0, 0, 0, 0, 0, 100, 0, 7000, 14000, 10000, 16000, 0, 11, 6253, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Prospector Khazgorm - In Combat - Cast \'Backhand\''); From 8926a1e62a6e75f495842ffd4965ae82f887f849 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Tue, 4 Apr 2023 06:19:37 +0300 Subject: [PATCH 05/10] fix(DB/SAI): Port The Knife Revealed RP from Trinity. (#15796) fix(DB/SAI): Port The Knife Revealed rp from Trinity. https: //github.com/TrinityCore/TrinityCore/issues/18569 Co-authored-by: Rushor --- .../pending_db_world/rev_1680516450079841800.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680516450079841800.sql diff --git a/data/sql/updates/pending_db_world/rev_1680516450079841800.sql b/data/sql/updates/pending_db_world/rev_1680516450079841800.sql new file mode 100644 index 000000000..0bda97bf0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680516450079841800.sql @@ -0,0 +1,12 @@ +-- ID 7879 (Quintis Jonespyre) +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 7879; + +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 7879; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7879, 0, 0, 0, 20, 0, 100, 0, 4129, 0, 0, 0, 0, 80, 787900, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Quintis Jonespyre - On Quest \'The Knife Revealed\' Finished - Run Script'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=787900 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(787900, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Quintis Jonespyre - Actionlist - Say Line 0'), +(787900, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 15050, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Quintis Jonespyre - Actionlist - Cast \'Psychometry\''), +(787900, 9, 2, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Quintis Jonespyre - Actionlist - Say Line 1'); From dc6238d3b24ce9caca8b8f413df94b6e248a9c97 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Tue, 4 Apr 2023 06:19:46 +0300 Subject: [PATCH 06/10] fix(DB/Loot): Blood of the Mountain dropping from wrong mobs. (#15768) * fix(DB/Loot): Blood of the Mountain dropping from wrong mobs. * Update rev_1680371174965612100.sql --- data/sql/updates/pending_db_world/rev_1680371174965612100.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680371174965612100.sql diff --git a/data/sql/updates/pending_db_world/rev_1680371174965612100.sql b/data/sql/updates/pending_db_world/rev_1680371174965612100.sql new file mode 100644 index 000000000..5794b9477 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680371174965612100.sql @@ -0,0 +1,4 @@ +-- Blood of the Mountain +DELETE FROM `creature_loot_template` WHERE `Item` = 11382; +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(11659, 11382, 0, 7.1259, 0, 1, 0, 1, 1, 'Molten Destroyer - Blood of the Mountain'); From c028d074846163f01778b5a600367c7f0dec7b16 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Tue, 4 Apr 2023 06:19:54 +0300 Subject: [PATCH 07/10] fix(DB/Conditions): Jesse Masters selling items without quest completion (#15777) * fix(DB/Conditions): Jesse Masters selling items without quest completion. * require only 12212 to show gossip * comment --- .../pending_db_world/rev_1680412607015816900.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680412607015816900.sql diff --git a/data/sql/updates/pending_db_world/rev_1680412607015816900.sql b/data/sql/updates/pending_db_world/rev_1680412607015816900.sql new file mode 100644 index 000000000..24fbd14f2 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680412607015816900.sql @@ -0,0 +1,12 @@ +-- Jesse Masters +DELETE FROM `gossip_menu` WHERE `MenuID` = 9798 AND `TextID` = 13502; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES +(9798, 13502); + +DELETE FROM `conditions` WHERE `SourceGroup` = 9798 AND `SourceTypeOrReferenceId` IN (14,15); +DELETE FROM `conditions` WHERE `SourceGroup` = 29244 AND `SourceTypeOrReferenceId` = 23; + +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14, 9798, 13503, 0, 0, 8, 0, 12212, 0, 0, 0, 0, 0, '', 'Jesse Masters - Show gossip menu 9798 VENDOR only if quest 12212 have been rewarded.'), +(15, 9798, 0, 0, 0, 8, 0, 12212, 0, 0, 0, 0, 0, '', 'Jesse Masters - Show gossip menu 9798 option VENDOR only if quest 12212 have been rewarded.'), +(23, 29244, 40202, 0, 0, 8, 0, 12216, 0, 0, 0, 0, 0, '', 'Jesse Masters - Sell Sizzling Grizzly Flank only if quest 12216 has been rewarded.'); From 1ba36b8d1c70fd5a2116566776600fdcc05e3307 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Tue, 4 Apr 2023 06:20:08 +0300 Subject: [PATCH 08/10] fix(DB/SAI): Sentinel Keldara Sunblade attacking while feign death (#15784) * fix(DB/SAI): Sentinel Keldara Sunblade attacking while feign death --- .../pending_db_world/rev_1680462089982964400.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680462089982964400.sql diff --git a/data/sql/updates/pending_db_world/rev_1680462089982964400.sql b/data/sql/updates/pending_db_world/rev_1680462089982964400.sql new file mode 100644 index 000000000..164dfa2d7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680462089982964400.sql @@ -0,0 +1,11 @@ +-- ID 8397 (Sentinel Keldara Sunblade) +DELETE FROM `creature_addon` WHERE (`guid` IN (35937)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(35937, 0, 0, 0, 1, 0, 0, ''); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 8397; + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 8397); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(8397, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 91, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Sentinel Keldara Sunblade - On Aggro - Remove FlagStandstate Dead'), +(8397, 0, 1, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 90, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Sentinel Keldara Sunblade - On Reset - Set Flag Standstate Dead'); From 37374bbfe9bf57ca74a882a9bfd303d35d0d31e4 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 4 Apr 2023 00:20:25 -0300 Subject: [PATCH 09/10] fix(DB/Reputation): Onkill rep for Steamvault and Shadow Labyrinth (#15809) Create rev_1680566443470632000.sql --- .../rev_1680566443470632000.sql | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680566443470632000.sql diff --git a/data/sql/updates/pending_db_world/rev_1680566443470632000.sql b/data/sql/updates/pending_db_world/rev_1680566443470632000.sql new file mode 100644 index 000000000..e48696c02 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680566443470632000.sql @@ -0,0 +1,83 @@ +-- Steamvault +DELETE FROM `creature_onkill_reputation` WHERE (`creature_id` IN (17721,17722,17796,17797,17798,17799,17800,17801,17802,17803,17805,17917,17951,17954,20926,21338,21694,21695,21696,20620,20621,20622,20623,20624,20625,20626,20627,20628,20629,20630,20631,20632,20633,21914,21915,21916,21917)); +INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES +(17721, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Engineer +(17722, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Sorceress +(17796, 942, 0, 7, 0, 120, 0, 0, 0, 0), -- Mekgineer Steamrigger +(17797, 942, 0, 7, 0, 120, 0, 0, 0, 0), -- Hydromancer Thespia +(17798, 942, 0, 7, 0, 120, 0, 0, 0, 0), -- Warlord Kalithresh +(17799, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Dreghood Slave +(17800, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Myrmidon +(17801, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Siren +(17802, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Warrior +(17803, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Oracle +(17805, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Slavemaster +(17917, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Coilfang Water Elemental +(21338, 942, 0, 7, 0, 2, 0, 0, 0, 0), -- Coilfang Leper +(21694, 942, 0, 7, 0, 24, 0, 0, 0, 0), -- Bog Overlord +(21695, 942, 0, 7, 0, 12, 0, 0, 0, 0), -- Tidal Surger +(21696, 942, 0, 7, 0, 2, 0, 0, 0, 0), -- Steam Surger +-- Heroic +(20620, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Engineer +(20621, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Myrmidon +(20622, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Oracle +(20623, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Siren +(20624, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Slavemaster +(20625, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Sorceress +(20626, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Warrior +(20627, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Coilfang Water Elemental +(20628, 942, 0, 7, 0, 15, 0, 0, 0, 0), -- Dreghood Slave +(20629, 942, 0, 7, 0, 250, 0, 0, 0, 0), -- Hydromancer Thespia +(20630, 942, 0, 7, 0, 250, 0, 0, 0, 0), -- Mekgineer Steamrigger +(20633, 942, 0, 7, 0, 250, 0, 0, 0, 0), -- Warlord Kalithresh +(21914, 942, 0, 7, 0, 30, 0, 0, 0, 0), -- Bog Overlord +(21915, 942, 0, 7, 0, 3, 0, 0, 0, 0), -- Coilfang Leper +(21916, 942, 0, 7, 0, 3, 0, 0, 0, 0), -- Steam Surger +(21917, 942, 0, 7, 0, 15, 0, 0, 0, 0); -- Tidal Surger + +-- Shadow Labyrinth +DELETE FROM `creature_onkill_reputation` WHERE (`creature_id` IN (19208,19209,20660,20661,18631,18632,18633,18634,18635,18636,18637,18638,18639,18640,18641,18642,18667,18708,18731,18732,18794,18796,18797,18830,18848,18891,20636,20637,20638,20639,20640,20641,20642,20643,20644,20645,20646,20647,20648,20649,20650,20651,20652,20653,20656,20657,20659,20662,18663,20655)); +INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES +(18631, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Cultist +(18632, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Executioner +(18633, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Acolyte +(18634, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Summoner +(18635, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Deathsworn +(18636, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Assassin +(18637, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Shadow Priest +(18638, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Zealot +(18639, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Spellbinder +(18640, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Warlock +(18641, 1011, 0, 7, 0, 2, 0, 0, 0, 0), -- Cabal Familiar +(18642, 1011, 0, 7, 0, 2, 0, 0, 0, 0), -- Fel Guardhound +(18663, 1011, 0, 7, 0, 2, 0, 0, 0, 0), -- Maiden of Discipline +(18667, 1011, 0, 7, 0, 120, 0, 0, 0, 0), -- Blackheart the Inciter +(18708, 1011, 0, 7, 0, 120, 0, 0, 0, 0), -- Murmur +(18731, 1011, 0, 7, 0, 120, 0, 0, 0, 0), -- Ambassador Hellmaw +(18732, 1011, 0, 7, 0, 120, 0, 0, 0, 0), -- Grandmaster Vorpil +(18794, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Ritualist +(18796, 1011, 0, 7, 0, 24, 0, 0, 0, 0), -- Fel Overseer +(18830, 1011, 0, 7, 0, 12, 0, 0, 0, 0), -- Cabal Fanatic +(18848, 1011, 0, 7, 0, 24, 0, 0, 0, 0), -- Malicious Instructor +-- Heroic +(20636, 1011, 0, 7, 0, 250, 0, 0, 0, 0), -- Ambassador Hellmaw +(20637, 1011, 0, 7, 0, 250, 0, 0, 0, 0), -- Blackheart the Inciter +(20638, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Acolyte +(20639, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Assassin +(20640, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Cultist +(20641, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Deathsworn +(20642, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Executioner +(20643, 1011, 0, 7, 0, 3, 0, 0, 0, 0), -- Cabal Familiar +(20644, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Fanatic +(20645, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Ritualist +(20646, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Shadow Priest +(20647, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Spellbinder +(20648, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Summoner +(20649, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Warlock +(20650, 1011, 0, 7, 0, 15, 0, 0, 0, 0), -- Cabal Zealot +(20651, 1011, 0, 7, 0, 3, 0, 0, 0, 0), -- Fel Guardhound +(20652, 1011, 0, 7, 0, 30, 0, 0, 0, 0), -- Fel Overseer +(20653, 1011, 0, 7, 0, 250, 0, 0, 0, 0), -- Grandmaster Vorpil +(20655, 1011, 0, 7, 0, 3, 0, 0, 0, 0), -- Maiden of Discipline +(20656, 1011, 0, 7, 0, 30, 0, 0, 0, 0), -- Malicious Instructor +(20657, 1011, 0, 7, 0, 250, 0, 0, 0, 0); -- Murmur From 686055c54757af866d8851a9bf6665ccc547f1f2 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 4 Apr 2023 03:23:02 +0000 Subject: [PATCH 10/10] chore(DB): import pending files Referenced commit(s): 37374bbfe9bf57ca74a882a9bfd303d35d0d31e4 --- .../rev_1680371174965612100.sql => db_world/2023_04_04_00.sql} | 1 + .../rev_1680412607015816900.sql => db_world/2023_04_04_01.sql} | 1 + .../rev_1680462089982964400.sql => db_world/2023_04_04_02.sql} | 1 + .../rev_1680463160388009300.sql => db_world/2023_04_04_03.sql} | 1 + .../rev_1680487892209055100.sql => db_world/2023_04_04_04.sql} | 1 + .../rev_1680504193702080400.sql => db_world/2023_04_04_05.sql} | 1 + .../rev_1680516450079841800.sql => db_world/2023_04_04_06.sql} | 1 + .../rev_1680566443470632000.sql => db_world/2023_04_04_07.sql} | 1 + 8 files changed, 8 insertions(+) rename data/sql/updates/{pending_db_world/rev_1680371174965612100.sql => db_world/2023_04_04_00.sql} (88%) rename data/sql/updates/{pending_db_world/rev_1680412607015816900.sql => db_world/2023_04_04_01.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1680462089982964400.sql => db_world/2023_04_04_02.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1680463160388009300.sql => db_world/2023_04_04_03.sql} (97%) rename data/sql/updates/{pending_db_world/rev_1680487892209055100.sql => db_world/2023_04_04_04.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1680504193702080400.sql => db_world/2023_04_04_05.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1680516450079841800.sql => db_world/2023_04_04_06.sql} (97%) rename data/sql/updates/{pending_db_world/rev_1680566443470632000.sql => db_world/2023_04_04_07.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1680371174965612100.sql b/data/sql/updates/db_world/2023_04_04_00.sql similarity index 88% rename from data/sql/updates/pending_db_world/rev_1680371174965612100.sql rename to data/sql/updates/db_world/2023_04_04_00.sql index 5794b9477..252b2851f 100644 --- a/data/sql/updates/pending_db_world/rev_1680371174965612100.sql +++ b/data/sql/updates/db_world/2023_04_04_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_03_00 -> 2023_04_04_00 -- Blood of the Mountain DELETE FROM `creature_loot_template` WHERE `Item` = 11382; INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1680412607015816900.sql b/data/sql/updates/db_world/2023_04_04_01.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1680412607015816900.sql rename to data/sql/updates/db_world/2023_04_04_01.sql index 24fbd14f2..56e5487ed 100644 --- a/data/sql/updates/pending_db_world/rev_1680412607015816900.sql +++ b/data/sql/updates/db_world/2023_04_04_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_04_00 -> 2023_04_04_01 -- Jesse Masters DELETE FROM `gossip_menu` WHERE `MenuID` = 9798 AND `TextID` = 13502; INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1680462089982964400.sql b/data/sql/updates/db_world/2023_04_04_02.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1680462089982964400.sql rename to data/sql/updates/db_world/2023_04_04_02.sql index 164dfa2d7..9796a3987 100644 --- a/data/sql/updates/pending_db_world/rev_1680462089982964400.sql +++ b/data/sql/updates/db_world/2023_04_04_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_04_01 -> 2023_04_04_02 -- ID 8397 (Sentinel Keldara Sunblade) DELETE FROM `creature_addon` WHERE (`guid` IN (35937)); INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1680463160388009300.sql b/data/sql/updates/db_world/2023_04_04_03.sql similarity index 97% rename from data/sql/updates/pending_db_world/rev_1680463160388009300.sql rename to data/sql/updates/db_world/2023_04_04_03.sql index e60ba57f4..42a2191a0 100644 --- a/data/sql/updates/pending_db_world/rev_1680463160388009300.sql +++ b/data/sql/updates/db_world/2023_04_04_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_04_02 -> 2023_04_04_03 -- Remove old/deprecated bytes2 flags. UPDATE `creature_addon` SET `bytes2` = 1 WHERE `bytes2` IN (257,733,4097,301993985,318771201,285216769,234885121); UPDATE `creature_addon` SET `bytes2` = 0 WHERE `bytes2` IN (256,4092,4096); diff --git a/data/sql/updates/pending_db_world/rev_1680487892209055100.sql b/data/sql/updates/db_world/2023_04_04_04.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1680487892209055100.sql rename to data/sql/updates/db_world/2023_04_04_04.sql index a63a8d6a3..70d3b4531 100644 --- a/data/sql/updates/pending_db_world/rev_1680487892209055100.sql +++ b/data/sql/updates/db_world/2023_04_04_04.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_04_03 -> 2023_04_04_04 -- -- Slows the repeat behavior of NPCs 263 (Lord Ello Ebonlocke), 269 (Role Dreuger), 270 (Councilman Millstripe), 271 (Ambassador Berrybuck), and 325 (Hogan Ference) dialogue to be more correctly timed UPDATE `smart_scripts` SET `event_param3`=1306000, `event_param4`=1407000 WHERE `entryorguid`=263 AND `source_type`=0 AND `id`=1 AND `link`=0 AND `action_type`=1; diff --git a/data/sql/updates/pending_db_world/rev_1680504193702080400.sql b/data/sql/updates/db_world/2023_04_04_05.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1680504193702080400.sql rename to data/sql/updates/db_world/2023_04_04_05.sql index 72743defc..6b903bab2 100644 --- a/data/sql/updates/pending_db_world/rev_1680504193702080400.sql +++ b/data/sql/updates/db_world/2023_04_04_05.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_04_04 -> 2023_04_04_05 -- ID 3374 (Bael'dun Excavator) DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3374); INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1680516450079841800.sql b/data/sql/updates/db_world/2023_04_04_06.sql similarity index 97% rename from data/sql/updates/pending_db_world/rev_1680516450079841800.sql rename to data/sql/updates/db_world/2023_04_04_06.sql index 0bda97bf0..b9fd332ed 100644 --- a/data/sql/updates/pending_db_world/rev_1680516450079841800.sql +++ b/data/sql/updates/db_world/2023_04_04_06.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_04_05 -> 2023_04_04_06 -- ID 7879 (Quintis Jonespyre) UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 7879; diff --git a/data/sql/updates/pending_db_world/rev_1680566443470632000.sql b/data/sql/updates/db_world/2023_04_04_07.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1680566443470632000.sql rename to data/sql/updates/db_world/2023_04_04_07.sql index e48696c02..848dc0d9e 100644 --- a/data/sql/updates/pending_db_world/rev_1680566443470632000.sql +++ b/data/sql/updates/db_world/2023_04_04_07.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_04_06 -> 2023_04_04_07 -- Steamvault DELETE FROM `creature_onkill_reputation` WHERE (`creature_id` IN (17721,17722,17796,17797,17798,17799,17800,17801,17802,17803,17805,17917,17951,17954,20926,21338,21694,21695,21696,20620,20621,20622,20623,20624,20625,20626,20627,20628,20629,20630,20631,20632,20633,21914,21915,21916,21917)); INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES