From 41fc1a62298a003b61d17c1c2322d39abadf7082 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Thu, 30 Mar 2023 10:38:56 -0300 Subject: [PATCH 01/26] =?UTF-8?q?fix(Scripts/Arcatraz):=20Delay=20abilitie?= =?UTF-8?q?s=20during=20charge=20and=20delete=20trigg=E2=80=A6=20(#15653)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Scripts/Arcatraz): Delay abilities during charge and delete trigger spawns --- data/sql/updates/pending_db_world/rev_1680167534470778000.sql | 2 ++ .../TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 data/sql/updates/pending_db_world/rev_1680167534470778000.sql diff --git a/data/sql/updates/pending_db_world/rev_1680167534470778000.sql b/data/sql/updates/pending_db_world/rev_1680167534470778000.sql new file mode 100644 index 000000000..c1674d831 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680167534470778000.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature` WHERE `id1` = 20978; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index f4dcebefe..ab3c7bd70 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -128,9 +128,10 @@ struct boss_wrath_scryer_soccothrates : public BossAI scheduler.Schedule(30s, 35s, [this](TaskContext context) { + scheduler.DelayAll(5s); me->CastSpell(me, SPELL_KNOCK_AWAY, false); - me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); Talk(SAY_KNOCK_AWAY); + me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); scheduler.Schedule(4600ms, [this](TaskContext) { From c7accddad00a857a86107fedbd37cd5ffa53789e Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 30 Mar 2023 13:41:31 +0000 Subject: [PATCH 02/26] chore(DB): import pending files Referenced commit(s): 41fc1a62298a003b61d17c1c2322d39abadf7082 --- .../rev_1680167534470778000.sql => db_world/2023_03_30_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1680167534470778000.sql => db_world/2023_03_30_00.sql} (51%) diff --git a/data/sql/updates/pending_db_world/rev_1680167534470778000.sql b/data/sql/updates/db_world/2023_03_30_00.sql similarity index 51% rename from data/sql/updates/pending_db_world/rev_1680167534470778000.sql rename to data/sql/updates/db_world/2023_03_30_00.sql index c1674d831..759849695 100644 --- a/data/sql/updates/pending_db_world/rev_1680167534470778000.sql +++ b/data/sql/updates/db_world/2023_03_30_00.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_29_04 -> 2023_03_30_00 -- DELETE FROM `creature` WHERE `id1` = 20978; From ca26ef87f5443a7f53da8790de5e30df711d8bc3 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 30 Mar 2023 18:08:01 -0300 Subject: [PATCH 03/26] fix(DB/SAI): Correct combat mechanics in Mechanar's Gauntlet Event (#15649) Create rev_1680115354717005600.sql --- .../updates/pending_db_world/rev_1680115354717005600.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680115354717005600.sql diff --git a/data/sql/updates/pending_db_world/rev_1680115354717005600.sql b/data/sql/updates/pending_db_world/rev_1680115354717005600.sql new file mode 100644 index 000000000..5667e894d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680115354717005600.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1922001) AND (`source_type` = 9) AND (`id` IN (3)); +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 +(1922001, 9, 3, 0, 0, 0, 100, 512, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mechanar Gauntlet Engage - Actionlist - Set In Combat With Zone'); + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1922002) AND (`source_type` = 9) AND (`id` IN (2)); +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 +(1922002, 9, 2, 0, 0, 0, 100, 512, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mechanar Gauntlet Engage 2 - Actionlist - Set In Combat With Zone'); From 3ede5186ba20c0dfc8a38dbe517f14f1341498f6 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 30 Mar 2023 18:08:47 -0300 Subject: [PATCH 04/26] fix(DB/Creature): Remove rep rewards for killing Skyriss Images (#15646) Create rev_1680109188044403400.sql --- data/sql/updates/pending_db_world/rev_1680109188044403400.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680109188044403400.sql diff --git a/data/sql/updates/pending_db_world/rev_1680109188044403400.sql b/data/sql/updates/pending_db_world/rev_1680109188044403400.sql new file mode 100644 index 000000000..dda29fa2d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680109188044403400.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature_onkill_reputation` WHERE (`creature_id` IN (21466, 21467)); From ea047f2cf254803913bbd29eb49c22d1085cc134 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 30 Mar 2023 18:09:11 -0300 Subject: [PATCH 05/26] fix(Scripts/Mechanar): Add missing Enrage event for Pathaleon the Calculator (#15650) * init * 2 * indentation * 3 --- .../rev_1680124416269252400.sql | 8 +++++ .../boss_pathaleon_the_calculator.cpp | 35 ++++++++++++++----- 2 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1680124416269252400.sql diff --git a/data/sql/updates/pending_db_world/rev_1680124416269252400.sql b/data/sql/updates/pending_db_world/rev_1680124416269252400.sql new file mode 100644 index 000000000..b9fdb9510 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680124416269252400.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceEntry` = 35301) AND (`ConditionTypeOrReference` = 31) AND (`ConditionValue2` = 21062); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 35301, 0, 0, 31, 0, 3, 21062, 0, 0, 0, 0, '', 'Spell Suicide (35301) only targets Nether Wraith (21062)'); + +DELETE FROM `creature_equip_template` WHERE (`CreatureID` = 19220 AND `ID` = 2); +INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES +(19220, 2, 29455, 0, 0, 48526); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 209aaae4b..0dabf465e 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -37,6 +37,8 @@ enum Spells SPELL_ARCANE_TORRENT = 36022, SPELL_MANA_TAP = 36021, SPELL_DOMINATION = 35280, + SPELL_FRENZY = 36992, + SPELL_SUICIDE = 35301, SPELL_ETHEREAL_TELEPORT = 34427, SPELL_GREATER_INVISIBILITY = 34426, SPELL_SUMMON_NETHER_WRAITH_1 = 35285, @@ -48,6 +50,8 @@ enum Spells enum Misc { ACTION_BRIDGE_MOB_DEATH = 1, // Used by SAI + EQUIPMENT_NORMAL = 1, + EQUIPMENT_FRENZY = 2, }; struct boss_pathaleon_the_calculator : public BossAI @@ -60,9 +64,13 @@ struct boss_pathaleon_the_calculator : public BossAI }); } + bool _isEnraged; + void Reset() override { _Reset(); + _isEnraged = false; + me->LoadEquipment(EQUIPMENT_NORMAL); if (instance->GetPersistentData(DATA_BRIDGE_MOB_DEATH_COUNT) < 4) { @@ -81,18 +89,23 @@ struct boss_pathaleon_the_calculator : public BossAI ScheduleHealthCheckEvent(20, [&]() { - summons.DespawnAll(); - DoCastSelf(SPELL_DISGRUNTLED_ANGER, true); + DoCastSelf(SPELL_SUICIDE, true); + DoCastSelf(SPELL_FRENZY, true); Talk(SAY_ENRAGE); + _isEnraged = true; + me->LoadEquipment(EQUIPMENT_FRENZY); }); - scheduler.Schedule(30s, [this](TaskContext context) + scheduler.Schedule(20s, 25s, [this](TaskContext context) { - for (uint8 i = 0; i < DUNGEON_MODE(3, 4); ++i) - me->CastSpell(me, SPELL_SUMMON_NETHER_WRAITH_1 + i, true); + if (!_isEnraged) + { + for (uint8 i = 0; i < DUNGEON_MODE(3, 4); ++i) + me->CastSpell(me, SPELL_SUMMON_NETHER_WRAITH_1 + i, true); - Talk(SAY_SUMMON); - context.Repeat(30s, 40s); + Talk(SAY_SUMMON); + } + context.Repeat(45s, 50s); }).Schedule(12s, [this](TaskContext context) { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false))) @@ -106,13 +119,17 @@ struct boss_pathaleon_the_calculator : public BossAI me->ModifyPower(POWER_MANA, 5000); DoCastSelf(SPELL_ARCANE_TORRENT); context.Repeat(15s); - }).Schedule(25s, [this](TaskContext context) + }).Schedule(10s, 15s, [this](TaskContext context) { if (DoCastRandomTarget(SPELL_DOMINATION, 1, 50.0f) == SPELL_CAST_OK) { Talk(SAY_DOMINATION); } - context.Repeat(30s); + context.Repeat(27s, 40s); + }).Schedule(25s, [this](TaskContext context) + { + DoCast(SPELL_DISGRUNTLED_ANGER); + context.Repeat(40s, 90s); }); if (IsHeroic()) From 41ac7e73520a04eff4fe2d3b4b4123ffe6034578 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 30 Mar 2023 21:11:53 +0000 Subject: [PATCH 06/26] chore(DB): import pending files Referenced commit(s): ea047f2cf254803913bbd29eb49c22d1085cc134 --- .../rev_1680109188044403400.sql => db_world/2023_03_30_01.sql} | 1 + .../rev_1680115354717005600.sql => db_world/2023_03_30_02.sql} | 1 + .../rev_1680124416269252400.sql => db_world/2023_03_30_03.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/rev_1680109188044403400.sql => db_world/2023_03_30_01.sql} (65%) rename data/sql/updates/{pending_db_world/rev_1680115354717005600.sql => db_world/2023_03_30_02.sql} (97%) rename data/sql/updates/{pending_db_world/rev_1680124416269252400.sql => db_world/2023_03_30_03.sql} (94%) diff --git a/data/sql/updates/pending_db_world/rev_1680109188044403400.sql b/data/sql/updates/db_world/2023_03_30_01.sql similarity index 65% rename from data/sql/updates/pending_db_world/rev_1680109188044403400.sql rename to data/sql/updates/db_world/2023_03_30_01.sql index dda29fa2d..f82ccd4f9 100644 --- a/data/sql/updates/pending_db_world/rev_1680109188044403400.sql +++ b/data/sql/updates/db_world/2023_03_30_01.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_30_00 -> 2023_03_30_01 -- DELETE FROM `creature_onkill_reputation` WHERE (`creature_id` IN (21466, 21467)); diff --git a/data/sql/updates/pending_db_world/rev_1680115354717005600.sql b/data/sql/updates/db_world/2023_03_30_02.sql similarity index 97% rename from data/sql/updates/pending_db_world/rev_1680115354717005600.sql rename to data/sql/updates/db_world/2023_03_30_02.sql index 5667e894d..3b0fa285e 100644 --- a/data/sql/updates/pending_db_world/rev_1680115354717005600.sql +++ b/data/sql/updates/db_world/2023_03_30_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_30_01 -> 2023_03_30_02 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` = 1922001) AND (`source_type` = 9) AND (`id` IN (3)); 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_1680124416269252400.sql b/data/sql/updates/db_world/2023_03_30_03.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1680124416269252400.sql rename to data/sql/updates/db_world/2023_03_30_03.sql index b9fdb9510..48cec48aa 100644 --- a/data/sql/updates/pending_db_world/rev_1680124416269252400.sql +++ b/data/sql/updates/db_world/2023_03_30_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_30_02 -> 2023_03_30_03 -- DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceEntry` = 35301) AND (`ConditionTypeOrReference` = 31) AND (`ConditionValue2` = 21062); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES From 18c696437e27dd7f1bdf7ccf5b4c43b8a6a4dcde Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 30 Mar 2023 18:35:08 -0300 Subject: [PATCH 07/26] fix(DB/SAI): Rewrite Nether Charge SAI (#15647) Create rev_1680113416988440900.sql --- .../pending_db_world/rev_1680113416988440900.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680113416988440900.sql diff --git a/data/sql/updates/pending_db_world/rev_1680113416988440900.sql b/data/sql/updates/pending_db_world/rev_1680113416988440900.sql new file mode 100644 index 000000000..efda1b0aa --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680113416988440900.sql @@ -0,0 +1,15 @@ +-- +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20405); +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 +(20405, 0, 0, 1, 25, 0, 100, 512, 0, 0, 0, 0, 0, 75, 35150, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - On Reset - Add Aura \'Nether Charge Passive\''), +(20405, 0, 1, 2, 61, 0, 100, 512, 0, 0, 0, 0, 0, 11, 37670, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - On Reset - Cast \'Nether Charge Timer\''), +(20405, 0, 2, 3, 61, 0, 100, 512, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - On Reset - Set Reactstate Passive'), +(20405, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 89, 20, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - On Reset - Start Random Movement'), +(20405, 0, 4, 0, 60, 0, 100, 513, 8500, 8500, 0, 0, 0, 80, 2040500, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - On Update - Run Script (No Repeat)'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2040500); +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 +(2040500, 9, 0, 0, 0, 0, 100, 512, 0, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - Actionlist - Stop Random Movement'), +(2040500, 9, 1, 0, 0, 0, 100, 512, 2000, 2000, 0, 0, 0, 11, 35151, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - Actionlist - Cast \'Nether Charge Pulse\''), +(2040500, 9, 2, 0, 0, 0, 100, 512, 2000, 2000, 0, 0, 0, 11, 35151, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - Actionlist - Cast \'Nether Charge Pulse\''), +(2040500, 9, 3, 0, 0, 0, 100, 512, 2000, 2000, 0, 0, 0, 11, 35151, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Charge - Actionlist - Cast \'Nether Charge Pulse\''); From 1fdf2546ea0c24dc63c0119d88223129ce5c8411 Mon Sep 17 00:00:00 2001 From: Shaitz <56045932+Shaitz@users.noreply.github.com> Date: Thu, 30 Mar 2023 23:35:34 +0200 Subject: [PATCH 08/26] fix(DB/SAI): Shaleskin Flayer should cast Shaleskin out of combat (#15687) * fix(DB/SAI): Shaleskin Flayer should cast Shaleskin out of combat Fixes issue #15010 * Fix duration * Update data/sql/updates/pending_db_world/rev_1680197775441354500.sql --- data/sql/updates/pending_db_world/rev_1680197775441354500.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680197775441354500.sql diff --git a/data/sql/updates/pending_db_world/rev_1680197775441354500.sql b/data/sql/updates/pending_db_world/rev_1680197775441354500.sql new file mode 100644 index 000000000..dfcd857c5 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680197775441354500.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20210); +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 +(20210, 0, 0, 0, 1, 0, 100, 0, 0, 0, 600000, 600000, 0, 11, 36576, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Shaleskin Flayer - Out Of Combat - Cast \'Shaleskin\''); From 5df23db10114a94f580e200544a1267b3a3ee5d0 Mon Sep 17 00:00:00 2001 From: elthehablo <83884799+elthehablo@users.noreply.github.com> Date: Thu, 30 Mar 2023 23:35:52 +0200 Subject: [PATCH 09/26] fix(DB/Loot): Remove Bloodforged Guard and Gold-Trimmed Cuffs from reference loot (#15609) * fix(DB/Loot): removal of BOP quest loot removes two quest items (Gold-Trimmed Cuffs and Bloodforged Guard) from a reference loot table used by a few mobs in Hellfire Peninsula. * Update data/sql/updates/pending_db_world/remove-bop-quest-loot.sql --- data/sql/updates/pending_db_world/remove-bop-quest-loot.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/sql/updates/pending_db_world/remove-bop-quest-loot.sql diff --git a/data/sql/updates/pending_db_world/remove-bop-quest-loot.sql b/data/sql/updates/pending_db_world/remove-bop-quest-loot.sql new file mode 100644 index 000000000..6365c749b --- /dev/null +++ b/data/sql/updates/pending_db_world/remove-bop-quest-loot.sql @@ -0,0 +1 @@ +DELETE FROM reference_loot_template WHERE (`Entry` = 4110) AND (`Item` IN (30520, 30986)); From 944404303ee340ce4050eeec16f327fc1b721798 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 31 Mar 2023 00:36:02 +0300 Subject: [PATCH 10/26] fix(DB/Gameobject): Snap Floating Ivory Bell to ground. (#15596) fix(DB/Gameobject): Floating Ivory Bell. --- data/sql/updates/pending_db_world/rev_1679860646913027800.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1679860646913027800.sql diff --git a/data/sql/updates/pending_db_world/rev_1679860646913027800.sql b/data/sql/updates/pending_db_world/rev_1679860646913027800.sql new file mode 100644 index 000000000..05c8d940f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1679860646913027800.sql @@ -0,0 +1,2 @@ +-- Floating Ivory Bell +UPDATE `gameobject` SET `position_z` = 145.04 WHERE `id` = 184443 AND `guid` = 25285; From ed6040a272fede87ed2eb55d1c87b77c8a92d7f9 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 30 Mar 2023 21:38:41 +0000 Subject: [PATCH 11/26] chore(DB): import pending files Referenced commit(s): 944404303ee340ce4050eeec16f327fc1b721798 --- .../remove-bop-quest-loot.sql => db_world/2023_03_30_04.sql} | 1 + .../rev_1679860646913027800.sql => db_world/2023_03_30_05.sql} | 1 + .../rev_1680113416988440900.sql => db_world/2023_03_30_06.sql} | 1 + .../rev_1680197775441354500.sql => db_world/2023_03_30_07.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/remove-bop-quest-loot.sql => db_world/2023_03_30_04.sql} (67%) rename data/sql/updates/{pending_db_world/rev_1679860646913027800.sql => db_world/2023_03_30_05.sql} (71%) rename data/sql/updates/{pending_db_world/rev_1680113416988440900.sql => db_world/2023_03_30_06.sql} (98%) rename data/sql/updates/{pending_db_world/rev_1680197775441354500.sql => db_world/2023_03_30_07.sql} (94%) diff --git a/data/sql/updates/pending_db_world/remove-bop-quest-loot.sql b/data/sql/updates/db_world/2023_03_30_04.sql similarity index 67% rename from data/sql/updates/pending_db_world/remove-bop-quest-loot.sql rename to data/sql/updates/db_world/2023_03_30_04.sql index 6365c749b..e7f92b744 100644 --- a/data/sql/updates/pending_db_world/remove-bop-quest-loot.sql +++ b/data/sql/updates/db_world/2023_03_30_04.sql @@ -1 +1,2 @@ +-- DB update 2023_03_30_03 -> 2023_03_30_04 DELETE FROM reference_loot_template WHERE (`Entry` = 4110) AND (`Item` IN (30520, 30986)); diff --git a/data/sql/updates/pending_db_world/rev_1679860646913027800.sql b/data/sql/updates/db_world/2023_03_30_05.sql similarity index 71% rename from data/sql/updates/pending_db_world/rev_1679860646913027800.sql rename to data/sql/updates/db_world/2023_03_30_05.sql index 05c8d940f..d1efb0b6f 100644 --- a/data/sql/updates/pending_db_world/rev_1679860646913027800.sql +++ b/data/sql/updates/db_world/2023_03_30_05.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_30_04 -> 2023_03_30_05 -- Floating Ivory Bell UPDATE `gameobject` SET `position_z` = 145.04 WHERE `id` = 184443 AND `guid` = 25285; diff --git a/data/sql/updates/pending_db_world/rev_1680113416988440900.sql b/data/sql/updates/db_world/2023_03_30_06.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1680113416988440900.sql rename to data/sql/updates/db_world/2023_03_30_06.sql index efda1b0aa..d961a0fe3 100644 --- a/data/sql/updates/pending_db_world/rev_1680113416988440900.sql +++ b/data/sql/updates/db_world/2023_03_30_06.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_30_05 -> 2023_03_30_06 -- DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20405); 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_1680197775441354500.sql b/data/sql/updates/db_world/2023_03_30_07.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1680197775441354500.sql rename to data/sql/updates/db_world/2023_03_30_07.sql index dfcd857c5..1f2cf2c89 100644 --- a/data/sql/updates/pending_db_world/rev_1680197775441354500.sql +++ b/data/sql/updates/db_world/2023_03_30_07.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_30_06 -> 2023_03_30_07 -- DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20210); 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 From 651113535a3aa8e5b638529fdb982c6ca6b4ca6f Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 30 Mar 2023 23:52:20 -0300 Subject: [PATCH 12/26] fix(DB/Spell): Correct Effect of all Summon dbc spells (#15652) * Create rev_1680141080010135400.sql * Update rev_1680141080010135400.sql --- .../rev_1680141080010135400.sql | 277 ++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680141080010135400.sql diff --git a/data/sql/updates/pending_db_world/rev_1680141080010135400.sql b/data/sql/updates/pending_db_world/rev_1680141080010135400.sql new file mode 100644 index 000000000..c5658e4ca --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680141080010135400.sql @@ -0,0 +1,277 @@ +-- +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = -1 WHERE `ID` IN ( +14802 -- Idol Room Spawn B +); + +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 0 WHERE `ID` IN ( +12694, -- Idol Room Spawn A +12949, -- Idol Room Spawn End Boss +14801, -- Idol Room Spawn C +19826, -- Summon Blackwing Legionnaire +19827, -- Summon Blackwing Mage +19828, -- Summon Death Talon Dragonspawn +20172, -- Summon Onyxian Whelp +21287, -- Conjure Lokholar the Usurper DND +23118, -- Conjure Scourge Footsoldier DND +23209, -- Terrordale Haunting Spirit #2 +23253, -- Terrordale Haunting Spirit #3 +23361, -- Raise Undead Drakonid +24215, -- Create Heart of Hakkar Explosion +24250, -- Summon Zulian Stalker +24349, -- Summon Bloodlord's Raptor +25151, -- Summon Vekniss Drone +26140, -- Summon Hook Tentacle +26144, -- Summon Eye Tentacle +26145, -- Summon Eye Tentacle +26146, -- Summon Eye Tentacle +26147, -- Summon Eye Tentacle +26148, -- Summon Eye Tentacle +26149, -- Summon Eye Tentacle +26150, -- Summon Eye Tentacle +26151, -- Summon Eye Tentacle +26191, -- Teleport Giant Hook Tentacle +26216, -- Summon Giant Hook Tentacles +26396, -- Summon Portal Ground State +26477, -- Summon Giant Portal Ground State +26564, -- Summon Viscidus Trigger +26617, -- Summon Ouro Mound +26768, -- Summon Giant Eye Tentacles +26837, -- Summon InCombat Trigger +27178, -- Defile +27643, -- Summon Spirit of Jarien +27644, -- Summon Spirit of Sothos +27884, -- Summon Trainee +27921, -- Summon Spectral Trainee +27932, -- Summon Spectral Knight +27939, -- Summon Spectral Rivendare +28008, -- Summon Knight +28010, -- Summon Mounted Knight +28175, -- (DND) Summon Crystal Minion, Ghost +28177, -- (DND) Summon Crystal Minion, Skeleton +28179, -- (DND) Summon Crystal Minion, Ghoul +28217, -- Summon Zombie Chow +28218, -- Summon Fallout Slime +28227, -- (DND) Summon Crystal Minion, finder +28289, -- (DND) Summon Crystal Minion, Ghoul Uncommon +28290, -- (DND) Summon Crystal Minion, Ghost Uncommon +28291, -- (DND) Summon Crystal Minion, Skeleton Uncommon +28421, -- Summon Type A +28422, -- Summon Type B +28423, -- Summon Type C +28454, -- Summon Type D +28561, -- Summon Blizzard +28627, -- Summon Web Wrap +29141, -- Marauding Crust Borer +29218, -- Summon Flame Ring +29329, -- Summon Sapphiron's Wing Buffet +29508, -- Summon Crypt Guard +29869, -- Fished Up Murloc +30083, -- Summon Root Thresher +30445, -- Stillpine Ancestor Yor +30630, -- Debris +30737, -- Summon Heathen +30785, -- Summon Reaver +30786, -- Summon Sharpshooter +30954, -- Free Webbed Creature +30955, -- Free Webbed Creature +30956, -- Free Webbed Creature +30957, -- Free Webbed Creature +30958, -- Free Webbed Creature +30959, -- Free Webbed Creature +30960, -- Free Webbed Creature +30961, -- Free Webbed Creature +30962, -- Free Webbed Creature +30963, -- Free Webbed Creature +31010, -- Free Webbed Creature +31318, -- Summon Infinite Assassin +31321, -- Summon Black Morass Rift Lord +31391, -- Summon Black Morass Chrono Lord Deja +31392, -- Summon Black Morass Temporus +31393, -- Summon Black Morass Rift End Boss +31421, -- Summon Infinite Chronomancer +31528, -- Summon Gnome +31529, -- Summon Gnome +31530, -- Summon Gnome +31544, -- Summon Distiller +31545, -- Summon Distiller +31593, -- Summon Greater Manawraith +32114, -- Summon Wisp +32151, -- Infernal +32283, -- Focus Fire +32360, -- Summon Stolen Soul +32579, -- Portal Beam +32632, -- Summon Overrun Target +33121, -- A Vision of the Forgotten +33229, -- Wrath of the Astromancer +33242, -- Infernal +33363, -- Summon Infinite Executioner +33364, -- Summon Infinite Vanquisher +33367, -- Summon Astromancer Priest +33567, -- Summon Void Portal D +33677, -- Incite Chaos +33680, -- Incite Chaos +33681, -- Incite Chaos +33682, -- Incite Chaos +33683, -- Incite Chaos +33901, -- Summon Crystalhide Crumbler +33927, -- Summon Void Summoner +34064, -- Soul Split +34125, -- Spotlight +34175, -- Arcane Orb Primer +35127, -- Summon Boom Bot Target +35136, -- Summon Captured Critter +35142, -- Drijya Summon Imp +35145, -- Drijya Summon Doomguard +35146, -- Drijya Summon Terrorguard +35256, -- Summon Unstable Mushroom +35430, -- Infernal +35861, -- Summon Nether Vapor +35862, -- Summon Nether Vapor +35863, -- Summon Nether Vapor +35864, -- Summon Nether Vapor +36026, -- Conjure Elemental Soul: Earth +36036, -- Summon Netherstorm Target +36042, -- Summon Farahlon Crumbler +36043, -- Summon Farahlon Crumbler +36044, -- Summon Farahlon Crumbler +36045, -- Summon Farahlon Shardling +36046, -- Summon Farahlon Shardling +36047, -- Summon Farahlon Shardling +36048, -- Summon Motherlode Shardling +36049, -- Summon Motherlode Shardling +36050, -- Summon Motherlode Shardling +36112, -- Conjure Elemental Soul: Fire +36168, -- Conjure Elemental Soul: Water +36180, -- Conjure Elemental Soul: Air +36221, -- Summon Eye of the Citadel +36229, -- Summon Infinite Assassin +36231, -- Summon Infinite Chronomancer +36232, -- Summon Infinite Executioner +36233, -- Summon Infinite Vanquisher +36234, -- Summon Black Morass Rift Lord Alt +36235, -- Summon Black Morass Rift Keeper +36236, -- Summon Black Morass Rift Keeper +36521, -- Summon Arcane Explosion +36579, -- Summon Netherock Crumbler +36584, -- Summon Netherock Crumbler +36585, -- Summon Netherock Crumbler +36595, -- Summon Apex Crumbler +36596, -- Summon Apex Crumbler +36597, -- Summon Apex Crumbler +36724, -- Summon Phoenix Egg +36818, -- Attacking Infernal +36865, -- Summon Gnome Cannon Channel Target (DND) +37177, -- Summon Black Morass Infinite Chrono-Lord +37178, -- Summon Black Morass Infinite Timereaver +37457, -- Windsor Dismisses Horse DND +37606, -- Summon Infinite Assassin +37758, -- Bone Wastes - Summon Auchenai Spirit +37766, -- Summon Murloc A1 +37772, -- Summon Murloc B1 +37773, -- Summon Elemental A1 +37774, -- Summon Elemental B1 +37911, -- Summon Elemental A2 +37912, -- Summon Elemental A3 +37914, -- Summon Elemental B2 +37916, -- Summon Elemental B3 +37923, -- Summon Murloc A2 +37925, -- Summon Murloc A3 +37926, -- Summon Murloc A4 +37927, -- Summon Murloc A5 +37928, -- Summon Murloc B2 +37929, -- Summon Murloc B3 +37931, -- Summon Murloc B4 +37932, -- Summon Murloc B5 +38111, -- Summon Horde Bat Rider Guard +38114, -- Summon Horde Rooftop Alarm Sensor +38118, -- Summon Area 52 Death Machine Guard +38124, -- Summon Horde Ground Alarm Sensor +38137, -- Summon Sky Marker +38179, -- Summon Alliance Ground Alarm Sensor +38180, -- Summon Alliance Rooftop Alarm Sensor +38181, -- Summon Alliance Gryphon Guard +38261, -- Summon Area 52 Rooftop Alarm Sensor +38266, -- Summon Stormspire Ethereal Guard +38268, -- Summon Scryer Dragonhawk Guard +38270, -- Summon Stormspire Rooftop Alarm Sensor +38271, -- Summon Scryer Rooftop Alarm Sensor +38278, -- Summon Aldor Gryphon Guard +38283, -- Summon Aldor Rooftop Alarm Sensor +38286, -- Summon Sporeggar Sporebat Guard +38287, -- Summon Sporeggar Rooftop Alarm Sensor +38288, -- Summon Toshley Guard +38291, -- Summon Toshley Rooftop Alarm Sensor +38402, -- Summon Cenarion Storm Crow Guard +38403, -- Summon Cenarion Expedition Rooftop Alarm Sensor +38512, -- Fiery Boulder +38587, -- Summon Spirit of Redemption +38854, -- Hatch Arakkoa +38865, -- Hatch Bad Arakkoa +39080, -- Summon Mountain Shardling +39081, -- Summon Vortex Shardling +39186, -- Summon Random Tractor +39191, -- Sha'tari Flames +39302, -- Quest - The Exorcism, Summon Foul Purge +39305 -- Summon Flying Skull +); + +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 1 WHERE `ID` IN ( +20734, -- Black Arrow +30792, -- Summon Ravager Ambusher +30825, -- Summon Siltfin Ambusher +30826, -- Summon Wildkin Ambusher +30976, -- Summon Gauntlet Guards +31995, -- Shattered Rumbler +39110 -- Summon Phoenix Adds +); + +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 2 WHERE `ID` IN ( +30076, -- Summon Maexxna Spiderling +30827, -- Summon Bristlelimb Ambusher +36379 -- Call Skitterers +); + +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 3 WHERE `ID` IN ( +26630, -- Spawn Vekniss Hatchlings +26631, -- Spawn Vekniss Hatchlings +26632, -- Spawn Vekniss Hatchlings +30828 -- Summon Sunhawk Ambushers +); + +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 4 WHERE `ID` IN ( +33362 -- Summon Astromancer Adds +); + +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 5 WHERE `ID` IN ( +23119, -- Conjure Peasant DND +23121 -- Conjure Peasant DND +); + +UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = 9 WHERE `ID` IN ( +25789, -- Summon Yauj Brood +29434 -- Summon Maexxna Spiderling +); + +UPDATE `spell_dbc` SET `Effect_2` = 28, `EffectMiscValueB_2` = 64, `EffectBasePoints_2` = 1 WHERE `ID` IN ( +21883 -- Summon Healed Celebrian Vine +); + +UPDATE `spell_dbc` SET `Effect_2` = 28, `EffectMiscValueB_2` = 64, `EffectBasePoints_2` = 0 WHERE `ID` IN ( +23201, -- Hunter Epic Anti-Cheat DND +27939, -- Summon Spectral Rivendare +29110, -- Summon Enraged Mounts +30774, -- Summon Elekk +33614, -- Summon Void Portal B +33616, -- Summon Void Portal E +36616, -- Veneratus Spawn +39074, -- [DND]Rexxars Bird Effect +69868 -- Carrying Beer Barrels [TEST] +); + +UPDATE `spell_dbc` SET `Effect_2` = 28, `EffectMiscValueB_2` = 496, `EffectBasePoints_2` = 0 WHERE `ID` IN ( +74125 -- Summon Creator Spell Test +); + +UPDATE `spell_dbc` SET `Effect_3` = 28, `EffectMiscValueB_3` = 496, `EffectBasePoints_3` = 0 WHERE `ID` IN ( +33615 -- Summon Void Portal C +); From 849e534cb950d6ec6f1f2d9ae9a7444e7c3d4bcb Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 31 Mar 2023 02:54:57 +0000 Subject: [PATCH 13/26] chore(DB): import pending files Referenced commit(s): 651113535a3aa8e5b638529fdb982c6ca6b4ca6f --- .../rev_1680141080010135400.sql => db_world/2023_03_31_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1680141080010135400.sql => db_world/2023_03_31_00.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1680141080010135400.sql b/data/sql/updates/db_world/2023_03_31_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1680141080010135400.sql rename to data/sql/updates/db_world/2023_03_31_00.sql index c5658e4ca..e119e2c98 100644 --- a/data/sql/updates/pending_db_world/rev_1680141080010135400.sql +++ b/data/sql/updates/db_world/2023_03_31_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_30_07 -> 2023_03_31_00 -- UPDATE `spell_dbc` SET `Effect_1` = 28, `EffectMiscValueB_1` = 64, `EffectBasePoints_1` = -1 WHERE `ID` IN ( 14802 -- Idol Room Spawn B From 66acaef60657092f8cf7b5e58d522c6df9e06a6a Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Fri, 31 Mar 2023 01:15:44 -0300 Subject: [PATCH 14/26] fix(Scripts/Arcatraz): Update timers after research (#15726) --- .../arcatraz/boss_dalliah_the_doomsayer.cpp | 12 ++++++------ .../arcatraz/boss_wrath_scryer_soccothrates.cpp | 2 +- .../arcatraz/boss_zereketh_the_unbound.cpp | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp index 9489da3ad..74daf78ad 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp @@ -91,15 +91,15 @@ struct boss_dalliah_the_doomsayer : public BossAI } } - scheduler.Schedule(1s, 4s, [this](TaskContext context) + scheduler.Schedule(8s, 12s, [this](TaskContext context) { DoCastVictim(SPELL_GIFT_OF_THE_DOOMSAYER); - context.Repeat(16s, 21s); - }).Schedule(7s, 9s, [this](TaskContext context) + context.Repeat(17s, 35s); + }).Schedule(20s, 30s, [this](TaskContext context) { Talk(SAY_WHIRLWIND); DoCastAOE(SPELL_WHIRLWIND); - context.Repeat(19s, 21s); + context.Repeat(); scheduler.Schedule(7s, [this](TaskContext) { @@ -110,10 +110,10 @@ struct boss_dalliah_the_doomsayer : public BossAI if (IsHeroic()) { - scheduler.Schedule(11s, 16s, [this](TaskContext context) + scheduler.Schedule(11s, 30s, [this](TaskContext context) { DoCastVictim(SPELL_SHADOW_WAVE); - context.Repeat(11s, 16s); + context.Repeat(); }); } } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index ab3c7bd70..11317d5cf 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -150,7 +150,7 @@ struct boss_wrath_scryer_soccothrates : public BossAI }); context.Repeat(20s, 35s); - }).Schedule(12s, 14s, [this](TaskContext context) + }).Schedule(8500ms, 22s, [this](TaskContext context) { DoCastVictim(SPELL_FELFIRE_SHOCK); context.Repeat(); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 160a641ef..bfccdd779 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -56,22 +56,22 @@ struct boss_zereketh_the_unbound : public BossAI _JustEngagedWith(); Talk(SAY_AGGRO); - scheduler.Schedule(6s, [this](TaskContext context) + scheduler.Schedule(11s, 29s, [this](TaskContext context) { DoCastRandomTarget(SPELL_VOID_ZONE, 0, 60.0f); - context.Repeat(15s); - }).Schedule(10s, [this](TaskContext context) + context.Repeat(); + }).Schedule(12s, 22s, [this](TaskContext context) { DoCastAOE(SPELL_SHADOW_NOVA); if (roll_chance_i(50)) { Talk(SAY_SHADOW_NOVA); } - context.Repeat(12s); - }).Schedule(16s, [this](TaskContext context) + context.Repeat(); + }).Schedule(6s, 12s, [this](TaskContext context) { DoCastRandomTarget(SPELL_SEED_OF_CORRUPTION, 0, 30.0f); - context.Repeat(16s); + context.Repeat(13s, 27s); }); } From 933b3e1fdd209e6a6e546c08ab51c72d1f140d0e Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Fri, 31 Mar 2023 10:43:49 +0200 Subject: [PATCH 15/26] fix(Core/Groups): Implement MSG_RAID_READY_CHECK_FINISHED (#15442) * cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/c8f7dd13b844a25f8932e4dc419d985b4f680793) Co-authored-by: robinsch --- src/server/game/Handlers/GroupHandler.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 69bde972a..195257b2a 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -784,14 +784,15 @@ void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData) void WorldSession::HandleRaidReadyCheckFinishedOpcode(WorldPacket& /*recvData*/) { - //Group* group = GetPlayer()->GetGroup(); - //if (!group) - // return; + Group* group = GetPlayer()->GetGroup(); + if (!group) + return; - //if (!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID())) - // return; + if (!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID())) + return; - // Is any reaction need? + WorldPacket data(MSG_RAID_READY_CHECK_FINISHED); + group->BroadcastPacket(&data, true, -1); } void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacket* data) From 85a8320efe20e4e9a1cb0c14bf85c1056ab00ceb Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Fri, 31 Mar 2023 07:02:32 -0600 Subject: [PATCH 16/26] fix(DB/SAI): Corrections to Death Watcher (#15729) * init * format * end * Update data/sql/updates/pending_db_world/rev_1680250223811678100.sql --------- Co-authored-by: Si1ker --- .../updates/pending_db_world/rev_1680250223811678100.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680250223811678100.sql diff --git a/data/sql/updates/pending_db_world/rev_1680250223811678100.sql b/data/sql/updates/pending_db_world/rev_1680250223811678100.sql new file mode 100644 index 000000000..797ae0a2d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680250223811678100.sql @@ -0,0 +1,7 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` IN (20867, -138927)) AND (`source_type` = 0) AND (`id` IN (3, 4)); +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 +(20867, 0, 3, 4, 6, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36657, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(20867, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 38818, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(-138927, 0, 3, 4, 6, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36657, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(-138927, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 38818, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''); From 606bbde721b5f8856a202d14638a829165f06432 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 31 Mar 2023 13:05:02 +0000 Subject: [PATCH 17/26] chore(DB): import pending files Referenced commit(s): 85a8320efe20e4e9a1cb0c14bf85c1056ab00ceb --- .../rev_1680250223811678100.sql => db_world/2023_03_31_01.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1680250223811678100.sql => db_world/2023_03_31_01.sql} (96%) diff --git a/data/sql/updates/pending_db_world/rev_1680250223811678100.sql b/data/sql/updates/db_world/2023_03_31_01.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1680250223811678100.sql rename to data/sql/updates/db_world/2023_03_31_01.sql index 797ae0a2d..1fc983fa9 100644 --- a/data/sql/updates/pending_db_world/rev_1680250223811678100.sql +++ b/data/sql/updates/db_world/2023_03_31_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_31_00 -> 2023_03_31_01 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` IN (20867, -138927)) AND (`source_type` = 0) AND (`id` IN (3, 4)); 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 From 554f1ab1ff94b61e316d8e24f9b646d208a953fd Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Fri, 31 Mar 2023 19:34:17 +0000 Subject: [PATCH 18/26] fix(DB/Reputation): Make High Admiral "Shelly" Jorrik give reputation all the way through exalted (#15748) * Add files via upload * Update data/sql/updates/pending_db_world/rev_1680289049520216800.sql --- data/sql/updates/pending_db_world/rev_1680289049520216800.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680289049520216800.sql diff --git a/data/sql/updates/pending_db_world/rev_1680289049520216800.sql b/data/sql/updates/pending_db_world/rev_1680289049520216800.sql new file mode 100644 index 000000000..154c06698 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680289049520216800.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_onkill_reputation` SET `MaxStanding1` = 7 WHERE (`creature_id` = 26081); From 1625f5775f0d30472fb8e85237107d883bc95f80 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 31 Mar 2023 16:34:25 -0300 Subject: [PATCH 19/26] fix(DB/SAI): Crashfix (#15747) Create rev_1680287940145588800.sql --- .../updates/pending_db_world/rev_1680287940145588800.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680287940145588800.sql diff --git a/data/sql/updates/pending_db_world/rev_1680287940145588800.sql b/data/sql/updates/pending_db_world/rev_1680287940145588800.sql new file mode 100644 index 000000000..da05d92db --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680287940145588800.sql @@ -0,0 +1,7 @@ +-- +UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 13696; +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 13696) AND (`source_type` = 0); + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 178908) AND (`source_type` = 1) AND (`id` IN (4)); +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 +(178908, 1, 4, 0, 8, 0, 100, 0, 21885, 0, 0, 0, 0, 50, 178904, 90000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Vylestem Vine - On Spellhit \'Heal Vylestem Vine\' - Summon Gameobject \'Vylestem Vine\''); From a4b0f85a46f5b7fcb6751cb7884a0518de302022 Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Fri, 31 Mar 2023 19:34:36 +0000 Subject: [PATCH 20/26] fix (DB/SAI) Negaton Screamer Aura removal on element reset (#15745) * Create Negaton Screamer.sql * Add files via upload * Delete Negaton Screamer.sql * Update data/sql/updates/pending_db_world/rev_1680280460328451900.sql * Update data/sql/updates/pending_db_world/rev_1680280460328451900.sql --- .../updates/pending_db_world/rev_1680280460328451900.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680280460328451900.sql diff --git a/data/sql/updates/pending_db_world/rev_1680280460328451900.sql b/data/sql/updates/pending_db_world/rev_1680280460328451900.sql new file mode 100644 index 000000000..80b52bb18 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680280460328451900.sql @@ -0,0 +1,8 @@ +DELETE FROM `smart_scripts` WHERE (`entryorguid` BETWEEN 2087501 AND 2087506) AND (`source_type` = 9) AND (`id` IN (5)); +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 +(2087501, 9, 5, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 28, 34333, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Negaton Screamer - Actionlist - Remove Aura \'Damage Reduction: Fire\''), +(2087502, 9, 5, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 28, 34334, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Negaton Screamer - Actionlist - Remove Aura \'Damage Reduction: Frost\''), +(2087503, 9, 5, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 28, 34331, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Negaton Screamer - Actionlist - Remove Aura \'Damage Reduction: Arcane\''), +(2087504, 9, 5, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 28, 34335, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Negaton Screamer - Actionlist - Remove Aura \'Damage Reduction: Nature\''), +(2087505, 9, 5, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 28, 34338, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Negaton Screamer - Actionlist - Remove Aura \'Damage Reduction: Shadow\''), +(2087506, 9, 5, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 28, 34336, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Negaton Screamer - Actionlist - Remove Aura \'Damage Reduction: Holy\''); From b7c947e473383c39808ff0513018e12827165590 Mon Sep 17 00:00:00 2001 From: v-mstrs <104088833+v-mstrs@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:34:52 +0300 Subject: [PATCH 21/26] fix(DB/SAI) Stone Keepers now use Self Destruct (#15744) * fix(DB/SAI) Stone Keeper now use Self Destruct Closes #7357 * Update data/sql/updates/pending_db_world/rev_1680277738222003722.sql --- data/sql/updates/pending_db_world/rev_1680277738222003722.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680277738222003722.sql diff --git a/data/sql/updates/pending_db_world/rev_1680277738222003722.sql b/data/sql/updates/pending_db_world/rev_1680277738222003722.sql new file mode 100644 index 000000000..5d14b2ed9 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680277738222003722.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `action_param2` = 2 WHERE `id` = 3 AND `entryorguid` IN (-28368, -27554, -27555, -27794); From 9b196125a7e54ec4443f5a6fbaf3d2ac7fc97d03 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 31 Mar 2023 19:37:38 +0000 Subject: [PATCH 22/26] chore(DB): import pending files Referenced commit(s): b7c947e473383c39808ff0513018e12827165590 --- .../rev_1680277738222003722.sql => db_world/2023_03_31_02.sql} | 1 + .../rev_1680280460328451900.sql => db_world/2023_03_31_03.sql} | 1 + .../rev_1680287940145588800.sql => db_world/2023_03_31_04.sql} | 1 + .../rev_1680289049520216800.sql => db_world/2023_03_31_05.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1680277738222003722.sql => db_world/2023_03_31_02.sql} (73%) rename data/sql/updates/{pending_db_world/rev_1680280460328451900.sql => db_world/2023_03_31_03.sql} (97%) rename data/sql/updates/{pending_db_world/rev_1680287940145588800.sql => db_world/2023_03_31_04.sql} (95%) rename data/sql/updates/{pending_db_world/rev_1680289049520216800.sql => db_world/2023_03_31_05.sql} (67%) diff --git a/data/sql/updates/pending_db_world/rev_1680277738222003722.sql b/data/sql/updates/db_world/2023_03_31_02.sql similarity index 73% rename from data/sql/updates/pending_db_world/rev_1680277738222003722.sql rename to data/sql/updates/db_world/2023_03_31_02.sql index 5d14b2ed9..ff78eedcb 100644 --- a/data/sql/updates/pending_db_world/rev_1680277738222003722.sql +++ b/data/sql/updates/db_world/2023_03_31_02.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_31_01 -> 2023_03_31_02 -- UPDATE `smart_scripts` SET `action_param2` = 2 WHERE `id` = 3 AND `entryorguid` IN (-28368, -27554, -27555, -27794); diff --git a/data/sql/updates/pending_db_world/rev_1680280460328451900.sql b/data/sql/updates/db_world/2023_03_31_03.sql similarity index 97% rename from data/sql/updates/pending_db_world/rev_1680280460328451900.sql rename to data/sql/updates/db_world/2023_03_31_03.sql index 80b52bb18..9d9603234 100644 --- a/data/sql/updates/pending_db_world/rev_1680280460328451900.sql +++ b/data/sql/updates/db_world/2023_03_31_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_31_02 -> 2023_03_31_03 DELETE FROM `smart_scripts` WHERE (`entryorguid` BETWEEN 2087501 AND 2087506) AND (`source_type` = 9) AND (`id` IN (5)); 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 (2087501, 9, 5, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 28, 34333, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Negaton Screamer - Actionlist - Remove Aura \'Damage Reduction: Fire\''), diff --git a/data/sql/updates/pending_db_world/rev_1680287940145588800.sql b/data/sql/updates/db_world/2023_03_31_04.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1680287940145588800.sql rename to data/sql/updates/db_world/2023_03_31_04.sql index da05d92db..ce3efda2a 100644 --- a/data/sql/updates/pending_db_world/rev_1680287940145588800.sql +++ b/data/sql/updates/db_world/2023_03_31_04.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_31_03 -> 2023_03_31_04 -- UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 13696; DELETE FROM `smart_scripts` WHERE (`entryorguid` = 13696) AND (`source_type` = 0); diff --git a/data/sql/updates/pending_db_world/rev_1680289049520216800.sql b/data/sql/updates/db_world/2023_03_31_05.sql similarity index 67% rename from data/sql/updates/pending_db_world/rev_1680289049520216800.sql rename to data/sql/updates/db_world/2023_03_31_05.sql index 154c06698..350f3fe65 100644 --- a/data/sql/updates/pending_db_world/rev_1680289049520216800.sql +++ b/data/sql/updates/db_world/2023_03_31_05.sql @@ -1,2 +1,3 @@ +-- DB update 2023_03_31_04 -> 2023_03_31_05 -- UPDATE `creature_onkill_reputation` SET `MaxStanding1` = 7 WHERE (`creature_id` = 26081); From 10dab22f3411c9b967a330ca64d7a684bf9de0f1 Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Sat, 1 Apr 2023 01:46:20 +0000 Subject: [PATCH 23/26] fix (DB/SAI) Also remove Death Count from non-players (pets) (#15749) * Commit --- .../pending_db_world/rev_1680292857775237100.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680292857775237100.sql diff --git a/data/sql/updates/pending_db_world/rev_1680292857775237100.sql b/data/sql/updates/pending_db_world/rev_1680292857775237100.sql new file mode 100644 index 000000000..60e28fcca --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680292857775237100.sql @@ -0,0 +1,11 @@ +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (20867, -138927) AND `id` IN (3, 4, 5, 6)); +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 +(20867, 0, 3, 4, 6, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36657, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(20867, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 38818, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(20867, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36657, 0, 0, 0, 0, 0, 9, 0, 0, 100, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(20867, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 38818, 0, 0, 0, 0, 0, 9, 0, 0, 100, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), + +(-138927, 0, 3, 4, 6, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36657, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(-138927, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 38818, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(-138927, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36657, 0, 0, 0, 0, 0, 9, 0, 0, 100, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), +(-138927, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 38818, 0, 0, 0, 0, 0, 9, 0, 0, 100, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''); From e4320ea8f8ce8fa3f2f707710c533a0358b12d7c Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:46:42 -0300 Subject: [PATCH 24/26] chore(DB/SAI): Move Arcane Container script to SAI (#15754) Create rev_1680309231242305300.sql --- .../updates/pending_db_world/rev_1680309231242305300.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680309231242305300.sql diff --git a/data/sql/updates/pending_db_world/rev_1680309231242305300.sql b/data/sql/updates/pending_db_world/rev_1680309231242305300.sql new file mode 100644 index 000000000..54e4f2f60 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680309231242305300.sql @@ -0,0 +1,9 @@ +-- +DELETE FROM `event_scripts` WHERE `id` IN (14592, 14593, 14595); + +UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` IN (182196, 182197, 182198); +DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` IN (182196, 182197, 182198)); +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 +(182196, 1, 0, 0, 71, 0, 100, 1, 14592, 0, 0, 0, 0, 12, 22890, 4, 300000, 0, 0, 0, 8, 0, 0, 0, 0, -108.252, -510.302, 21.4761, 2.44346, 'Arcane Container - On Event 14592 Inform - Summon Creature \'First Fragment Guardian\''), +(182197, 1, 0, 0, 71, 0, 100, 1, 14593, 0, 0, 0, 0, 12, 22891, 4, 300000, 0, 0, 0, 8, 0, 0, 0, 0, 13.49, -307.87, -66, 3.12, 'Arcane Container - On Event 14593 Inform - Summon Creature \'Second Fragment Guardian\''), +(182198, 1, 0, 0, 71, 0, 100, 1, 14595, 0, 0, 0, 0, 12, 22892, 4, 300000, 0, 0, 0, 8, 0, 0, 0, 0, 312.72, -19.24, 22.44, 2.12, 'Arcane Container - On Event 14595 Inform - Summon Creature \'Third Fragment Guardian\''); From 97e475ae9fab6c8d16b138221381b20bede0edf9 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Fri, 31 Mar 2023 20:46:58 -0500 Subject: [PATCH 25/26] fix(DB/Loot): Harbinger Skyriss Normal Loot (#15752) * fix(db/loot): Harbinger Skyriss Normal Loot * Update data/sql/updates/pending_db_world/rev_1680298149569301100.sql --- .../sql/updates/pending_db_world/rev_1680298149569301100.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680298149569301100.sql diff --git a/data/sql/updates/pending_db_world/rev_1680298149569301100.sql b/data/sql/updates/pending_db_world/rev_1680298149569301100.sql new file mode 100644 index 000000000..541d27918 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680298149569301100.sql @@ -0,0 +1,5 @@ +-- +-- Harbinger Skyriss Normal Loot +UPDATE `reference_loot_template` SET `GroupId`=3 WHERE `Entry`=25004 AND `Item` IN (28413, 28414, 28415, 28416, 28418, 28419); +DELETE FROM `creature_loot_template` WHERE `Entry`=20912 AND `Item`=25004 AND `Reference`=25004 AND `GroupId`=3; +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES (20912, 25004, 25004, 100, 0, 1, 3, 1, 1, 'Harbinger Skyriss - High Value Table (ReferenceTable)'); From d4e87f2791c7bc321a4f7bfcf062e12c3d529bdb Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 1 Apr 2023 01:49:38 +0000 Subject: [PATCH 26/26] chore(DB): import pending files Referenced commit(s): 97e475ae9fab6c8d16b138221381b20bede0edf9 --- .../rev_1680292857775237100.sql => db_world/2023_04_01_00.sql} | 1 + .../rev_1680298149569301100.sql => db_world/2023_04_01_01.sql} | 1 + .../rev_1680309231242305300.sql => db_world/2023_04_01_02.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/rev_1680292857775237100.sql => db_world/2023_04_01_00.sql} (97%) rename data/sql/updates/{pending_db_world/rev_1680298149569301100.sql => db_world/2023_04_01_01.sql} (92%) rename data/sql/updates/{pending_db_world/rev_1680309231242305300.sql => db_world/2023_04_01_02.sql} (97%) diff --git a/data/sql/updates/pending_db_world/rev_1680292857775237100.sql b/data/sql/updates/db_world/2023_04_01_00.sql similarity index 97% rename from data/sql/updates/pending_db_world/rev_1680292857775237100.sql rename to data/sql/updates/db_world/2023_04_01_00.sql index 60e28fcca..4fa44d69f 100644 --- a/data/sql/updates/pending_db_world/rev_1680292857775237100.sql +++ b/data/sql/updates/db_world/2023_04_01_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_03_31_05 -> 2023_04_01_00 DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (20867, -138927) AND `id` IN (3, 4, 5, 6)); 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 (20867, 0, 3, 4, 6, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36657, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Death Watcher - On Just Died - Remove Aura \'Death Count\''), diff --git a/data/sql/updates/pending_db_world/rev_1680298149569301100.sql b/data/sql/updates/db_world/2023_04_01_01.sql similarity index 92% rename from data/sql/updates/pending_db_world/rev_1680298149569301100.sql rename to data/sql/updates/db_world/2023_04_01_01.sql index 541d27918..8e931e94a 100644 --- a/data/sql/updates/pending_db_world/rev_1680298149569301100.sql +++ b/data/sql/updates/db_world/2023_04_01_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_01_00 -> 2023_04_01_01 -- -- Harbinger Skyriss Normal Loot UPDATE `reference_loot_template` SET `GroupId`=3 WHERE `Entry`=25004 AND `Item` IN (28413, 28414, 28415, 28416, 28418, 28419); diff --git a/data/sql/updates/pending_db_world/rev_1680309231242305300.sql b/data/sql/updates/db_world/2023_04_01_02.sql similarity index 97% rename from data/sql/updates/pending_db_world/rev_1680309231242305300.sql rename to data/sql/updates/db_world/2023_04_01_02.sql index 54e4f2f60..1aedb9055 100644 --- a/data/sql/updates/pending_db_world/rev_1680309231242305300.sql +++ b/data/sql/updates/db_world/2023_04_01_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_01_01 -> 2023_04_01_02 -- DELETE FROM `event_scripts` WHERE `id` IN (14592, 14593, 14595);