From bee5703eb2da27186e04910588b8a7739f56c732 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 18 Apr 2023 20:59:07 -0300 Subject: [PATCH 01/42] fix(DB/Creature): Add Interrupt Immunity to Murmur (#16010) Create rev_1681856955718272600.sql --- data/sql/updates/pending_db_world/rev_1681856955718272600.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681856955718272600.sql diff --git a/data/sql/updates/pending_db_world/rev_1681856955718272600.sql b/data/sql/updates/pending_db_world/rev_1681856955718272600.sql new file mode 100644 index 000000000..cff5a2a38 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681856955718272600.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|33554432 WHERE (`entry` IN (18708, 20657)); + +UPDATE `smart_scripts` SET `event_flags` = 1 WHERE (`entryorguid` = 18634) AND (`source_type` = 0) AND (`id` IN (3, 4)); From c95dc324999323756f5e4b8336597fed69b96c1b Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 00:01:35 +0000 Subject: [PATCH 02/42] chore(DB): import pending files Referenced commit(s): bee5703eb2da27186e04910588b8a7739f56c732 --- .../rev_1681856955718272600.sql => db_world/2023_04_18_03.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1681856955718272600.sql => db_world/2023_04_18_03.sql} (84%) diff --git a/data/sql/updates/pending_db_world/rev_1681856955718272600.sql b/data/sql/updates/db_world/2023_04_18_03.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1681856955718272600.sql rename to data/sql/updates/db_world/2023_04_18_03.sql index cff5a2a38..4d920081b 100644 --- a/data/sql/updates/pending_db_world/rev_1681856955718272600.sql +++ b/data/sql/updates/db_world/2023_04_18_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_18_02 -> 2023_04_18_03 -- UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|33554432 WHERE (`entry` IN (18708, 20657)); From 110897c095d9e1d959bcd4e396798f7c19602f78 Mon Sep 17 00:00:00 2001 From: ZhengPeiRu21 <98835050+ZhengPeiRu21@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:05:10 -0600 Subject: [PATCH 03/42] fix(DB/Loot): Remove skinning loot from several Buzzard type mobs (#15908) --- data/sql/updates/pending_db_world/rev_1681146335796877700.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681146335796877700.sql diff --git a/data/sql/updates/pending_db_world/rev_1681146335796877700.sql b/data/sql/updates/pending_db_world/rev_1681146335796877700.sql new file mode 100644 index 000000000..41093efea --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681146335796877700.sql @@ -0,0 +1,4 @@ +-- +-- Remove skinning loot from Buzzard creatures +UPDATE `creature_template` SET `skinloot` = 0 WHERE `entry` IN (5982, 5983, 5436, 7376); +DELETE FROM `skinning_loot_template` WHERE `Entry` IN (5982, 5983); From 4bb002f69b46be04b41106087c5af42dfce37c8e Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:06:31 -0600 Subject: [PATCH 04/42] fix(Scripts/ShadowLabyrinth): Murmur - Sonic Shock's timer (#16006) init --- .../scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 81b4780cc..a1fab0ef7 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -183,7 +183,7 @@ struct boss_murmur : public BossAI }).Schedule(3650ms, 9150ms, [this](TaskContext context) { DoCastVictim(SPELL_SONIC_SHOCK); - context.Repeat(9150ms, 10s); + context.Repeat(3650ms, 9150ms); }); } From 7b747952c48ea76f0f128f73925cdd9b427c395b Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:06:48 -0500 Subject: [PATCH 05/42] fix(DB/SAI): Enables and Adds SAI for Zem Leeward (348) (#15890) * fix:(db/SAI): Enables and Adds SAI for Zem Leeward (348) * REMOVE phases * Update rev_1681039053601489100.sql --- .../updates/pending_db_world/rev_1681039053601489100.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681039053601489100.sql diff --git a/data/sql/updates/pending_db_world/rev_1681039053601489100.sql b/data/sql/updates/pending_db_world/rev_1681039053601489100.sql new file mode 100644 index 000000000..11a611607 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681039053601489100.sql @@ -0,0 +1,6 @@ +-- +-- Create and Enable SmartAI for creature 348 to enable broadcasts +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=348; +DELETE FROM `smart_scripts` WHERE `entryorguid` = 348; +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 +(348, 0, 0, 0, 1, 0, 100, 0, 20000, 30000, 603000, 603000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Zem Leedward - Out of Combat - Say Line 0'); From 0268ec0cd55c70034898693b06b574f3a8b44b68 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 18 Apr 2023 21:07:04 -0300 Subject: [PATCH 06/42] fix(DB/Loot): Add missing Tailoring Patterns in TBC Normals (#16009) Create rev_1681853904720484500.sql --- .../rev_1681853904720484500.sql | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681853904720484500.sql diff --git a/data/sql/updates/pending_db_world/rev_1681853904720484500.sql b/data/sql/updates/pending_db_world/rev_1681853904720484500.sql new file mode 100644 index 000000000..7aa129f04 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681853904720484500.sql @@ -0,0 +1,25 @@ +DELETE FROM `creature_loot_template` WHERE (`Entry` = 18708) AND (`Item` IN (24309)); +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(18708, 24309, 0, 10, 0, 1, 0, 1, 1, 'Murmur - Pattern: Spellstrike Pants'); + +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 1) AND (`SourceGroup` = 18708) AND (`SourceEntry` = 24309); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(1, 18708, 24309, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Requires Tailoring Skill ID 197, Minimum Skill Value 1'); + +DELETE FROM `creature_loot_template` WHERE (`Entry` = 16807) AND (`Item` IN (24312)); +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(16807, 24312, 0, 10, 0, 1, 0, 1, 1, 'Grand Warlock Nethekurse - Pattern: Spellstrike Hood'); + +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 1) AND (`SourceGroup` = 16807) AND (`SourceEntry` = 24312); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(1, 16807, 24312, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Requires Tailoring Skill ID 197, Minimum Skill Value 1'); + +UPDATE `creature_loot_template` SET `Chance`=10 WHERE `Item`=24313; + +DELETE FROM `creature_loot_template` WHERE (`Entry` = 17978) AND (`Item` IN (24310)); +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(17978, 24310, 0, 10, 0, 1, 0, 1, 1, 'Thorngrin the Tender - Pattern: Battlecast Pants'); + +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 1) AND (`SourceGroup` = 17978) AND (`SourceEntry` = 24310); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(1, 17978, 24310, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Requires Tailoring Skill ID 197, Minimum Skill Value 1'); From 7d4a9a0c60abb2aaaf58fc5c02bf1ddf4421cd8e Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:07:20 +0300 Subject: [PATCH 07/42] fix(DB/Formations): Aggro Strider Clutchmother adds (#15863) fix(DB/creature_formations): Aggro Strider Clutchmother when adds aggro. --- data/sql/updates/pending_db_world/rev_1680858441993201000.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680858441993201000.sql diff --git a/data/sql/updates/pending_db_world/rev_1680858441993201000.sql b/data/sql/updates/pending_db_world/rev_1680858441993201000.sql new file mode 100644 index 000000000..ffe83c115 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680858441993201000.sql @@ -0,0 +1,4 @@ +-- Strider Clutchmother (2172) +UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=36692 AND`memberGUID`=36692; +UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND`memberGUID`=36692; +UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND `memberGUID`=205803; From e3b7523969d6938c09ce9dc6049f9510729fe1a0 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:09:57 +0300 Subject: [PATCH 08/42] fix(DB/Spells): Restore Fiery Payback to have no ICD. (#15981) fix(DB/spell_proc_event): Revert Fiery Payback 1m ICD. --- data/sql/updates/pending_db_world/rev_1681717535425377600.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681717535425377600.sql diff --git a/data/sql/updates/pending_db_world/rev_1681717535425377600.sql b/data/sql/updates/pending_db_world/rev_1681717535425377600.sql new file mode 100644 index 000000000..62ef142e1 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681717535425377600.sql @@ -0,0 +1,2 @@ +-- Revert Fiery Payback 1m ICD. +DELETE FROM `spell_proc_event` WHERE `entry` IN (64349,64350); From 0198efc60a433dbd389385a962d0df668beb5b96 Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Wed, 19 Apr 2023 00:10:30 +0000 Subject: [PATCH 09/42] fix(DB/SAI): Bloodmaul Geomancer does not cast Chilled (#15949) Create rev_1681470069214190500.sql --- .../updates/pending_db_world/rev_1681470069214190500.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681470069214190500.sql diff --git a/data/sql/updates/pending_db_world/rev_1681470069214190500.sql b/data/sql/updates/pending_db_world/rev_1681470069214190500.sql new file mode 100644 index 000000000..7d599b6e5 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681470069214190500.sql @@ -0,0 +1,6 @@ +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 19952) AND (`source_type` = 0); +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 +(19952, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - On Just Died - Say Line 1'), +(19952, 0, 1, 0, 4, 0, 35, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - On Aggro - Say Line 0'), +(19952, 0, 2, 0, 1, 0, 100, 0, 0, 0, 1800000, 1800000, 0, 11, 12544, 33, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - Out of Combat - Keep up \'Frost Armor\''), +(19952, 0, 3, 0, 0, 0, 100, 0, 0, 0, 2400, 3800, 0, 11, 9053, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - In Combat - Cast \'Fireball\''); From b8d837e0e2705df2c7912f8ee1b1d68d88132183 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:11:24 -0600 Subject: [PATCH 10/42] fix(DB/Creature): Update Patchwerk visibilityDistance (#15973) init --- data/sql/updates/pending_db_world/rev_1681665616875077300.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681665616875077300.sql diff --git a/data/sql/updates/pending_db_world/rev_1681665616875077300.sql b/data/sql/updates/pending_db_world/rev_1681665616875077300.sql new file mode 100644 index 000000000..a45c98fdf --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681665616875077300.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_addon` SET `visibilityDistanceType`=3 WHERE `guid`=128135; + From a23c0567e277e8cc79e126202b980007245d7196 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:12:44 +0300 Subject: [PATCH 11/42] fix(DB/Creature): Correct Cyrukh the Firelord immunity mask. (#15968) --- data/sql/updates/pending_db_world/rev_1681592609217864100.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681592609217864100.sql diff --git a/data/sql/updates/pending_db_world/rev_1681592609217864100.sql b/data/sql/updates/pending_db_world/rev_1681592609217864100.sql new file mode 100644 index 000000000..9f7722a4b --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681592609217864100.sql @@ -0,0 +1,2 @@ +-- Cyrukh the Firelord (21181) +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|42090322 WHERE `entry` = 21181; From c5bded11b5733c9b117f48744d0f1b9149862ca4 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:14:03 +0300 Subject: [PATCH 12/42] fix(DB/SAI): Harbinger of the Raven falling instead of flying. (#15947) * fix(DB/SAI): Harbinger of the Raven falling instead of flying. * attack invoker, not closest player --- .../pending_db_world/rev_1681455132745954600.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681455132745954600.sql diff --git a/data/sql/updates/pending_db_world/rev_1681455132745954600.sql b/data/sql/updates/pending_db_world/rev_1681455132745954600.sql new file mode 100644 index 000000000..29875dbef --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681455132745954600.sql @@ -0,0 +1,15 @@ +-- 21767 (Harbinger of the Raven) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21767); +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 +(21767, 0, 0, 1, 54, 0, 100, 512, 0, 0, 0, 0, 0, 1, 0, 7000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Just Summoned - Say Line 0'), +(21767, 0, 1, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Just Summoned - Set Gravity Off'), +(21767, 0, 2, 0, 60, 0, 100, 257, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 3211, 5348.21, 146.53, 5.54, 'Harbinger of the Raven - On Update - Move To Position'), +(21767, 0, 3, 4, 52, 0, 100, 0, 0, 21767, 0, 0, 0, 11, 37446, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Cast Ruuan ok Oracle Transformation'), +(21767, 0, 4, 5, 61, 0, 100, 512, 0, 0, 0, 0, 0, 2, 954, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Set Faction'), +(21767, 0, 5, 6, 61, 0, 100, 512, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Set Reactstate Aggressive'), +(21767, 0, 6, 7, 61, 0, 100, 512, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Attack Start'), +(21767, 0, 7, 8, 61, 0, 100, 512, 0, 0, 0, 0, 0, 210, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Move Fall'), +(21767, 0, 8, 9, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text 0 Over - Set Gravity On'), +(21767, 0, 9, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 3211, 5348.21, 144.53, 5.54, 'Harbinger of the Raven - On Text 0 Over - Set Home Position'), +(21767, 0, 10, 0, 7, 0, 100, 512, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Evade - Despawn Instant'), +(21767, 0, 11, 0, 1, 0, 100, 512, 15000, 15000, 15000, 15000, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - Out of Combat 15s - Despawn Instant'); From 6e2f44411d663f7f2ff6146a920cbdba1f7727a9 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:15:30 +0300 Subject: [PATCH 13/42] fix(DB/SAI): Remove wrong spell from Fiendling Flesh Beast. (#16004) --- data/sql/updates/pending_db_world/rev_1681829644195320500.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681829644195320500.sql diff --git a/data/sql/updates/pending_db_world/rev_1681829644195320500.sql b/data/sql/updates/pending_db_world/rev_1681829644195320500.sql new file mode 100644 index 000000000..ca204fee0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681829644195320500.sql @@ -0,0 +1,3 @@ +-- 20668 (Fiendling Flesh Beast) +UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 20668; +DELETE FROM `smart_scripts` WHERE `entryorguid` = 20668 AND `source_type` = 0; From 5cdca57e3d32f7408e7f3d875551d06215e1347c Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:16:49 +0300 Subject: [PATCH 14/42] fix(DB/Vendor): Remove vendor flag and items from Prospector Ryedol. (#16008) fix(DB/creature_template): Remove vendor gossip and items from Prospector Ryedol. --- data/sql/updates/pending_db_world/rev_1681851219791307300.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681851219791307300.sql diff --git a/data/sql/updates/pending_db_world/rev_1681851219791307300.sql b/data/sql/updates/pending_db_world/rev_1681851219791307300.sql new file mode 100644 index 000000000..7799d382a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681851219791307300.sql @@ -0,0 +1,3 @@ +-- Prospector Ryedol (2910) +DELETE FROM `npc_vendor` WHERE `entry` = 2910; +UPDATE `creature_template` SET `npcflag` = `npcflag`&~(128) WHERE `entry` = 2910; From 3601d6e76a45dee01be63ed4a6327ba33762ad6b Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:18:17 +0300 Subject: [PATCH 15/42] fix(DB/Creature): Remove npc flags from outland First Aid Trainers. (#16005) fix(DB/creature_template): Remove Vendor & Gossip flags from outland First Aid Trainers. --- data/sql/updates/pending_db_world/rev_1681832671178035000.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681832671178035000.sql diff --git a/data/sql/updates/pending_db_world/rev_1681832671178035000.sql b/data/sql/updates/pending_db_world/rev_1681832671178035000.sql new file mode 100644 index 000000000..484a188a0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681832671178035000.sql @@ -0,0 +1,2 @@ +-- Burko (18990), Aresella (18991) - Remove Gossip and Vendor npc flags. +UPDATE `creature_template` SET `npcflag` = `npcflag`&~(128|1) WHERE `entry` IN (18990,18991); From 82b7441c578be92118ded620f7548f16a048b455 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:18:38 -0500 Subject: [PATCH 16/42] fix(DB/Loot): Remove Roughshod Pikes from creature loot (#15916) * fix(DB/loot): Remove Roughshod Pikes from creature loot * ```````````` ````````````` * fix run issue * Update data/sql/updates/pending_db_world/rev_1681209847729403600.sql --- data/sql/updates/pending_db_world/rev_1681209847729403600.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681209847729403600.sql diff --git a/data/sql/updates/pending_db_world/rev_1681209847729403600.sql b/data/sql/updates/pending_db_world/rev_1681209847729403600.sql new file mode 100644 index 000000000..46c226f8f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681209847729403600.sql @@ -0,0 +1,4 @@ +-- +-- Remove Roughshod Pikes from any creature +DELETE FROM `creature_loot_template` WHERE `Item` = 12533; +UPDATE `creature_template` SET `lootid`=0 WHERE `entry`=415; From d99626ebb903c13ca1c94382e40999de70e1b410 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 00:21:10 +0000 Subject: [PATCH 17/42] chore(DB): import pending files Referenced commit(s): 82b7441c578be92118ded620f7548f16a048b455 --- .../rev_1680858441993201000.sql => db_world/2023_04_19_00.sql} | 1 + .../rev_1681039053601489100.sql => db_world/2023_04_19_01.sql} | 1 + .../rev_1681146335796877700.sql => db_world/2023_04_19_02.sql} | 1 + .../rev_1681209847729403600.sql => db_world/2023_04_19_03.sql} | 1 + .../rev_1681455132745954600.sql => db_world/2023_04_19_04.sql} | 1 + .../rev_1681470069214190500.sql => db_world/2023_04_19_05.sql} | 1 + .../rev_1681592609217864100.sql => db_world/2023_04_19_06.sql} | 1 + .../rev_1681665616875077300.sql => db_world/2023_04_19_07.sql} | 1 + .../rev_1681717535425377600.sql => db_world/2023_04_19_08.sql} | 1 + .../rev_1681829644195320500.sql => db_world/2023_04_19_09.sql} | 1 + .../rev_1681832671178035000.sql => db_world/2023_04_19_10.sql} | 1 + .../rev_1681851219791307300.sql => db_world/2023_04_19_11.sql} | 1 + .../rev_1681853904720484500.sql => db_world/2023_04_19_12.sql} | 1 + 13 files changed, 13 insertions(+) rename data/sql/updates/{pending_db_world/rev_1680858441993201000.sql => db_world/2023_04_19_00.sql} (88%) rename data/sql/updates/{pending_db_world/rev_1681039053601489100.sql => db_world/2023_04_19_01.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1681146335796877700.sql => db_world/2023_04_19_02.sql} (82%) rename data/sql/updates/{pending_db_world/rev_1681209847729403600.sql => db_world/2023_04_19_03.sql} (79%) rename data/sql/updates/{pending_db_world/rev_1681455132745954600.sql => db_world/2023_04_19_04.sql} (98%) rename data/sql/updates/{pending_db_world/rev_1681470069214190500.sql => db_world/2023_04_19_05.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1681592609217864100.sql => db_world/2023_04_19_06.sql} (76%) rename data/sql/updates/{pending_db_world/rev_1681665616875077300.sql => db_world/2023_04_19_07.sql} (64%) rename data/sql/updates/{pending_db_world/rev_1681717535425377600.sql => db_world/2023_04_19_08.sql} (68%) rename data/sql/updates/{pending_db_world/rev_1681829644195320500.sql => db_world/2023_04_19_09.sql} (80%) rename data/sql/updates/{pending_db_world/rev_1681832671178035000.sql => db_world/2023_04_19_10.sql} (79%) rename data/sql/updates/{pending_db_world/rev_1681851219791307300.sql => db_world/2023_04_19_11.sql} (78%) rename data/sql/updates/{pending_db_world/rev_1681853904720484500.sql => db_world/2023_04_19_12.sql} (98%) diff --git a/data/sql/updates/pending_db_world/rev_1680858441993201000.sql b/data/sql/updates/db_world/2023_04_19_00.sql similarity index 88% rename from data/sql/updates/pending_db_world/rev_1680858441993201000.sql rename to data/sql/updates/db_world/2023_04_19_00.sql index ffe83c115..b40673649 100644 --- a/data/sql/updates/pending_db_world/rev_1680858441993201000.sql +++ b/data/sql/updates/db_world/2023_04_19_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_18_03 -> 2023_04_19_00 -- Strider Clutchmother (2172) UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=36692 AND`memberGUID`=36692; UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND`memberGUID`=36692; diff --git a/data/sql/updates/pending_db_world/rev_1681039053601489100.sql b/data/sql/updates/db_world/2023_04_19_01.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1681039053601489100.sql rename to data/sql/updates/db_world/2023_04_19_01.sql index 11a611607..c50f18121 100644 --- a/data/sql/updates/pending_db_world/rev_1681039053601489100.sql +++ b/data/sql/updates/db_world/2023_04_19_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_00 -> 2023_04_19_01 -- -- Create and Enable SmartAI for creature 348 to enable broadcasts UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=348; diff --git a/data/sql/updates/pending_db_world/rev_1681146335796877700.sql b/data/sql/updates/db_world/2023_04_19_02.sql similarity index 82% rename from data/sql/updates/pending_db_world/rev_1681146335796877700.sql rename to data/sql/updates/db_world/2023_04_19_02.sql index 41093efea..b765da905 100644 --- a/data/sql/updates/pending_db_world/rev_1681146335796877700.sql +++ b/data/sql/updates/db_world/2023_04_19_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_01 -> 2023_04_19_02 -- -- Remove skinning loot from Buzzard creatures UPDATE `creature_template` SET `skinloot` = 0 WHERE `entry` IN (5982, 5983, 5436, 7376); diff --git a/data/sql/updates/pending_db_world/rev_1681209847729403600.sql b/data/sql/updates/db_world/2023_04_19_03.sql similarity index 79% rename from data/sql/updates/pending_db_world/rev_1681209847729403600.sql rename to data/sql/updates/db_world/2023_04_19_03.sql index 46c226f8f..27e64e031 100644 --- a/data/sql/updates/pending_db_world/rev_1681209847729403600.sql +++ b/data/sql/updates/db_world/2023_04_19_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_02 -> 2023_04_19_03 -- -- Remove Roughshod Pikes from any creature DELETE FROM `creature_loot_template` WHERE `Item` = 12533; diff --git a/data/sql/updates/pending_db_world/rev_1681455132745954600.sql b/data/sql/updates/db_world/2023_04_19_04.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1681455132745954600.sql rename to data/sql/updates/db_world/2023_04_19_04.sql index 29875dbef..46aa13f66 100644 --- a/data/sql/updates/pending_db_world/rev_1681455132745954600.sql +++ b/data/sql/updates/db_world/2023_04_19_04.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_03 -> 2023_04_19_04 -- 21767 (Harbinger of the Raven) DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21767); 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_1681470069214190500.sql b/data/sql/updates/db_world/2023_04_19_05.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1681470069214190500.sql rename to data/sql/updates/db_world/2023_04_19_05.sql index 7d599b6e5..b45d56389 100644 --- a/data/sql/updates/pending_db_world/rev_1681470069214190500.sql +++ b/data/sql/updates/db_world/2023_04_19_05.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_04 -> 2023_04_19_05 DELETE FROM `smart_scripts` WHERE (`entryorguid` = 19952) AND (`source_type` = 0); 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 (19952, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - On Just Died - Say Line 1'), diff --git a/data/sql/updates/pending_db_world/rev_1681592609217864100.sql b/data/sql/updates/db_world/2023_04_19_06.sql similarity index 76% rename from data/sql/updates/pending_db_world/rev_1681592609217864100.sql rename to data/sql/updates/db_world/2023_04_19_06.sql index 9f7722a4b..59db5b50c 100644 --- a/data/sql/updates/pending_db_world/rev_1681592609217864100.sql +++ b/data/sql/updates/db_world/2023_04_19_06.sql @@ -1,2 +1,3 @@ +-- DB update 2023_04_19_05 -> 2023_04_19_06 -- Cyrukh the Firelord (21181) UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|42090322 WHERE `entry` = 21181; diff --git a/data/sql/updates/pending_db_world/rev_1681665616875077300.sql b/data/sql/updates/db_world/2023_04_19_07.sql similarity index 64% rename from data/sql/updates/pending_db_world/rev_1681665616875077300.sql rename to data/sql/updates/db_world/2023_04_19_07.sql index a45c98fdf..b80884f0f 100644 --- a/data/sql/updates/pending_db_world/rev_1681665616875077300.sql +++ b/data/sql/updates/db_world/2023_04_19_07.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_06 -> 2023_04_19_07 -- UPDATE `creature_addon` SET `visibilityDistanceType`=3 WHERE `guid`=128135; diff --git a/data/sql/updates/pending_db_world/rev_1681717535425377600.sql b/data/sql/updates/db_world/2023_04_19_08.sql similarity index 68% rename from data/sql/updates/pending_db_world/rev_1681717535425377600.sql rename to data/sql/updates/db_world/2023_04_19_08.sql index 62ef142e1..a0c3f9bde 100644 --- a/data/sql/updates/pending_db_world/rev_1681717535425377600.sql +++ b/data/sql/updates/db_world/2023_04_19_08.sql @@ -1,2 +1,3 @@ +-- DB update 2023_04_19_07 -> 2023_04_19_08 -- Revert Fiery Payback 1m ICD. DELETE FROM `spell_proc_event` WHERE `entry` IN (64349,64350); diff --git a/data/sql/updates/pending_db_world/rev_1681829644195320500.sql b/data/sql/updates/db_world/2023_04_19_09.sql similarity index 80% rename from data/sql/updates/pending_db_world/rev_1681829644195320500.sql rename to data/sql/updates/db_world/2023_04_19_09.sql index ca204fee0..7d5073447 100644 --- a/data/sql/updates/pending_db_world/rev_1681829644195320500.sql +++ b/data/sql/updates/db_world/2023_04_19_09.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_08 -> 2023_04_19_09 -- 20668 (Fiendling Flesh Beast) UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 20668; DELETE FROM `smart_scripts` WHERE `entryorguid` = 20668 AND `source_type` = 0; diff --git a/data/sql/updates/pending_db_world/rev_1681832671178035000.sql b/data/sql/updates/db_world/2023_04_19_10.sql similarity index 79% rename from data/sql/updates/pending_db_world/rev_1681832671178035000.sql rename to data/sql/updates/db_world/2023_04_19_10.sql index 484a188a0..39d6c88a4 100644 --- a/data/sql/updates/pending_db_world/rev_1681832671178035000.sql +++ b/data/sql/updates/db_world/2023_04_19_10.sql @@ -1,2 +1,3 @@ +-- DB update 2023_04_19_09 -> 2023_04_19_10 -- Burko (18990), Aresella (18991) - Remove Gossip and Vendor npc flags. UPDATE `creature_template` SET `npcflag` = `npcflag`&~(128|1) WHERE `entry` IN (18990,18991); diff --git a/data/sql/updates/pending_db_world/rev_1681851219791307300.sql b/data/sql/updates/db_world/2023_04_19_11.sql similarity index 78% rename from data/sql/updates/pending_db_world/rev_1681851219791307300.sql rename to data/sql/updates/db_world/2023_04_19_11.sql index 7799d382a..fe6e4da1c 100644 --- a/data/sql/updates/pending_db_world/rev_1681851219791307300.sql +++ b/data/sql/updates/db_world/2023_04_19_11.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_10 -> 2023_04_19_11 -- Prospector Ryedol (2910) DELETE FROM `npc_vendor` WHERE `entry` = 2910; UPDATE `creature_template` SET `npcflag` = `npcflag`&~(128) WHERE `entry` = 2910; diff --git a/data/sql/updates/pending_db_world/rev_1681853904720484500.sql b/data/sql/updates/db_world/2023_04_19_12.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1681853904720484500.sql rename to data/sql/updates/db_world/2023_04_19_12.sql index 7aa129f04..8074b8732 100644 --- a/data/sql/updates/pending_db_world/rev_1681853904720484500.sql +++ b/data/sql/updates/db_world/2023_04_19_12.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_11 -> 2023_04_19_12 DELETE FROM `creature_loot_template` WHERE (`Entry` = 18708) AND (`Item` IN (24309)); INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES (18708, 24309, 0, 10, 0, 1, 0, 1, 1, 'Murmur - Pattern: Spellstrike Pants'); From 66b37dd51042804e3416cdcaf4944e94d7f5db87 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:23:49 +0300 Subject: [PATCH 18/42] fix(DB/SAI): Correct Slaag, Maggoc and Grulloc. (#16002) --- .../rev_1681812895352552200.sql | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681812895352552200.sql diff --git a/data/sql/updates/pending_db_world/rev_1681812895352552200.sql b/data/sql/updates/pending_db_world/rev_1681812895352552200.sql new file mode 100644 index 000000000..3f129b873 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681812895352552200.sql @@ -0,0 +1,40 @@ +-- 22199 (Slaag) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 22199); +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 +(22199, 0, 0, 1, 0, 0, 100, 0, 20000, 30000, 20000, 30000, 0, 11, 33958, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - In Combat - Cast \'Enrage\''), +(22199, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - In Combat - Say Line 0'), +(22199, 0, 2, 0, 0, 0, 100, 0, 27000, 32000, 27000, 32000, 0, 11, 21909, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - In Combat - Cast \'Dust Field\''), +(22199, 0, 3, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 39898, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - On Just Died - Cast \'Slaag: Summon Slaag`s Standard Chest\''); + +-- 20600 (Maggoc) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20600); +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 +(20600, 0, 0, 0, 0, 0, 100, 0, 3000, 6000, 8000, 12000, 0, 11, 38770, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - In Combat - Cast \'Mortal Wound\''), +(20600, 0, 1, 0, 0, 0, 100, 0, 3000, 6000, 5000, 10000, 0, 11, 38777, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - In Combat - Cast \'Rock Rumble\''), +(20600, 0, 2, 0, 0, 0, 100, 0, 4000, 7000, 5000, 10000, 0, 11, 42139, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - In Combat - Cast \'Boulder\''), +(20600, 0, 3, 4, 2, 0, 100, 0, 0, 30, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - Between 0-30% Health - Say Line 0'), +(20600, 0, 4, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 11, 40743, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - Between 0-30% Health - Cast \'Frenzy\''), +(20600, 0, 5, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 39891, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - On Just Died - Cast \'Maggoc: Summon Maggoc`s Treasure Chest\''); + +-- 20216 (Grulloc) +DELETE FROM `creature_text` WHERE `CreatureID`=20216; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(20216, 0, 0, '%s grows massively powerful!', 16, 0, 100, 0, 0, 0, 20101, 0, 'Grulloc'), +(20216, 1, 0, 'Grulloc having lots of fun!', 14, 0, 100, 0, 0, 0, 19841, 0, 'Grulloc'), +(20216, 2, 0, 'Me hungry!', 14, 0, 100, 0, 0, 0, 19842, 0, 'Grulloc'), +(20216, 3, 0, 'Me keep piggy as pet!', 14, 0, 100, 0, 0, 0, 20259, 0, 'Grulloc'), +(20216, 4, 0, 'Me like soft bacon!', 14, 0, 100, 0, 0, 0, 20258, 0, 'Grulloc'), +(20216, 5, 0, 'Mmm, other white meat!', 14, 0, 100, 0, 0, 0, 19844, 0, 'Grulloc'), +(20216, 6, 0, 'Piggy stop!', 14, 0, 100, 0, 0, 0, 19845, 0, 'Grulloc'), +(20216, 7, 0, 'Porkchops!', 14, 0, 100, 0, 0, 0, 19857, 0, 'Grulloc'), +(20216, 8, 0, 'Where piggy go?!', 14, 0, 100, 0, 0, 0, 19846, 0, 'Grulloc'), +(20216, 9, 0, 'You be Grulloc\'s friend!', 14, 0, 100, 0, 0, 0, 19843, 0, 'Grulloc'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20216); +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 +(20216, 0, 0, 1, 0, 0, 100, 0, 10000, 20000, 18000, 28000, 0, 11, 38771, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Cast \'Burning Rage\''), +(20216, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Say Line 0'), +(20216, 0, 2, 0, 0, 0, 100, 0, 5000, 9000, 12000, 17000, 0, 11, 21055, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Cast \'Crush Armor\''), +(20216, 0, 3, 0, 0, 0, 100, 0, 6000, 17000, 5000, 10000, 0, 11, 38772, 32, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Cast \'Grievous Wound\''), +(20216, 0, 4, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 39890, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - On Just Died - Cast \'Grulloc: Summon Grulloc`s Dragon Skull Chest\''), +(20216, 0, 5, 0, 8, 0, 100, 0, 38360, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - On Spellhit \'Huffer Threatens Grulloc\' - Start Attacking'); From 167b078d31e4ac85785199812b11e2447fac0535 Mon Sep 17 00:00:00 2001 From: v-mstrs <104088833+v-mstrs@users.noreply.github.com> Date: Wed, 19 Apr 2023 02:24:07 +0200 Subject: [PATCH 19/42] fix(DB/SAI) Curtains Call is now only casted on death. (#15969) * fix(DB/SAI) Curtains Call is now only casted on death. * Update data/sql/updates/pending_db_world/rev_1681594798691444614.sql --- data/sql/updates/pending_db_world/rev_1681594798691444614.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681594798691444614.sql diff --git a/data/sql/updates/pending_db_world/rev_1681594798691444614.sql b/data/sql/updates/pending_db_world/rev_1681594798691444614.sql new file mode 100644 index 000000000..3aa7ac23f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681594798691444614.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 16473) AND (`source_type` = 0) 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 +(16473, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 11, 29680, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Performer - On Death - Cast Curtain Call'); From 764622fb30bcb79e538e2d40e13ec17c77e45741 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:24:34 -0500 Subject: [PATCH 20/42] fix:(DB/Creature): Correct respawn timer for Corporal Keeshan (#15891) * fix:(db/SAI): Enables and Adds SAI for Zem Leeward (348) * fix(DB/creature): Correct Corporal Keeshan respawn timer * Delete rev_1681039053601489100.sql from other PR * Update data/sql/updates/pending_db_world/rev_1681039353004394600.sql --- data/sql/updates/pending_db_world/rev_1681039353004394600.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681039353004394600.sql diff --git a/data/sql/updates/pending_db_world/rev_1681039353004394600.sql b/data/sql/updates/pending_db_world/rev_1681039353004394600.sql new file mode 100644 index 000000000..fbc88f11e --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681039353004394600.sql @@ -0,0 +1,3 @@ +-- +-- Quicker Respawn Timer on Corporal Keeshan +UPDATE `creature` SET `spawntimesecs`=120 WHERE `guid`=17874 AND `id1`=349; From 3f8623d2fc0f7c250da2d248273239ea987f67c2 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 00:27:17 +0000 Subject: [PATCH 21/42] chore(DB): import pending files Referenced commit(s): 764622fb30bcb79e538e2d40e13ec17c77e45741 --- .../rev_1681039353004394600.sql => db_world/2023_04_19_13.sql} | 1 + .../rev_1681594798691444614.sql => db_world/2023_04_19_14.sql} | 1 + .../rev_1681812895352552200.sql => db_world/2023_04_19_15.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/rev_1681039353004394600.sql => db_world/2023_04_19_13.sql} (73%) rename data/sql/updates/{pending_db_world/rev_1681594798691444614.sql => db_world/2023_04_19_14.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1681812895352552200.sql => db_world/2023_04_19_15.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1681039353004394600.sql b/data/sql/updates/db_world/2023_04_19_13.sql similarity index 73% rename from data/sql/updates/pending_db_world/rev_1681039353004394600.sql rename to data/sql/updates/db_world/2023_04_19_13.sql index fbc88f11e..838911805 100644 --- a/data/sql/updates/pending_db_world/rev_1681039353004394600.sql +++ b/data/sql/updates/db_world/2023_04_19_13.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_12 -> 2023_04_19_13 -- -- Quicker Respawn Timer on Corporal Keeshan UPDATE `creature` SET `spawntimesecs`=120 WHERE `guid`=17874 AND `id1`=349; diff --git a/data/sql/updates/pending_db_world/rev_1681594798691444614.sql b/data/sql/updates/db_world/2023_04_19_14.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1681594798691444614.sql rename to data/sql/updates/db_world/2023_04_19_14.sql index 3aa7ac23f..71292ac99 100644 --- a/data/sql/updates/pending_db_world/rev_1681594798691444614.sql +++ b/data/sql/updates/db_world/2023_04_19_14.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_13 -> 2023_04_19_14 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` = 16473) AND (`source_type` = 0) 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_1681812895352552200.sql b/data/sql/updates/db_world/2023_04_19_15.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1681812895352552200.sql rename to data/sql/updates/db_world/2023_04_19_15.sql index 3f129b873..41c31a364 100644 --- a/data/sql/updates/pending_db_world/rev_1681812895352552200.sql +++ b/data/sql/updates/db_world/2023_04_19_15.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_14 -> 2023_04_19_15 -- 22199 (Slaag) DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 22199); 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 461147efe9c66bf22b1662213dd3b2703a9e4524 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:30:51 +0300 Subject: [PATCH 22/42] fix(DB/Scripts): Infernal Oversoul spawn position. (#15983) --- data/sql/updates/pending_db_world/rev_1681730931684054700.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681730931684054700.sql diff --git a/data/sql/updates/pending_db_world/rev_1681730931684054700.sql b/data/sql/updates/pending_db_world/rev_1681730931684054700.sql new file mode 100644 index 000000000..6be1d5738 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681730931684054700.sql @@ -0,0 +1,2 @@ +-- 21735 (Infernal Oversoul) +UPDATE `event_scripts` SET `x` = -3368.91, `y` = 2145.37, `z` = -8.39026, `o` = 4.4855 WHERE `id` = 13980 AND `datalong` = 21735; From 3dc96990688804a88b65f98c72cba9f2a0cea017 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:31:06 -0600 Subject: [PATCH 23/42] fix(DB/SAI): Fel Overseer - Frightening Shout (#15995) init --- data/sql/updates/pending_db_world/rev_1681793005385047200.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681793005385047200.sql diff --git a/data/sql/updates/pending_db_world/rev_1681793005385047200.sql b/data/sql/updates/pending_db_world/rev_1681793005385047200.sql new file mode 100644 index 000000000..117ead7f7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681793005385047200.sql @@ -0,0 +1,3 @@ +-- +UPDATE `smart_scripts` SET `event_flags`=0, `event_param1`=8000, `event_param2`=12000, `event_param3`=28000, `event_param4`=32000, `target_type`=6, `comment`='Fel Overseer - In Combat - Cast \'Frightening Shout\'' WHERE `entryorguid`=18796 AND `source_type`=0 AND `id`=3 AND `link`=0; + From 7c157f6f06ecb6ea0c944462f35adfbfae6a4fb4 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:32:38 +0300 Subject: [PATCH 24/42] fix(DB/Conditions): Allow gossip with Ethereal Teleport Pad after quest 10270. (#15991) --- .../sql/updates/pending_db_world/rev_1681758967243313800.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681758967243313800.sql diff --git a/data/sql/updates/pending_db_world/rev_1681758967243313800.sql b/data/sql/updates/pending_db_world/rev_1681758967243313800.sql new file mode 100644 index 000000000..212fe261e --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681758967243313800.sql @@ -0,0 +1,5 @@ +-- 184073 (Ethereal Teleport Pad) +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 8062; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 8062, 0, 0, 0, 29, 1, 20518, 10, 0, 1, 0, 0, '', '(AND) Ethereal Teleport Pad - Show Gossip option 0 only if no Image of Wind Trader Marid is within 10y.'), +(15, 8062, 0, 0, 0, 47, 0, 10270, 66, 0, 0, 0, 0, '', '(AND) Ethereal Teleport Pad - Show Gossip option 0 only if quest A Not-So-Modest Proposal has been completed or rewarded.'); From 5f31949525cb2359f9e7b48fd729749d8799edf0 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 00:35:23 +0000 Subject: [PATCH 25/42] chore(DB): import pending files Referenced commit(s): 7c157f6f06ecb6ea0c944462f35adfbfae6a4fb4 --- .../rev_1681730931684054700.sql => db_world/2023_04_19_16.sql} | 1 + .../rev_1681758967243313800.sql => db_world/2023_04_19_17.sql} | 1 + .../rev_1681793005385047200.sql => db_world/2023_04_19_18.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/rev_1681730931684054700.sql => db_world/2023_04_19_16.sql} (78%) rename data/sql/updates/{pending_db_world/rev_1681758967243313800.sql => db_world/2023_04_19_17.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1681793005385047200.sql => db_world/2023_04_19_18.sql} (86%) diff --git a/data/sql/updates/pending_db_world/rev_1681730931684054700.sql b/data/sql/updates/db_world/2023_04_19_16.sql similarity index 78% rename from data/sql/updates/pending_db_world/rev_1681730931684054700.sql rename to data/sql/updates/db_world/2023_04_19_16.sql index 6be1d5738..d84acf4f9 100644 --- a/data/sql/updates/pending_db_world/rev_1681730931684054700.sql +++ b/data/sql/updates/db_world/2023_04_19_16.sql @@ -1,2 +1,3 @@ +-- DB update 2023_04_19_15 -> 2023_04_19_16 -- 21735 (Infernal Oversoul) UPDATE `event_scripts` SET `x` = -3368.91, `y` = 2145.37, `z` = -8.39026, `o` = 4.4855 WHERE `id` = 13980 AND `datalong` = 21735; diff --git a/data/sql/updates/pending_db_world/rev_1681758967243313800.sql b/data/sql/updates/db_world/2023_04_19_17.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1681758967243313800.sql rename to data/sql/updates/db_world/2023_04_19_17.sql index 212fe261e..706de6315 100644 --- a/data/sql/updates/pending_db_world/rev_1681758967243313800.sql +++ b/data/sql/updates/db_world/2023_04_19_17.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_16 -> 2023_04_19_17 -- 184073 (Ethereal Teleport Pad) DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 8062; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1681793005385047200.sql b/data/sql/updates/db_world/2023_04_19_18.sql similarity index 86% rename from data/sql/updates/pending_db_world/rev_1681793005385047200.sql rename to data/sql/updates/db_world/2023_04_19_18.sql index 117ead7f7..66954c131 100644 --- a/data/sql/updates/pending_db_world/rev_1681793005385047200.sql +++ b/data/sql/updates/db_world/2023_04_19_18.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_17 -> 2023_04_19_18 -- UPDATE `smart_scripts` SET `event_flags`=0, `event_param1`=8000, `event_param2`=12000, `event_param3`=28000, `event_param4`=32000, `target_type`=6, `comment`='Fel Overseer - In Combat - Cast \'Frightening Shout\'' WHERE `entryorguid`=18796 AND `source_type`=0 AND `id`=3 AND `link`=0; From cfe9ce719a3ad1d07aff91ef25731912f6f61761 Mon Sep 17 00:00:00 2001 From: cTrinity <58204838+cTrinity@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:02:15 +0800 Subject: [PATCH 26/42] fix(DB/String): Update the zhCN value of id 586 (#15943) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Length: Should be translated "全程 / 长度". --- data/sql/updates/pending_db_world/2023_04_14_01.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/2023_04_14_01.sql diff --git a/data/sql/updates/pending_db_world/2023_04_14_01.sql b/data/sql/updates/pending_db_world/2023_04_14_01.sql new file mode 100644 index 000000000..7797e010e --- /dev/null +++ b/data/sql/updates/pending_db_world/2023_04_14_01.sql @@ -0,0 +1,2 @@ +-- translation error +UPDATE `acore_string` SET `locale_zhCN` = '事件 %u: %s%s\n开始时间: %s 结束时间: %s 发生: %s 全程（长度）: %s\n下一次状态改变: %s' WHERE `entry` = 586; From e1cdcd84d7707a8c586852aab686139fa70c195c Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 01:04:52 +0000 Subject: [PATCH 27/42] chore(DB): import pending files Referenced commit(s): cfe9ce719a3ad1d07aff91ef25731912f6f61761 --- .../2023_04_14_01.sql => db_world/2023_04_19_19.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/2023_04_14_01.sql => db_world/2023_04_19_19.sql} (81%) diff --git a/data/sql/updates/pending_db_world/2023_04_14_01.sql b/data/sql/updates/db_world/2023_04_19_19.sql similarity index 81% rename from data/sql/updates/pending_db_world/2023_04_14_01.sql rename to data/sql/updates/db_world/2023_04_19_19.sql index 7797e010e..8d126953e 100644 --- a/data/sql/updates/pending_db_world/2023_04_14_01.sql +++ b/data/sql/updates/db_world/2023_04_19_19.sql @@ -1,2 +1,3 @@ +-- DB update 2023_04_19_18 -> 2023_04_19_19 -- translation error UPDATE `acore_string` SET `locale_zhCN` = '事件 %u: %s%s\n开始时间: %s 结束时间: %s 发生: %s 全程（长度）: %s\n下一次状态改变: %s' WHERE `entry` = 586; From 54854cb2744b77d847024e3258eb59a6d80cdbda Mon Sep 17 00:00:00 2001 From: cTrinity <58204838+cTrinity@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:29:03 +0800 Subject: [PATCH 28/42] fix(DB/Creature): Update En'kilah Hatchling Faction (#15921) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(DB/Creature): Update En'kilah Hatchling Flags update En'kilah Hatchling(id = 25388,25390) unit_flags add 256 (Unable to fight or communicate with players) * Update and rename data/sql/updates/db_world/2023_04_10_01.sql to 数据/.sql/更新/db_world/2023_04_10_01.sql update faction * fix(DB/Creature): Update En'kilah Hatchling Flags update En'kilah Hatchling(id = 25388,25389,25390) faction to 634 * Path error Path error --- data/sql/updates/pending_db_world/2023_04_10_01.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/2023_04_10_01.sql diff --git a/data/sql/updates/pending_db_world/2023_04_10_01.sql b/data/sql/updates/pending_db_world/2023_04_10_01.sql new file mode 100644 index 000000000..8172f81e1 --- /dev/null +++ b/data/sql/updates/pending_db_world/2023_04_10_01.sql @@ -0,0 +1,2 @@ +-- DB update En'kilah Hatchling faction (Unable to fight or communicate with players) +UPDATE `creature_template` SET `faction` = 634 WHERE `entry` IN (25388, 25389, 25390); From 7d85e9e6ae2a7f1a58d570c40909343e8b9e4176 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 01:31:37 +0000 Subject: [PATCH 29/42] chore(DB): import pending files Referenced commit(s): 54854cb2744b77d847024e3258eb59a6d80cdbda --- .../2023_04_10_01.sql => db_world/2023_04_19_20.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/2023_04_10_01.sql => db_world/2023_04_19_20.sql} (79%) diff --git a/data/sql/updates/pending_db_world/2023_04_10_01.sql b/data/sql/updates/db_world/2023_04_19_20.sql similarity index 79% rename from data/sql/updates/pending_db_world/2023_04_10_01.sql rename to data/sql/updates/db_world/2023_04_19_20.sql index 8172f81e1..d6256f592 100644 --- a/data/sql/updates/pending_db_world/2023_04_10_01.sql +++ b/data/sql/updates/db_world/2023_04_19_20.sql @@ -1,2 +1,3 @@ +-- DB update 2023_04_19_19 -> 2023_04_19_20 -- DB update En'kilah Hatchling faction (Unable to fight or communicate with players) UPDATE `creature_template` SET `faction` = 634 WHERE `entry` IN (25388, 25389, 25390); From 20885578d889ff59100e3202f3c3a752039a9daf Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 04:33:11 +0300 Subject: [PATCH 30/42] fix(DB/Spell): Fel Reaver Sentinel spells not having CD. (#15982) --- .../updates/pending_db_world/rev_1681729297995153300.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681729297995153300.sql diff --git a/data/sql/updates/pending_db_world/rev_1681729297995153300.sql b/data/sql/updates/pending_db_world/rev_1681729297995153300.sql new file mode 100644 index 000000000..038e205de --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681729297995153300.sql @@ -0,0 +1,7 @@ +-- Fel Reaver Sentinel +DELETE FROM `spell_cooldown_overrides` WHERE `Id` IN (38055,38006,38052,37920); +INSERT INTO `spell_cooldown_overrides` (`Id`, `RecoveryTime`, `CategoryRecoveryTime`, `StartRecoveryTime`, `StartRecoveryCategory`) VALUES +(38055, 10000, 10000, 0, 0), +(38006, 10000, 10000, 0, 0), +(38052, 15000, 15000, 0, 0), +(37920, 30000, 30000, 0, 0); From 0eb3dc02051a8970aac52a3ecfe5155d2ff84cda Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 01:36:10 +0000 Subject: [PATCH 31/42] chore(DB): import pending files Referenced commit(s): 20885578d889ff59100e3202f3c3a752039a9daf --- .../rev_1681729297995153300.sql => db_world/2023_04_19_21.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1681729297995153300.sql => db_world/2023_04_19_21.sql} (89%) diff --git a/data/sql/updates/pending_db_world/rev_1681729297995153300.sql b/data/sql/updates/db_world/2023_04_19_21.sql similarity index 89% rename from data/sql/updates/pending_db_world/rev_1681729297995153300.sql rename to data/sql/updates/db_world/2023_04_19_21.sql index 038e205de..864454c0b 100644 --- a/data/sql/updates/pending_db_world/rev_1681729297995153300.sql +++ b/data/sql/updates/db_world/2023_04_19_21.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_20 -> 2023_04_19_21 -- Fel Reaver Sentinel DELETE FROM `spell_cooldown_overrides` WHERE `Id` IN (38055,38006,38052,37920); INSERT INTO `spell_cooldown_overrides` (`Id`, `RecoveryTime`, `CategoryRecoveryTime`, `StartRecoveryTime`, `StartRecoveryCategory`) VALUES From a1d3b25e96cfb7f05bab4620495ee406585b4cdd Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:50:33 -0600 Subject: [PATCH 32/42] fix(DB/ShadowLabyrinth): Apply 'Incite Chaos' as debuff (#15997) * init * pew --- data/sql/updates/pending_db_world/rev_1681793209169080500.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681793209169080500.sql diff --git a/data/sql/updates/pending_db_world/rev_1681793209169080500.sql b/data/sql/updates/pending_db_world/rev_1681793209169080500.sql new file mode 100644 index 000000000..a8dca33af --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681793209169080500.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `spell_custom_attr` WHERE `spell_id`=33684; +INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES (33684,4096); + From 88dcf4c300779f56ce3707462a8f49a2c5dc5abf Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 04:50:56 +0300 Subject: [PATCH 33/42] fix(DB/SAI): Port Quest: 'By Any Means Necessary' from Trinity (#15822) * fix(DB/SAI): Port Quest: 'By Any Means Necessary' from Trinity. Co-Authored-By: Carlos Morales * add root and evade * remove double gossip if 9978 complete * update --------- Co-authored-by: Carlos Morales --- .../rev_1680633363215025800.sql | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1680633363215025800.sql diff --git a/data/sql/updates/pending_db_world/rev_1680633363215025800.sql b/data/sql/updates/pending_db_world/rev_1680633363215025800.sql new file mode 100644 index 000000000..7d7cbb2a0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680633363215025800.sql @@ -0,0 +1,65 @@ +-- Quest: By Any Means Necessary 9978 +UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=9978; + +-- Empoor +DELETE FROM `gossip_menu` WHERE `MenuID` = 7704 AND `TextID` = 9406; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES +(7704, 9406); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=7704; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14, 7704, 9406, 0, 0, 28, 0, 9978, 0, 0, 0, 0, 0, '', 'Show gossip text 9406 if quest \'By Any Means Necessary\' is complete.'), +(14, 7704, 9425, 0, 0, 8, 0, 9978, 0, 0, 0, 0, 0, '', 'Show gossip text 9425 if quest \'By Any Means Necessary\' has been rewarded.'), +(15, 7704, 0, 0, 0, 47, 0, 9978, 8, 0, 0, 0, 0, '', 'Show gossip option 0 if quest 9978 is incomplete.'), +(15, 7704, 1, 0, 0, 47, 0, 9978, 66, 0, 0, 0, 0, '', '(AND) Show gossip option 1 if quest \'By Any Means Necessary\' is complete or rewarded.'), +(15, 7704, 1, 0, 0, 14, 0, 9979, 0, 0, 0, 0, 0, '', '(AND) Show gossip option 1 if quest \'Wind Trader Lathrai\' is not taken.'); + +DELETE FROM `smart_scripts` WHERE `entryorguid` = 18482 AND `source_type` = 0; +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 +(18482, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 83, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Respawn - Remove Npc Flag Questgiver'), +(18482, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Respawn - Set Invincibility at 1 HP'), +(18482, 0, 2, 4, 62, 0, 100, 0, 7704, 0, 0, 0, 0, 80, 1848200, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Gossip Option 0 Selected - Run Script'), +(18482, 0, 3, 4, 62, 0, 100, 0, 7704, 1, 0, 0, 0, 80, 1848200, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Gossip Option 1 Selected - Run Script'), +(18482, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 78, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Gossip Option Selected - Reset All Scripts'), +(18482, 0, 5, 0, 2, 0, 100, 1, 0, 1, 0, 0, 0, 80, 1848201, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - Between 0-1% Health - Run Script (No Repeat)'), +(18482, 0, 6, 0, 0, 0, 100, 0, 3000, 5000, 9000, 12000, 0, 11, 12548, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - In Combat - Cast \'Frost Shock\''), +(18482, 0, 7, 0, 23, 0, 100, 0, 12550, 0, 1000, 2000, 0, 11, 12550, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Has No Aura \'Lightning Shield\' - Cast \'Lightning Shield\''), +(18482, 0, 8, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1848202, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Reset - Run Script'); + +DELETE FROM `smart_scripts` WHERE `entryorguid` = 1848200 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 +(1848200, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 1679, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Faction 1679'), +(1848200, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 18483, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Data 1 to Empoor\'s Bodyguard'), +(1848200, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Say Line 0'), +(1848200, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Start Attacking'), +(1848200, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Disable'); + +DELETE FROM `smart_scripts` WHERE `entryorguid` = 1848201 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 +(1848201, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Faction 35'), +(1848201, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Evade'), +(1848201, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Enable'), +(1848201, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 18483, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Data 2 to Empoor\'s Bodyguard'), +(1848201, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 15, 9978, 0, 0, 0, 0, 0, 18, 50, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Complete Quest \'By Any Means Necessary\''), +(1848201, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 82, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Add Npc Flag Questgiver'), +(1848201, 9, 6, 0, 0, 0, 100, 0, 120000, 120000, 0, 0, 0, 83, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Remove Npc Flag Questgiver'), +(1848201, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Disable'), +(1848201, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Say Line 1'); + +DELETE FROM `smart_scripts` WHERE `entryorguid` = 1848202 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 +(1848202, 9, 0, 0, 0, 0, 100, 0, 20000, 20000, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Faction 35'), +(1848202, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Disable'); + +-- Empoor's Bodyguard +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 18483; + +DELETE FROM `smart_scripts` WHERE `entryorguid` = 18483 AND `source_type` = 0; +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 +(18483, 0, 0, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 2, 1679, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Set Faction 1679'), +(18483, 0, 1, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Start Attacking'), +(18483, 0, 2, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Set Faction 35'), +(18483, 0, 3, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Evade'), +(18483, 0, 4, 0, 0, 0, 100, 0, 3000, 5000, 10000, 14000, 0, 11, 11977, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - In Combat - Cast \'Rend\''), +(18483, 0, 5, 0, 0, 0, 100, 0, 5000, 7000, 15000, 20000, 0, 11, 13730, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - In Combat - Cast \'Demoralizing Shout\''), +(18483, 0, 6, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1848202, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Reset - Run Script'); From c84123b6077c379eb3df0b554a3d6eb69d301861 Mon Sep 17 00:00:00 2001 From: Angelo Venturini Date: Tue, 18 Apr 2023 22:51:58 -0300 Subject: [PATCH 34/42] fix: Channel Crash (#15909) --- src/server/game/Entities/Player/PlayerUpdates.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp index 9a7e09f80..ba60bf392 100644 --- a/src/server/game/Entities/Player/PlayerUpdates.cpp +++ b/src/server/game/Entities/Player/PlayerUpdates.cpp @@ -489,12 +489,11 @@ void Player::UpdateLocalChannels(uint32 newZone) { Channel* usedChannel = nullptr; - for (JoinedChannelsList::iterator itr = m_channels.begin(); - itr != m_channels.end(); ++itr) + for (Channel* channel : m_channels) { - if ((*itr)->GetChannelId() == i) + if (channel && channel->GetChannelId() == i) { - usedChannel = *itr; + usedChannel = channel; break; } } From 2038ae7966d0cc4548822b968b9b6fca325e8b42 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 18 Apr 2023 22:52:29 -0300 Subject: [PATCH 35/42] chore(DB/SAI): Delete duplicate SAI rows for new SAI override system (#16011) Create rev_1681861393093078800.sql --- data/sql/updates/pending_db_world/rev_1681861393093078800.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681861393093078800.sql diff --git a/data/sql/updates/pending_db_world/rev_1681861393093078800.sql b/data/sql/updates/pending_db_world/rev_1681861393093078800.sql new file mode 100644 index 000000000..406931cc6 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681861393093078800.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|67108864 WHERE (`entry` IN (17722,17800,17803,17993,17994,18155,18404,18405,18420,18421,18422,18631,18632,18633,18634,18635,18639,18640,18641,19166,19168,19505,19510,19735,19767,20059,20864,20865,20867,20868,20873,20875,20881,20883,20988,20990,20625,20621,20622,21548,21545,21544,21549,21578,21574,21577,21570,20640,20642,20638,20648,20641,20647,20649,20643,21543,21539,21571,21522,21542,21541,21608,21607,21591,21593,21605,21604,21619,21615,21540,21523)); + +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `id` < 999 AND `entryorguid` IN (-25065,-138801,-138803,-138817,-138818,-138819,-138820,-138831,-138863,-138864,-138869,-138876,-138877,-138878,-138879,-138890,-138891,-138892,-138893,-138901,-138902,-138907,-138909,-138910,-138916,-138918,-138920,-138922,-138924,-138927,-138930,-138937,-138938,-138940,-138945,-138949,-142040,-142071,-142072,-142116,-146031,-146035,-146036,-146050,-146058,-146059,-146066,-146074,-146075,-146089,-146090,-146093,-146095,-146096,-146097,-146099,-146211,-146212,-146213,-146214,-146215,-146216,-146217,-146218,-146219,-146220,-146221,-146222,-146223,-146224,-146225,-146226,-146227,-146228,-146229,-147005,-147006,-147007,-147018,-147019,-147020,-147021,-147022,-147023,-147024,-147025,-147026,-147027,-147028,-147029,-147030,-147031,-147032,-147034,-147035,-147039,-147040,-147041,-147051,-147052,-147058,-147065,-147066,-147090,-147091,-147094,-147095); From a2e8409b41782327718d31a1abd3c5377d1cae22 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Tue, 18 Apr 2023 19:53:05 -0600 Subject: [PATCH 36/42] fix(Scripts/ShadowLabyrinth): Blackheart the Inciter's room link (#15994) * init * pew * init * pew --- .../boss_blackheart_the_inciter.cpp | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 58948980e..02d840c46 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -22,7 +22,7 @@ enum BlackheartTheInciter { SPELL_INCITE_CHAOS = 33676, - SPELL_INCITE_CHAOS_B = 33684, //debuff applied to each member of party + SPELL_INCITE_CHAOS_B = 33684, //debuff applied to each member of party SPELL_CHARGE = 33709, SPELL_WAR_STOMP = 33707, @@ -35,7 +35,7 @@ enum BlackheartTheInciter EVENT_SPELL_INCITE = 1, EVENT_INCITE_WAIT = 2, EVENT_SPELL_CHARGE = 3, - EVENT_SPELL_KNOCKBACK = 4 + EVENT_SPELL_WAR_STOMP = 4 }; class boss_blackheart_the_inciter : public CreatureScript @@ -57,47 +57,54 @@ public: InstanceScript* instance; EventMap events; - bool InciteChaos; void Reset() override { InciteChaos = false; events.Reset(); - if (instance) + { instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); + } } void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TYPEID_PLAYER && urand(0, 1)) + { Talk(SAY_SLAY); + } } void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); if (instance) + { instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); + } } void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); + me->CallForHelp(100.0f); events.ScheduleEvent(EVENT_SPELL_INCITE, 24000); events.ScheduleEvent(EVENT_INCITE_WAIT, 15000); - events.ScheduleEvent(EVENT_SPELL_CHARGE, 0); - events.ScheduleEvent(EVENT_SPELL_KNOCKBACK, urand(16950, 26350)); - + events.ScheduleEvent(EVENT_SPELL_CHARGE, urand(30000, 50000)); + events.ScheduleEvent(EVENT_SPELL_WAR_STOMP, urand(16950, 26350)); if (instance) + { instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); + } } void EnterEvadeMode(EvadeReason why) override { if (InciteChaos && SelectTargetFromPlayerList(100.0f)) return; + CreatureAI::EnterEvadeMode(why); } @@ -114,14 +121,16 @@ public: break; case EVENT_SPELL_INCITE: { - me->CastSpell(me, SPELL_INCITE_CHAOS, false); + DoCastAOE(SPELL_INCITE_CHAOS); std::list t_list = me->GetThreatMgr().GetThreatList(); for (std::list::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr) { Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()); if (target && target->GetTypeId() == TYPEID_PLAYER) + { me->CastSpell(target, SPELL_INCITE_CHAOS_B, true); + } } DoResetThreatList(); @@ -132,12 +141,11 @@ public: break; } case EVENT_SPELL_CHARGE: - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) - me->CastSpell(target, SPELL_CHARGE, false); + DoCastRandomTarget(SPELL_CHARGE); events.RepeatEvent(urand(30000, 50000)); break; - case EVENT_SPELL_KNOCKBACK: - me->CastSpell(me, SPELL_WAR_STOMP, false); + case EVENT_SPELL_WAR_STOMP: + DoCastAOE(SPELL_WAR_STOMP); events.RepeatEvent(urand(16950, 26350)); break; } From 2ee046bfde0e8ae143fe3cca73cdb7e01f6e175f Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 01:55:35 +0000 Subject: [PATCH 37/42] chore(DB): import pending files Referenced commit(s): a2e8409b41782327718d31a1abd3c5377d1cae22 --- .../rev_1680633363215025800.sql => db_world/2023_04_19_22.sql} | 1 + .../rev_1681793209169080500.sql => db_world/2023_04_19_23.sql} | 1 + .../rev_1681861393093078800.sql => db_world/2023_04_19_24.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/rev_1680633363215025800.sql => db_world/2023_04_19_22.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1681793209169080500.sql => db_world/2023_04_19_23.sql} (76%) rename data/sql/updates/{pending_db_world/rev_1681861393093078800.sql => db_world/2023_04_19_24.sql} (97%) diff --git a/data/sql/updates/pending_db_world/rev_1680633363215025800.sql b/data/sql/updates/db_world/2023_04_19_22.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1680633363215025800.sql rename to data/sql/updates/db_world/2023_04_19_22.sql index 7d7cbb2a0..314ddc7d1 100644 --- a/data/sql/updates/pending_db_world/rev_1680633363215025800.sql +++ b/data/sql/updates/db_world/2023_04_19_22.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_21 -> 2023_04_19_22 -- Quest: By Any Means Necessary 9978 UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=9978; diff --git a/data/sql/updates/pending_db_world/rev_1681793209169080500.sql b/data/sql/updates/db_world/2023_04_19_23.sql similarity index 76% rename from data/sql/updates/pending_db_world/rev_1681793209169080500.sql rename to data/sql/updates/db_world/2023_04_19_23.sql index a8dca33af..a3a8fcad4 100644 --- a/data/sql/updates/pending_db_world/rev_1681793209169080500.sql +++ b/data/sql/updates/db_world/2023_04_19_23.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_22 -> 2023_04_19_23 -- DELETE FROM `spell_custom_attr` WHERE `spell_id`=33684; INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES (33684,4096); diff --git a/data/sql/updates/pending_db_world/rev_1681861393093078800.sql b/data/sql/updates/db_world/2023_04_19_24.sql similarity index 97% rename from data/sql/updates/pending_db_world/rev_1681861393093078800.sql rename to data/sql/updates/db_world/2023_04_19_24.sql index 406931cc6..f49f64eec 100644 --- a/data/sql/updates/pending_db_world/rev_1681861393093078800.sql +++ b/data/sql/updates/db_world/2023_04_19_24.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_23 -> 2023_04_19_24 -- UPDATE `creature_template` SET `flags_extra`=`flags_extra`|67108864 WHERE (`entry` IN (17722,17800,17803,17993,17994,18155,18404,18405,18420,18421,18422,18631,18632,18633,18634,18635,18639,18640,18641,19166,19168,19505,19510,19735,19767,20059,20864,20865,20867,20868,20873,20875,20881,20883,20988,20990,20625,20621,20622,21548,21545,21544,21549,21578,21574,21577,21570,20640,20642,20638,20648,20641,20647,20649,20643,21543,21539,21571,21522,21542,21541,21608,21607,21591,21593,21605,21604,21619,21615,21540,21523)); From 9ccc367a1a9f53713193aa89e9b535d9f0be7abc Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 18:32:10 +0300 Subject: [PATCH 38/42] fix(DB/Creature): Port Immunities for Ogrila quest npcs from Mangos. (#15999) * fix(DB/creature_template): Port Immunities for Ogrila quest npcs from Mangos. * remove no dodge extra flag --- .../updates/pending_db_world/rev_1681810720948358500.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681810720948358500.sql diff --git a/data/sql/updates/pending_db_world/rev_1681810720948358500.sql b/data/sql/updates/pending_db_world/rev_1681810720948358500.sql new file mode 100644 index 000000000..cda7a9bd3 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681810720948358500.sql @@ -0,0 +1,7 @@ +-- Bosses on the Ogrila quest chain +-- Slaag +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|545470038 WHERE `entry` = 22199; +-- Maggoc, Grulloc, Skulloc Soulgrinder +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|579026774 WHERE `entry` IN (20600,20216,22910); +-- Vim'gol the Vile +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|579026775 WHERE `entry` = 22911; From d7eca37a6fda30e1e80d38338ed1a03519e1284b Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 18:32:39 +0300 Subject: [PATCH 39/42] fix(DB/Quest): Correct creature/objects for quest Whispers of the Raven God. (#15933) * fix(DB/SAI): Correct creature/objects for quest Whispers of the Raven God. https://github.com/TrinityCore/TrinityCore/issues/3234 * remove data0 change --- .../rev_1681369813867048100.sql | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681369813867048100.sql diff --git a/data/sql/updates/pending_db_world/rev_1681369813867048100.sql b/data/sql/updates/pending_db_world/rev_1681369813867048100.sql new file mode 100644 index 000000000..f7032631a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681369813867048100.sql @@ -0,0 +1,43 @@ +-- ID 21861 (Vision of the Raven God), also set to not specified +UPDATE `creature_template` SET `type` = 10 WHERE `entry` = 21861; + +DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 21861; +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 +(21861, 0, 0, 1, 38, 0, 100, 0, 1, 1, 0, 0, 0, 11, 39426, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 1 - Cast credit'), +(21861, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 0'), +(21861, 0, 2, 3, 38, 0, 100, 0, 1, 2, 0, 0, 0, 11, 39428, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 2 - Cast credit'), +(21861, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 1'), +(21861, 0, 4, 5, 38, 0, 100, 0, 1, 3, 0, 0, 0, 11, 39430, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 3 - Cast credit'), +(21861, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 2'), +(21861, 0, 6, 7, 38, 0, 100, 0, 1, 4, 0, 0, 0, 11, 39431, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 4 - Cast credit'), +(21861, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 3'); + +-- The First Prophecy, also correct spawn position (previously falling from above) +UPDATE `smart_scripts` SET `target_z` = 170.498 WHERE `source_type` = 1 AND `entryorguid` = 184950 AND `id` = 0; + +DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184950 AND `id` IN (1,2,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 +(184950, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'First Prophecy - Link - Store Targetlist'), +(184950, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'First Prophecy - Link - Send Target to Raven God'), +(184950, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'First Prophecy - Link - Set Data 1 to Raven God'); + +-- The Second Prophecy +DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184967 AND `id` IN (1,2,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 +(184967, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Second Prophecy - Link - Store Targetlist'), +(184967, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Second Prophecy - Link - Send Target to Raven God'), +(184967, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Second Prophecy - Link - Set Data 2 to Raven God'); + +-- The Third Prophecy +DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184968 AND `id` IN (1,2,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 +(184968, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Third Prophecy - Link - Store Targetlist'), +(184968, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Third Prophecy - Link - Send Target to Raven God'), +(184968, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 3, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Third Prophecy - Link - Set Data 3 to Raven God'); + +-- The Fourth Prophecy +DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184969 AND `id` IN (1,2,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 +(184969, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Fourth Prophecy - Link - Store Targetlist'), +(184969, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Fourth Prophecy - Link - Send Target to Raven God'), +(184969, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 4, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Fourth Prophecy - Link - Set Data 4 to Raven God'); From f82d20a14f749571089b77c2932f7fbb7bd074dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=B9=BF?= Date: Wed, 19 Apr 2023 23:33:23 +0800 Subject: [PATCH 40/42] fix(DB/Quest): Fix for Boiling Point (11627) (#16001) * Create fix quest 11627.sql * Update fix quest 11627.sql * Rename fix quest 11627.sql to fix-quest-11627.sql * Update fix-quest-11627.sql * Update fix-quest-11627.sql * Update fix-quest-11627.sql * Update fix-quest-11627.sql * Update fix-quest-11627.sql * Update data/sql/updates/pending_db_world/fix-quest-11627.sql * Update data/sql/updates/pending_db_world/fix-quest-11627.sql --- .../pending_db_world/fix-quest-11627.sql | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 data/sql/updates/pending_db_world/fix-quest-11627.sql diff --git a/data/sql/updates/pending_db_world/fix-quest-11627.sql b/data/sql/updates/pending_db_world/fix-quest-11627.sql new file mode 100644 index 000000000..b74e9a5fa --- /dev/null +++ b/data/sql/updates/pending_db_world/fix-quest-11627.sql @@ -0,0 +1,23 @@ +DELETE FROM `smart_scripts` WHERE `entryorguid`=25416 AND `source_type`=0; +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 +(25416, 0, 0, 1, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - On Aggro - Say Line 0'), +(25416, 0, 1, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 42, 0, 5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - On Respawn - Set Invincibility Hp 5%'), +(25416, 0, 2, 0, 0, 0, 100, 1, 5000, 5000, 5000, 5000, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - In Combat - Say Line 2'), +(25416, 0, 3, 4, 0, 0, 100, 1, 10000, 10000, 10000, 10000, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - In Combat - Say Line 3'), +(25416, 0, 4, 5, 61, 0, 100, 1, 0, 0, 0, 0, 0, 134, 45599, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Invoker Cast \'Boiling Point: Simmer Kill Credit\' (No Repeat)'), +(25416, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Say Line 1 (No Repeat)'), +(25416, 0, 6, 7, 61, 0, 100, 512, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Set Faction 35 (No Repeat)'), +(25416, 0, 7, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Evade (No Repeat)'), +(25416, 0, 8, 0, 1, 0, 100, 512, 120000, 120000, 120000, 120000, 0, 2, 1983, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Out of Combat - Set Faction 1983 (No Repeat)'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=25418 AND `source_type`=0; +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 +(25418, 0, 0, 0, 0, 0, 100, 0, 5300, 5300, 9900, 9900, 0, 11, 50206, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - In Combat - Cast \'Scalding Steam\' (No Repeat)'), +(25418, 0, 1, 0, 4, 0, 100, 512, 0, 0, 0, 0, 0, 42, 0, 5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - On Aggro - Set Invincibility Hp 5% (No Repeat)'), +(25418, 0, 2, 0, 0, 0, 100, 1, 5000, 5000, 5000, 5000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - In Combat - Say Line 0 (No Repeat)'), +(25418, 0, 3, 4, 0, 0, 100, 1, 10000, 10000, 10000, 10000, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - In Combat - Say Line 1 (No Repeat)'), +(25418, 0, 4, 5, 61, 0, 100, 1, 0, 0, 0, 0, 0, 134, 45598, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Invoker Cast \'Boiling Point: Churn Kill Credit\' (No Repeat)'), +(25418, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Say Line 2 (No Repeat)'), +(25418, 0, 6, 7, 61, 0, 100, 512, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Set Faction 35 (No Repeat)'), +(25418, 0, 7, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Evade (No Repeat)'), +(25418, 0, 8, 0, 1, 0, 100, 512, 120000, 120000, 120000, 120000, 0, 2, 1984, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Out of Combat - Set Faction 1984 (No Repeat)'); From 897d7d5585f5305c8543c0111684c65d85beeaf0 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Wed, 19 Apr 2023 18:36:06 +0300 Subject: [PATCH 41/42] fix typo for Clutchmother. (#16034) --- data/sql/updates/pending_db_world/rev_1681917503378349700.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1681917503378349700.sql diff --git a/data/sql/updates/pending_db_world/rev_1681917503378349700.sql b/data/sql/updates/pending_db_world/rev_1681917503378349700.sql new file mode 100644 index 000000000..e5d788a64 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681917503378349700.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND `memberGUID`=37385; From d4a2b08437a37e49ef7b50e63dc386bd54c77571 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 19 Apr 2023 15:38:39 +0000 Subject: [PATCH 42/42] chore(DB): import pending files Referenced commit(s): 897d7d5585f5305c8543c0111684c65d85beeaf0 --- .../fix-quest-11627.sql => db_world/2023_04_19_25.sql} | 1 + .../rev_1681369813867048100.sql => db_world/2023_04_19_26.sql} | 1 + .../rev_1681810720948358500.sql => db_world/2023_04_19_27.sql} | 1 + .../rev_1681917503378349700.sql => db_world/2023_04_19_28.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/fix-quest-11627.sql => db_world/2023_04_19_25.sql} (98%) rename data/sql/updates/{pending_db_world/rev_1681369813867048100.sql => db_world/2023_04_19_26.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1681810720948358500.sql => db_world/2023_04_19_27.sql} (91%) rename data/sql/updates/{pending_db_world/rev_1681917503378349700.sql => db_world/2023_04_19_28.sql} (70%) diff --git a/data/sql/updates/pending_db_world/fix-quest-11627.sql b/data/sql/updates/db_world/2023_04_19_25.sql similarity index 98% rename from data/sql/updates/pending_db_world/fix-quest-11627.sql rename to data/sql/updates/db_world/2023_04_19_25.sql index b74e9a5fa..d98302eca 100644 --- a/data/sql/updates/pending_db_world/fix-quest-11627.sql +++ b/data/sql/updates/db_world/2023_04_19_25.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_24 -> 2023_04_19_25 DELETE FROM `smart_scripts` WHERE `entryorguid`=25416 AND `source_type`=0; 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 (25416, 0, 0, 1, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - On Aggro - Say Line 0'), diff --git a/data/sql/updates/pending_db_world/rev_1681369813867048100.sql b/data/sql/updates/db_world/2023_04_19_26.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1681369813867048100.sql rename to data/sql/updates/db_world/2023_04_19_26.sql index f7032631a..724a43192 100644 --- a/data/sql/updates/pending_db_world/rev_1681369813867048100.sql +++ b/data/sql/updates/db_world/2023_04_19_26.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_25 -> 2023_04_19_26 -- ID 21861 (Vision of the Raven God), also set to not specified UPDATE `creature_template` SET `type` = 10 WHERE `entry` = 21861; diff --git a/data/sql/updates/pending_db_world/rev_1681810720948358500.sql b/data/sql/updates/db_world/2023_04_19_27.sql similarity index 91% rename from data/sql/updates/pending_db_world/rev_1681810720948358500.sql rename to data/sql/updates/db_world/2023_04_19_27.sql index cda7a9bd3..00315a93e 100644 --- a/data/sql/updates/pending_db_world/rev_1681810720948358500.sql +++ b/data/sql/updates/db_world/2023_04_19_27.sql @@ -1,3 +1,4 @@ +-- DB update 2023_04_19_26 -> 2023_04_19_27 -- Bosses on the Ogrila quest chain -- Slaag UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|545470038 WHERE `entry` = 22199; diff --git a/data/sql/updates/pending_db_world/rev_1681917503378349700.sql b/data/sql/updates/db_world/2023_04_19_28.sql similarity index 70% rename from data/sql/updates/pending_db_world/rev_1681917503378349700.sql rename to data/sql/updates/db_world/2023_04_19_28.sql index e5d788a64..f12d2605f 100644 --- a/data/sql/updates/pending_db_world/rev_1681917503378349700.sql +++ b/data/sql/updates/db_world/2023_04_19_28.sql @@ -1,2 +1,3 @@ +-- DB update 2023_04_19_27 -> 2023_04_19_28 -- UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND `memberGUID`=37385;