From c676a828376877e63da77fc1adc81ac2aa3daab0 Mon Sep 17 00:00:00 2001 From: Walter Pagani Date: Tue, 13 Jun 2023 08:10:35 -0300 Subject: [PATCH 01/30] chore(Core/ScriptMgr):Add Hook OnBeforeFillQuestLootItem (#16509) * chore(Core/ScriptMgr):Add Hook OnBeforeLootItem * Change name. Credit Anchy --- src/server/game/Loot/LootMgr.cpp | 2 ++ src/server/game/Scripting/ScriptDefines/PlayerScript.cpp | 8 ++++++++ src/server/game/Scripting/ScriptMgr.h | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 94d328dfe..68ef554d4 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -679,6 +679,8 @@ QuestItemList* Loot::FillQuestLoot(Player* player) { LootItem& item = quest_items[i]; + sScriptMgr->OnBeforeFillQuestLootItem(player, item); + // Quest item is not free for all and is already assigned to another player // or player doesn't need it if (item.is_blocked || !item.AllowedForPlayer(player, sourceWorldObjectGUID)) diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp index 6b7be2ca5..a21f15f1d 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp @@ -582,6 +582,14 @@ void ScriptMgr::OnLootItem(Player* player, Item* item, uint32 count, ObjectGuid }); } +void ScriptMgr::OnBeforeFillQuestLootItem(Player* player, LootItem& item) +{ + ExecuteScript([&](PlayerScript* script) + { + script->OnBeforeFillQuestLootItem(player, item); + }); +} + void ScriptMgr::OnStoreNewItem(Player* player, Item* item, uint32 count) { ExecuteScript([&](PlayerScript* script) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 241e54991..52575dc6d 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1181,6 +1181,9 @@ public: //After looting item virtual void OnLootItem(Player* /*player*/, Item* /*item*/, uint32 /*count*/, ObjectGuid /*lootguid*/) { } + //Before looting item + virtual void OnBeforeFillQuestLootItem(Player* /*player*/, LootItem& /*item*/) { } + //After looting item (includes master loot). virtual void OnStoreNewItem(Player* /*player*/, Item* /*item*/, uint32 /*count*/) { } @@ -2290,6 +2293,7 @@ public: /* PlayerScript */ void GetCustomArenaPersonalRating(Player const* player, uint8 slot, uint32& rating) const; void OnGetMaxPersonalArenaRatingRequirement(Player const* player, uint32 minSlot, uint32& maxArenaRating) const; void OnLootItem(Player* player, Item* item, uint32 count, ObjectGuid lootguid); + void OnBeforeFillQuestLootItem(Player* player, LootItem& item); void OnStoreNewItem(Player* player, Item* item, uint32 count); void OnCreateItem(Player* player, Item* item, uint32 count); void OnQuestRewardItem(Player* player, Item* item, uint32 count); From a10c183e99a7c4880420886777e6b3e1c3308965 Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Wed, 14 Jun 2023 23:23:13 +0200 Subject: [PATCH 02/30] chore(Scripts/MagtheridonsLair): rework Magtheridon boss script (#16527) * initial commit * remove leftovers * codestyle --- .../MagtheridonsLair/boss_magtheridon.cpp | 246 ++++++++---------- 1 file changed, 109 insertions(+), 137 deletions(-) diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index b7ec0db34..077dbd977 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -55,27 +55,9 @@ enum Spells SPELL_DEBRIS_DAMAGE = 30631 }; -enum Events +enum Groups { - EVENT_EMOTE1 = 1, - EVENT_EMOTE2 = 2, - EVENT_EMOTE3 = 3, - EVENT_ENTER_COMBAT = 4, - EVENT_RECENTLY_SPOKEN = 5, - - EVENT_CLEAVE = 10, - EVENT_BLAST_NOVA = 11, - EVENT_BLAZE = 12, - EVENT_ENRAGE = 13, - EVENT_QUAKE = 14, - EVENT_CHECK_HEALTH = 15, - EVENT_COLLAPSE_CEIL = 16, - EVENT_COLLAPSE_DAMAGE = 17, - EVENT_DEBRIS = 18, - - EVENT_RANDOM_TAUNT = 30, - EVENT_CHECK_GRASP = 31, - EVENT_CANCEL_GRASP_CHECK = 32 + GROUP_INTERRUPT_CHECK = 0 }; class DealDebrisDamage : public BasicEvent @@ -102,28 +84,69 @@ public: struct boss_magtheridonAI : public BossAI { - boss_magtheridonAI(Creature* creature) : BossAI(creature, TYPE_MAGTHERIDON) { } - - EventMap events2; + boss_magtheridonAI(Creature* creature) : BossAI(creature, TYPE_MAGTHERIDON) + { + scheduler.SetValidator([this] + { + return !me->HasUnitState(UNIT_STATE_CASTING); + }); + } void Reset() override { - events2.Reset(); - events2.ScheduleEvent(EVENT_RANDOM_TAUNT, 90000); _Reset(); + _currentPhase = 0; + _recentlySpoken = false; + scheduler.Schedule(90s, [this](TaskContext context) + { + Talk(SAY_TAUNT); + context.Repeat(90s); + }); me->CastSpell(me, SPELL_SHADOW_CAGE, true); me->SetReactState(REACT_PASSIVE); me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->SetImmuneToPC(true); + + ScheduleHealthCheckEvent(30, [&] { + _currentPhase = 1; + Talk(SAY_PHASE3); + me->GetMotionMaster()->Clear(); + scheduler.DelayAll(18s); + scheduler.Schedule(8s, [this](TaskContext /*context*/) + { + DoCastSelf(SPELL_CAMERA_SHAKE, true); + instance->SetData(DATA_COLLAPSE, GO_STATE_ACTIVE); + }).Schedule(15s, [this](TaskContext /*context*/) + { + DoCastSelf(SPELL_COLLAPSE_DAMAGE, true); + me->resetAttackTimer(); + me->GetMotionMaster()->MoveChase(me->GetVictim()); + _currentPhase = 0; + scheduler.Schedule(20s, [this](TaskContext context) + { + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) + { + target->CastSpell(target, SPELL_DEBRIS_VISUAL, true, nullptr, nullptr, me->GetGUID()); + me->m_Events.AddEvent(new DealDebrisDamage(*me, target->GetGUID()), me->m_Events.CalculateTime(5000)); + } + context.Repeat(20s); + }); + }); + }); } - void KilledUnit(Unit* /*victim*/) override + void KilledUnit(Unit* /*victim*/) override { - if (events.GetNextEventTime(EVENT_RECENTLY_SPOKEN) == 0) + if(!_recentlySpoken) { - events.ScheduleEvent(EVENT_RECENTLY_SPOKEN, 5000); Talk(SAY_SLAY); + _recentlySpoken = true; } + + scheduler.Schedule(5s, [this](TaskContext /*context*/) + { + _recentlySpoken = false; + }); } void JustDied(Unit* /*killer*/) override @@ -132,135 +155,84 @@ public: Talk(SAY_DEATH); } - void MoveInLineOfSight(Unit* /*who*/) override { } - void JustEngagedWith(Unit* /*who*/) override { - events2.Reset(); _JustEngagedWith(); - events.ScheduleEvent(EVENT_EMOTE1, 0); - events.ScheduleEvent(EVENT_EMOTE2, 60000); - events.ScheduleEvent(EVENT_EMOTE3, 120000); - events.ScheduleEvent(EVENT_ENTER_COMBAT, 123000); + Talk(SAY_EMOTE_BEGIN); + + scheduler.Schedule(60s, [this](TaskContext /*context*/) + { + Talk(SAY_EMOTE_NEARLY); + }).Schedule(120s, [this](TaskContext /*context*/) + { + Talk(SAY_EMOTE_FREE); + }).Schedule(123s, [this](TaskContext /*context*/) + { + me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); + me->SetImmuneToPC(false); + me->SetReactState(REACT_AGGRESSIVE); + instance->SetData(DATA_ACTIVATE_CUBES, 1); + me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE); + + scheduler.Schedule(9s, [this](TaskContext context) + { + DoCastVictim(SPELL_CLEAVE); + context.Repeat(10s); + }).Schedule(10s, [this](TaskContext context) + { + me->CastCustomSpell(SPELL_BLAZE, SPELLVALUE_MAX_TARGETS, 1); + context.Repeat(30s); + }).Schedule(40s, [this](TaskContext context) + { + me->CastSpell(me, SPELL_QUAKE); //needs fixes with custom spell + scheduler.Schedule(7s, [this](TaskContext /*context*/) + { + DoCastSelf(SPELL_BLAST_NOVA); + + scheduler.Schedule(50ms, GROUP_INTERRUPT_CHECK, [this](TaskContext context) + { + if (me->GetAuraCount(SPELL_SHADOW_GRASP_VISUAL) == 5) + { + Talk(SAY_BANISH); + me->InterruptNonMeleeSpells(true); + scheduler.CancelGroup(GROUP_INTERRUPT_CHECK); + } + context.Repeat(50ms); + }).Schedule(12s, GROUP_INTERRUPT_CHECK, [this](TaskContext /*context*/) + { + scheduler.CancelGroup(GROUP_INTERRUPT_CHECK); + }); + }); + context.Repeat(50s); + }).Schedule(1320s, [this](TaskContext /*context*/) + { + DoCastSelf(SPELL_BERSERK, true); + }); + }); } void UpdateAI(uint32 diff) override { - events2.Update(diff); - switch (events2.ExecuteEvent()) - { - case EVENT_RANDOM_TAUNT: - Talk(SAY_TAUNT); - events2.ScheduleEvent(EVENT_RANDOM_TAUNT, 90000); - break; - case EVENT_CHECK_GRASP: - if (me->GetAuraCount(SPELL_SHADOW_GRASP_VISUAL) == 5) - { - Talk(SAY_BANISH); - me->InterruptNonMeleeSpells(true); - break; - } - events2.ScheduleEvent(EVENT_CHECK_GRASP, 0); - break; - } - if (!UpdateVictim()) return; - events.Update(diff); - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; + scheduler.Update(diff); - switch (events.ExecuteEvent()) + if (_currentPhase != 1) { - case EVENT_EMOTE1: - Talk(SAY_EMOTE_BEGIN); - break; - case EVENT_EMOTE2: - Talk(SAY_EMOTE_NEARLY); - break; - case EVENT_EMOTE3: - Talk(SAY_EMOTE_FREE); - Talk(SAY_FREE); - break; - case EVENT_ENTER_COMBAT: - me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); - me->SetImmuneToPC(false); - me->SetReactState(REACT_AGGRESSIVE); - events.ScheduleEvent(EVENT_CLEAVE, 9000); - events.ScheduleEvent(EVENT_BLAZE, 10000); - events.ScheduleEvent(EVENT_QUAKE, 40000); - events.ScheduleEvent(EVENT_CHECK_HEALTH, 500); - events.ScheduleEvent(EVENT_ENRAGE, 22 * MINUTE * IN_MILLISECONDS); - - instance->SetData(DATA_ACTIVATE_CUBES, 1); - me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE); - break; - case EVENT_CLEAVE: - me->CastSpell(me->GetVictim(), SPELL_CLEAVE, false); - events.ScheduleEvent(EVENT_CLEAVE, 10000); - break; - case EVENT_BLAST_NOVA: - me->CastSpell(me, SPELL_BLAST_NOVA, false); - events.ScheduleEvent(EVENT_CANCEL_GRASP_CHECK, 12000); - events2.ScheduleEvent(EVENT_CHECK_GRASP, 0); - break; - case EVENT_BLAZE: - me->CastCustomSpell(SPELL_BLAZE, SPELLVALUE_MAX_TARGETS, 1); - events.ScheduleEvent(EVENT_BLAZE, 30000); - break; - case EVENT_ENRAGE: - me->CastSpell(me, SPELL_BERSERK, true); - break; - case EVENT_CANCEL_GRASP_CHECK: - events2.Reset(); - break; - case EVENT_QUAKE: - me->CastSpell(me, SPELL_QUAKE, false); - events.ScheduleEvent(EVENT_BLAST_NOVA, 7000); - events.ScheduleEvent(EVENT_QUAKE, 50000); - break; - case EVENT_CHECK_HEALTH: - if (me->HealthBelowPct(30)) - { - Talk(SAY_PHASE3); - events.SetPhase(1); - events.DelayEvents(18000); - events.ScheduleEvent(EVENT_COLLAPSE_CEIL, 8000); - events.ScheduleEvent(EVENT_COLLAPSE_DAMAGE, 15000); - break; - } - events.ScheduleEvent(EVENT_CHECK_HEALTH, 500); - break; - case EVENT_COLLAPSE_CEIL: - me->CastSpell(me, SPELL_CAMERA_SHAKE, true); - instance->SetData(DATA_COLLAPSE, GO_STATE_ACTIVE); - break; - case EVENT_COLLAPSE_DAMAGE: - me->CastSpell(me, SPELL_COLLAPSE_DAMAGE, true); - me->resetAttackTimer(); - events.SetPhase(0); - events.ScheduleEvent(EVENT_DEBRIS, 20000); - break; - case EVENT_DEBRIS: - if (Unit* target = SelectTarget(SelectTargetMethod::Random)) - { - target->CastSpell(target, SPELL_DEBRIS_VISUAL, true, nullptr, nullptr, me->GetGUID()); - me->m_Events.AddEvent(new DealDebrisDamage(*me, target->GetGUID()), me->m_Events.CalculateTime(5000)); - } - events.ScheduleEvent(EVENT_DEBRIS, 20000); - break; - } - - if (!events.IsInPhase(1)) DoMeleeAttackIfReady(); + } } + private: + bool _recentlySpoken; + uint8 _currentPhase; }; CreatureAI* GetAI(Creature* creature) const override { return GetMagtheridonsLairAI(creature); } + }; class spell_magtheridon_blaze : public SpellScriptLoader From 666b5847c3da5ba30976b442ddb723e14bc7ad93 Mon Sep 17 00:00:00 2001 From: Walter Pagani Date: Thu, 15 Jun 2023 19:06:13 -0300 Subject: [PATCH 03/30] chore(Core/MiscHandler): SendAreaTriggerMessage with integer parameter (#16506) Add the possibility for SendAreaTriggerMessage to accept an integer parameter --- src/server/game/Handlers/MiscHandler.cpp | 21 +++++++++++++++++++++ src/server/game/Server/WorldSession.h | 1 + 2 files changed, 22 insertions(+) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 7146fea21..5149e6a49 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -718,6 +718,27 @@ void WorldSession::SendAreaTriggerMessage(const char* Text, ...) SendPacket(&data); } +void WorldSession::SendAreaTriggerMessage(uint32 entry, ...) +{ + char const* format = GetAcoreString(entry); + if (format) + { + va_list ap; + char szStr[1024]; + szStr[0] = '\0'; + + va_start(ap, entry); + vsnprintf(szStr, 1024, format, ap); + va_end(ap); + + uint32 length = strlen(szStr) + 1; + WorldPacket data(SMSG_AREA_TRIGGER_MESSAGE, 4 + length); + data << length; + data << szStr; + SendPacket(&data); + } +} + void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data) { uint32 triggerId; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 5035f40cf..930473b8e 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -349,6 +349,7 @@ public: void SendPetNameInvalid(uint32 error, std::string const& name, DeclinedName* declinedName); void SendPartyResult(PartyOperation operation, std::string const& member, PartyResult res, uint32 val = 0); void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2, 3); + void SendAreaTriggerMessage(uint32 entry, ...); void SendSetPhaseShift(uint32 phaseShift); void SendQueryTimeResponse(); From d071784d92b5ab5e9bad5416b848cc620da01c09 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Thu, 15 Jun 2023 18:20:39 -0600 Subject: [PATCH 04/30] fix(DB/Creature): Make Shattered Halls triggers invisible to players (#16545) init --- data/sql/updates/pending_db_world/rev_1686855645703861100.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686855645703861100.sql diff --git a/data/sql/updates/pending_db_world/rev_1686855645703861100.sql b/data/sql/updates/pending_db_world/rev_1686855645703861100.sql new file mode 100644 index 000000000..77d061415 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686855645703861100.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `flags_extra` = `flags_extra`|128 WHERE `entry`=17552; + From 5a85176a1c5496d157627be0dd305c555f3e06c6 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Thu, 15 Jun 2023 18:22:04 -0600 Subject: [PATCH 05/30] fix(DB/Creature): Make Shadow Labyrinth triggers invisible to players (#16546) --- data/sql/updates/pending_db_world/rev_1686857040635595500.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686857040635595500.sql diff --git a/data/sql/updates/pending_db_world/rev_1686857040635595500.sql b/data/sql/updates/pending_db_world/rev_1686857040635595500.sql new file mode 100644 index 000000000..f7bbf135d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686857040635595500.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `flags_extra` = `flags_extra`|128 WHERE `entry`=20654; + From 732724a15fe2cc73986d21338a01d2e4b17cade0 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 16 Jun 2023 00:24:40 +0000 Subject: [PATCH 06/30] chore(DB): import pending files Referenced commit(s): 5a85176a1c5496d157627be0dd305c555f3e06c6 --- .../rev_1686855645703861100.sql => db_world/2023_06_16_00.sql} | 1 + .../rev_1686857040635595500.sql => db_world/2023_06_16_01.sql} | 1 + 2 files changed, 2 insertions(+) rename data/sql/updates/{pending_db_world/rev_1686855645703861100.sql => db_world/2023_06_16_00.sql} (67%) rename data/sql/updates/{pending_db_world/rev_1686857040635595500.sql => db_world/2023_06_16_01.sql} (67%) diff --git a/data/sql/updates/pending_db_world/rev_1686855645703861100.sql b/data/sql/updates/db_world/2023_06_16_00.sql similarity index 67% rename from data/sql/updates/pending_db_world/rev_1686855645703861100.sql rename to data/sql/updates/db_world/2023_06_16_00.sql index 77d061415..e97d6be2c 100644 --- a/data/sql/updates/pending_db_world/rev_1686855645703861100.sql +++ b/data/sql/updates/db_world/2023_06_16_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_11_02 -> 2023_06_16_00 -- UPDATE `creature_template` SET `flags_extra` = `flags_extra`|128 WHERE `entry`=17552; diff --git a/data/sql/updates/pending_db_world/rev_1686857040635595500.sql b/data/sql/updates/db_world/2023_06_16_01.sql similarity index 67% rename from data/sql/updates/pending_db_world/rev_1686857040635595500.sql rename to data/sql/updates/db_world/2023_06_16_01.sql index f7bbf135d..196c2ac91 100644 --- a/data/sql/updates/pending_db_world/rev_1686857040635595500.sql +++ b/data/sql/updates/db_world/2023_06_16_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_16_00 -> 2023_06_16_01 -- UPDATE `creature_template` SET `flags_extra` = `flags_extra`|128 WHERE `entry`=20654; From de1f3a1cdc6e431d60a7701c81e284701d70a2da Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Thu, 15 Jun 2023 18:37:47 -0600 Subject: [PATCH 07/30] fix(DB/Creature): Add CC immunity to (H) Blood Guard Porung (#16544) init --- data/sql/updates/pending_db_world/rev_1686855204524860800.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686855204524860800.sql diff --git a/data/sql/updates/pending_db_world/rev_1686855204524860800.sql b/data/sql/updates/pending_db_world/rev_1686855204524860800.sql new file mode 100644 index 000000000..193b94ed7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686855204524860800.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|1|2|8|16|64|128|1024|2048|4096|8192|65536|8388608|536870912 WHERE `entry`=20993; + From 8d933c0398e887a228cb2823e125d1412a714f3f Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 16 Jun 2023 00:40:11 +0000 Subject: [PATCH 08/30] chore(DB): import pending files Referenced commit(s): de1f3a1cdc6e431d60a7701c81e284701d70a2da --- .../rev_1686855204524860800.sql => db_world/2023_06_16_02.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1686855204524860800.sql => db_world/2023_06_16_02.sql} (78%) diff --git a/data/sql/updates/pending_db_world/rev_1686855204524860800.sql b/data/sql/updates/db_world/2023_06_16_02.sql similarity index 78% rename from data/sql/updates/pending_db_world/rev_1686855204524860800.sql rename to data/sql/updates/db_world/2023_06_16_02.sql index 193b94ed7..29de8424b 100644 --- a/data/sql/updates/pending_db_world/rev_1686855204524860800.sql +++ b/data/sql/updates/db_world/2023_06_16_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_16_01 -> 2023_06_16_02 -- UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|1|2|8|16|64|128|1024|2048|4096|8192|65536|8388608|536870912 WHERE `entry`=20993; From 7e4df53cbcf402e7aabd27634a70a653d4d4c1c3 Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Sat, 17 Jun 2023 14:20:53 +0000 Subject: [PATCH 09/30] fix(DB/Gameobject): Add game_event_object entry for Midsummer Banners in Shattrath (#16562) * Create rev_1686948961677753100.sql * Update rev_1686948961677753100.sql --- data/sql/updates/pending_db_world/rev_1686948961677753100.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686948961677753100.sql diff --git a/data/sql/updates/pending_db_world/rev_1686948961677753100.sql b/data/sql/updates/pending_db_world/rev_1686948961677753100.sql new file mode 100644 index 000000000..1e1acf6da --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686948961677753100.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `game_event_gameobject` WHERE `eventEntry` = 1 AND `guid` = 28242; +INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES (1, 28242); From eb203d0d852ef6118a264baf17d85392b4168d80 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 17 Jun 2023 14:23:28 +0000 Subject: [PATCH 10/30] chore(DB): import pending files Referenced commit(s): 7e4df53cbcf402e7aabd27634a70a653d4d4c1c3 --- .../rev_1686948961677753100.sql => db_world/2023_06_17_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1686948961677753100.sql => db_world/2023_06_17_00.sql} (78%) diff --git a/data/sql/updates/pending_db_world/rev_1686948961677753100.sql b/data/sql/updates/db_world/2023_06_17_00.sql similarity index 78% rename from data/sql/updates/pending_db_world/rev_1686948961677753100.sql rename to data/sql/updates/db_world/2023_06_17_00.sql index 1e1acf6da..66371a2cc 100644 --- a/data/sql/updates/pending_db_world/rev_1686948961677753100.sql +++ b/data/sql/updates/db_world/2023_06_17_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_16_02 -> 2023_06_17_00 -- DELETE FROM `game_event_gameobject` WHERE `eventEntry` = 1 AND `guid` = 28242; INSERT INTO `game_event_gameobject` (`eventEntry`,`guid`) VALUES (1, 28242); From e515dfaa58f9f4df2f9c051ae9cb1a17fcddd2c3 Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Sat, 17 Jun 2023 16:26:05 +0200 Subject: [PATCH 11/30] fix(DB/Loot): Remove normal loot drops from OHF bosses (#16553) initial --- data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql diff --git a/data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql b/data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql new file mode 100644 index 000000000..5dc939155 --- /dev/null +++ b/data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `creature_loot_template` WHERE `Entry` = 20521 AND `Item` IN (27424, 27428, 27430); -- removing 3 normal items from HC Skarlock +DELETE FROM `creature_loot_template` WHERE `Entry` = 20531 AND `Item` IN (27433, 27434, 27440); -- removing 3 normal items from HC Epoch Hunter +DELETE FROM `creature_loot_template` WHERE `Entry` = 20535 AND `Item` IN (27417, 27423); -- removing 2 normal items from HC Captain Drake From 02876083e4822ede4eb59c09358687656cbc889a Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:26:45 -0300 Subject: [PATCH 12/30] fix(DB/Gameobject): Add heroic version of Cache of the Legion (#16524) Create rev_1686619097901055400.sql --- .../updates/pending_db_world/rev_1686619097901055400.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686619097901055400.sql diff --git a/data/sql/updates/pending_db_world/rev_1686619097901055400.sql b/data/sql/updates/pending_db_world/rev_1686619097901055400.sql new file mode 100644 index 000000000..e643c23df --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686619097901055400.sql @@ -0,0 +1,6 @@ +-- +UPDATE `gameobject` SET `spawnMask` = `spawnMask`&~2 WHERE `guid`=9890 AND `id` = 184465; + +DELETE FROM `gameobject` WHERE `guid` = 9891 AND `id` = 184849; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES +(9891, 184849, 554, 3849, 3849, 2, 222.543, 70.6106, -0.00479339, 4.67748, -0.719339, 0.694659, 7200, 255, 1, 46924); From 51e5920d76b4eefec753700056fe293ced5084c7 Mon Sep 17 00:00:00 2001 From: v-mstrs <104088833+v-mstrs@users.noreply.github.com> Date: Sat, 17 Jun 2023 16:28:36 +0200 Subject: [PATCH 13/30] fix(DB/SAI): Add Scatter Shot to Shattered Hand Sharpshooter (#16534) fix(DB/SAI)Add Scatter shot to Shattered Hand Sharpshooter --- data/sql/updates/pending_db_world/rev_1686779435224151475.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686779435224151475.sql diff --git a/data/sql/updates/pending_db_world/rev_1686779435224151475.sql b/data/sql/updates/pending_db_world/rev_1686779435224151475.sql new file mode 100644 index 000000000..eccff21bb --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686779435224151475.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 16704) AND `source_type` = 0 AND `id` =5; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(16704, 0, 5, 0, 0, 0, 100, 0, 13350, 21000, 20700, 39250, 0, 11, 23601, 64, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Shattered Hand Sharpshooter - In Combat - Cast \'Scatter Shot\''); From 5047d319263d550cff134b0a24cf57f9bbde0fea Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 17 Jun 2023 14:31:13 +0000 Subject: [PATCH 14/30] chore(DB): import pending files Referenced commit(s): 51e5920d76b4eefec753700056fe293ced5084c7 --- .../fix-hc-loot-bosses-ohf.sql => db_world/2023_06_17_01.sql} | 1 + .../rev_1686619097901055400.sql => db_world/2023_06_17_02.sql} | 1 + .../rev_1686779435224151475.sql => db_world/2023_06_17_03.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/fix-hc-loot-bosses-ohf.sql => db_world/2023_06_17_01.sql} (90%) rename data/sql/updates/{pending_db_world/rev_1686619097901055400.sql => db_world/2023_06_17_02.sql} (91%) rename data/sql/updates/{pending_db_world/rev_1686779435224151475.sql => db_world/2023_06_17_03.sql} (94%) diff --git a/data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql b/data/sql/updates/db_world/2023_06_17_01.sql similarity index 90% rename from data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql rename to data/sql/updates/db_world/2023_06_17_01.sql index 5dc939155..04c927a76 100644 --- a/data/sql/updates/pending_db_world/fix-hc-loot-bosses-ohf.sql +++ b/data/sql/updates/db_world/2023_06_17_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_00 -> 2023_06_17_01 -- DELETE FROM `creature_loot_template` WHERE `Entry` = 20521 AND `Item` IN (27424, 27428, 27430); -- removing 3 normal items from HC Skarlock DELETE FROM `creature_loot_template` WHERE `Entry` = 20531 AND `Item` IN (27433, 27434, 27440); -- removing 3 normal items from HC Epoch Hunter diff --git a/data/sql/updates/pending_db_world/rev_1686619097901055400.sql b/data/sql/updates/db_world/2023_06_17_02.sql similarity index 91% rename from data/sql/updates/pending_db_world/rev_1686619097901055400.sql rename to data/sql/updates/db_world/2023_06_17_02.sql index e643c23df..27cc35e2d 100644 --- a/data/sql/updates/pending_db_world/rev_1686619097901055400.sql +++ b/data/sql/updates/db_world/2023_06_17_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_01 -> 2023_06_17_02 -- UPDATE `gameobject` SET `spawnMask` = `spawnMask`&~2 WHERE `guid`=9890 AND `id` = 184465; diff --git a/data/sql/updates/pending_db_world/rev_1686779435224151475.sql b/data/sql/updates/db_world/2023_06_17_03.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1686779435224151475.sql rename to data/sql/updates/db_world/2023_06_17_03.sql index eccff21bb..bb7557025 100644 --- a/data/sql/updates/pending_db_world/rev_1686779435224151475.sql +++ b/data/sql/updates/db_world/2023_06_17_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_02 -> 2023_06_17_03 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` = 16704) AND `source_type` = 0 AND `id` =5; INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES From a96cf8dee45bc40b1bdee3e11433a04ee50f941d Mon Sep 17 00:00:00 2001 From: v-mstrs <104088833+v-mstrs@users.noreply.github.com> Date: Sat, 17 Jun 2023 16:31:26 +0200 Subject: [PATCH 15/30] fix(DB/Spell): Add ICD to Spellsurge and some PVP trinkets (#16551) * fix(DB/spell_proc_event) Add ICD to Spellsurge and Mark of Defiance * .. * Update rev_1686876002032070899.sql * Update rev_1686876002032070899.sql * Update rev_1686876002032070899.sql * Update rev_1686876002032070899.sql * Update rev_1686876002032070899.sql --- .../updates/pending_db_world/rev_1686876002032070899.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686876002032070899.sql diff --git a/data/sql/updates/pending_db_world/rev_1686876002032070899.sql b/data/sql/updates/pending_db_world/rev_1686876002032070899.sql new file mode 100644 index 000000000..17eef75a9 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686876002032070899.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `spell_proc_event` WHERE `entry` IN (27997, 33511, 33522, 33510, 24256); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `procPhase`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(27997,0,0,0,0,0,0,0,0,0,0,50000), +(33511,0,0,0,0,0,0,0,0,0,0,17000), +(33522,0,0,0,0,0,0,0,0,0,0,25000), +(33510,0,0,0,0,0,0,0,0,0,0,25000), +(24256,0,0,0,0,0,0,0,0,0,0,240000); From 3620b6c12f7f8bfa42b521708ff77545a36ff1dc Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 17 Jun 2023 14:34:00 +0000 Subject: [PATCH 16/30] chore(DB): import pending files Referenced commit(s): a96cf8dee45bc40b1bdee3e11433a04ee50f941d --- .../rev_1686876002032070899.sql => db_world/2023_06_17_04.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1686876002032070899.sql => db_world/2023_06_17_04.sql} (91%) diff --git a/data/sql/updates/pending_db_world/rev_1686876002032070899.sql b/data/sql/updates/db_world/2023_06_17_04.sql similarity index 91% rename from data/sql/updates/pending_db_world/rev_1686876002032070899.sql rename to data/sql/updates/db_world/2023_06_17_04.sql index 17eef75a9..fd84bf804 100644 --- a/data/sql/updates/pending_db_world/rev_1686876002032070899.sql +++ b/data/sql/updates/db_world/2023_06_17_04.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_03 -> 2023_06_17_04 -- DELETE FROM `spell_proc_event` WHERE `entry` IN (27997, 33511, 33522, 33510, 24256); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `procPhase`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES From 5590d2eab295a664c804438403dda7e4a68653c0 Mon Sep 17 00:00:00 2001 From: v-mstrs <104088833+v-mstrs@users.noreply.github.com> Date: Sat, 17 Jun 2023 16:34:19 +0200 Subject: [PATCH 17/30] fix(DB/Quest): Correct AllowedRaces for Shattered Halls quests (#16517) * fix(DB/Quest) Fel Embers now can't be shared with horde. * Update rev_1686519678664565811.sql * Update rev_1686519678664565811.sql --- data/sql/updates/pending_db_world/rev_1686519678664565811.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686519678664565811.sql diff --git a/data/sql/updates/pending_db_world/rev_1686519678664565811.sql b/data/sql/updates/pending_db_world/rev_1686519678664565811.sql new file mode 100644 index 000000000..a066e09da --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686519678664565811.sql @@ -0,0 +1,3 @@ +-- +UPDATE `quest_template` SET `AllowableRaces` = 1101 WHERE `ID` IN (9494, 9492); +UPDATE `quest_template` SET `AllowableRaces` = 690 WHERE `ID` = 9495; From a36e8a3605add055196017011e6472cc0abe1f5d Mon Sep 17 00:00:00 2001 From: The GhostRider Date: Sat, 17 Jun 2023 15:36:06 +0100 Subject: [PATCH 18/30] Fix(DB/Events): Disable LoS for Cluster Launcher (#16476) * Fix(DB/GameObjects): Cluster Launcher * Update rev_1685926790862483900.sql * Update rev_1685926790862483900.sql * fix: my mistake * Update rev_1685926790862483900.sql --- data/sql/updates/pending_db_world/rev_1685926790862483900.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1685926790862483900.sql diff --git a/data/sql/updates/pending_db_world/rev_1685926790862483900.sql b/data/sql/updates/pending_db_world/rev_1685926790862483900.sql new file mode 100644 index 000000000..a6981dff0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1685926790862483900.sql @@ -0,0 +1,3 @@ +-- Fix Disable LOS from the Spell 26522 (Lunar Fortune) -- +DELETE FROM `disables` WHERE `sourceType`=0 AND `entry`=26522; +INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES (0, 26522, 64, '', '', 'Disable LOS for Lunar Fortune'); From 78c639df1c035d37b67f28e4af0c33070e700c6b Mon Sep 17 00:00:00 2001 From: Walter Pagani Date: Sat, 17 Jun 2023 11:36:36 -0300 Subject: [PATCH 19/30] fix(DB/Smart Scripts) Quest 437: The Dead Fields (#16550) * fix(DB/Smart Scripts) Quest 437: The Dead Fields * update script * Change target to invoker party * Update rev_1686872651542486500.sql --- .../sql/updates/pending_db_world/rev_1686872651542486500.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686872651542486500.sql diff --git a/data/sql/updates/pending_db_world/rev_1686872651542486500.sql b/data/sql/updates/pending_db_world/rev_1686872651542486500.sql new file mode 100644 index 000000000..537d836c5 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686872651542486500.sql @@ -0,0 +1,5 @@ +-- +DELETE FROM `smart_scripts` WHERE `entryorguid`=173 AND `source_type`=2; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(173, 2, 0, 1, 46, 0, 100, 0, 0, 0, 0, 0, 0, 12, 2056, 3, 300000, 0, 0, 0, 8, 0, 0, 0, 0, 1077, 1539, 28.89, 0, 'Areatrigger - On Trigger - Summon Creature \'Ravenclaw Apparition\' (The Dead Fields)'), +(173, 2, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 15, 437, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Areatrigger - Linked - Quest Credit \'The Dead Fields\''); From e91232eafa06cd77963b1bd7ed77c4e9a00c2819 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Sat, 17 Jun 2023 08:36:56 -0600 Subject: [PATCH 20/30] fix(DB/Creature): Add missing immunities to Yor (#16558) * init * Update rev_1686942698941660200.sql --- data/sql/updates/pending_db_world/rev_1686942698941660200.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686942698941660200.sql diff --git a/data/sql/updates/pending_db_world/rev_1686942698941660200.sql b/data/sql/updates/pending_db_world/rev_1686942698941660200.sql new file mode 100644 index 000000000..4631778b1 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686942698941660200.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|1|2|8|16|64|1024|2048|4096|8192|65536|8388608|536870912 WHERE `entry`=22930; + From 67064d6d7e1955621050025c0b278b8a2c684fbd Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 17 Jun 2023 14:39:29 +0000 Subject: [PATCH 21/30] chore(DB): import pending files Referenced commit(s): e91232eafa06cd77963b1bd7ed77c4e9a00c2819 --- .../rev_1685926790862483900.sql => db_world/2023_06_17_05.sql} | 1 + .../rev_1686519678664565811.sql => db_world/2023_06_17_06.sql} | 1 + .../rev_1686872651542486500.sql => db_world/2023_06_17_07.sql} | 1 + .../rev_1686942698941660200.sql => db_world/2023_06_17_08.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1685926790862483900.sql => db_world/2023_06_17_05.sql} (86%) rename data/sql/updates/{pending_db_world/rev_1686519678664565811.sql => db_world/2023_06_17_06.sql} (77%) rename data/sql/updates/{pending_db_world/rev_1686872651542486500.sql => db_world/2023_06_17_07.sql} (95%) rename data/sql/updates/{pending_db_world/rev_1686942698941660200.sql => db_world/2023_06_17_08.sql} (78%) diff --git a/data/sql/updates/pending_db_world/rev_1685926790862483900.sql b/data/sql/updates/db_world/2023_06_17_05.sql similarity index 86% rename from data/sql/updates/pending_db_world/rev_1685926790862483900.sql rename to data/sql/updates/db_world/2023_06_17_05.sql index a6981dff0..4d38dbc2f 100644 --- a/data/sql/updates/pending_db_world/rev_1685926790862483900.sql +++ b/data/sql/updates/db_world/2023_06_17_05.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_04 -> 2023_06_17_05 -- Fix Disable LOS from the Spell 26522 (Lunar Fortune) -- DELETE FROM `disables` WHERE `sourceType`=0 AND `entry`=26522; INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES (0, 26522, 64, '', '', 'Disable LOS for Lunar Fortune'); diff --git a/data/sql/updates/pending_db_world/rev_1686519678664565811.sql b/data/sql/updates/db_world/2023_06_17_06.sql similarity index 77% rename from data/sql/updates/pending_db_world/rev_1686519678664565811.sql rename to data/sql/updates/db_world/2023_06_17_06.sql index a066e09da..bb927d3c1 100644 --- a/data/sql/updates/pending_db_world/rev_1686519678664565811.sql +++ b/data/sql/updates/db_world/2023_06_17_06.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_05 -> 2023_06_17_06 -- UPDATE `quest_template` SET `AllowableRaces` = 1101 WHERE `ID` IN (9494, 9492); UPDATE `quest_template` SET `AllowableRaces` = 690 WHERE `ID` = 9495; diff --git a/data/sql/updates/pending_db_world/rev_1686872651542486500.sql b/data/sql/updates/db_world/2023_06_17_07.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1686872651542486500.sql rename to data/sql/updates/db_world/2023_06_17_07.sql index 537d836c5..3b8601fdd 100644 --- a/data/sql/updates/pending_db_world/rev_1686872651542486500.sql +++ b/data/sql/updates/db_world/2023_06_17_07.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_06 -> 2023_06_17_07 -- DELETE FROM `smart_scripts` WHERE `entryorguid`=173 AND `source_type`=2; INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1686942698941660200.sql b/data/sql/updates/db_world/2023_06_17_08.sql similarity index 78% rename from data/sql/updates/pending_db_world/rev_1686942698941660200.sql rename to data/sql/updates/db_world/2023_06_17_08.sql index 4631778b1..13e1e46ed 100644 --- a/data/sql/updates/pending_db_world/rev_1686942698941660200.sql +++ b/data/sql/updates/db_world/2023_06_17_08.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_07 -> 2023_06_17_08 -- UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|1|2|8|16|64|1024|2048|4096|8192|65536|8388608|536870912 WHERE `entry`=22930; From 801dcf809755712bc2f689e52eb9b179388a625a Mon Sep 17 00:00:00 2001 From: KJack Date: Sat, 17 Jun 2023 10:39:56 -0400 Subject: [PATCH 22/30] fix(DB/SAI) Zul'Farrak: make Antu'sul (8127) despawn his summoned adds (8156) when reset (#16361) * ZF: Antu'sul now properly despawns his adds when reset * Bring SQL up to AC standards. --- .../rev_1684908860029011348.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1684908860029011348.sql diff --git a/data/sql/updates/pending_db_world/rev_1684908860029011348.sql b/data/sql/updates/pending_db_world/rev_1684908860029011348.sql new file mode 100644 index 000000000..2b6d3bed6 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1684908860029011348.sql @@ -0,0 +1,17 @@ +-- +-- Antu'Sul (Zul'Farrak) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 8127); +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 +(8127, 0, 0, 0, 0, 0, 75, 0, 5000, 5000, 17000, 17000, 0, 11, 8376, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - In Combat - Cast Earthgrab Totem'), +(8127, 0, 1, 0, 0, 0, 75, 0, 13000, 13000, 17000, 17000, 0, 11, 11899, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - In Combat - Cast Healing Ward'), +(8127, 0, 2, 3, 4, 0, 100, 0, 0, 0, 0, 0, 0, 11, 11894, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - On Aggro - Cast Antu\'sul\'s Minion'), +(8127, 0, 3, 0, 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, 'Antu\'sul - On Aggro - Say Line 1'), +(8127, 0, 4, 0, 0, 0, 100, 0, 5000, 5000, 12000, 14000, 0, 11, 16006, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - In Combat - Cast Chain Lightning'), +(8127, 0, 5, 0, 0, 0, 100, 0, 3000, 3000, 9000, 11000, 0, 11, 15501, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - In Combat - Cast Earth Shock'), +(8127, 0, 6, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - On Data Set 1 1 - Start Attacking'), +(8127, 0, 7, 8, 2, 0, 100, 1, 0, 75, 0, 0, 0, 11, 11894, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - Between 0-75% Health - Cast Antu\'sul\'s Minion'), +(8127, 0, 8, 0, 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, 'Antu\'sul - Between 0-75% Health - Say Line 2'), +(8127, 0, 9, 10, 2, 0, 100, 1, 0, 25, 0, 0, 0, 11, 11894, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - Between 0-25% Health - Cast Antu\'sul\'s Minion'), +(8127, 0, 10, 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, 'Antu\'sul - Between 0-25% Health - Say Line 0'), +(8127, 0, 11, 0, 2, 0, 100, 1, 0, 20, 0, 0, 0, 11, 11895, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Antu\'sul - Between 0-20% Health - Cast Healing Wave of Antu\'sul'), +(8127, 0, 12, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 9, 8156, 0, 500, 1, 0, 0, 0, 0, 'Antu\'sul - On Reset - Despawn Summons'); From 875eb8d29f24a25bc977111b07703a659a76b1d3 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 17 Jun 2023 14:42:29 +0000 Subject: [PATCH 23/30] chore(DB): import pending files Referenced commit(s): 801dcf809755712bc2f689e52eb9b179388a625a --- .../rev_1684908860029011348.sql => db_world/2023_06_17_09.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1684908860029011348.sql => db_world/2023_06_17_09.sql} (98%) diff --git a/data/sql/updates/pending_db_world/rev_1684908860029011348.sql b/data/sql/updates/db_world/2023_06_17_09.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1684908860029011348.sql rename to data/sql/updates/db_world/2023_06_17_09.sql index 2b6d3bed6..3d5fb622e 100644 --- a/data/sql/updates/pending_db_world/rev_1684908860029011348.sql +++ b/data/sql/updates/db_world/2023_06_17_09.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_08 -> 2023_06_17_09 -- -- Antu'Sul (Zul'Farrak) DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 8127); From 06be1c7a594e0932079303d5ef8b3706c45e3ab6 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Sat, 17 Jun 2023 13:03:29 -0600 Subject: [PATCH 24/30] fix(DB/Quest): Change quest requirement for "The Troll Cave" (#16572) init --- data/sql/updates/pending_db_world/rev_1687026584471372200.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1687026584471372200.sql diff --git a/data/sql/updates/pending_db_world/rev_1687026584471372200.sql b/data/sql/updates/pending_db_world/rev_1687026584471372200.sql new file mode 100644 index 000000000..aee8191aa --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1687026584471372200.sql @@ -0,0 +1,3 @@ +-- +UPDATE `quest_template` SET `RequiredNpcOrGoCount1`=10 WHERE `ID`=182; + From 704d70043aee6fd59acad2c0c767b33767bde05b Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 17 Jun 2023 19:06:04 +0000 Subject: [PATCH 25/30] chore(DB): import pending files Referenced commit(s): 06be1c7a594e0932079303d5ef8b3706c45e3ab6 --- .../rev_1687026584471372200.sql => db_world/2023_06_17_10.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1687026584471372200.sql => db_world/2023_06_17_10.sql} (63%) diff --git a/data/sql/updates/pending_db_world/rev_1687026584471372200.sql b/data/sql/updates/db_world/2023_06_17_10.sql similarity index 63% rename from data/sql/updates/pending_db_world/rev_1687026584471372200.sql rename to data/sql/updates/db_world/2023_06_17_10.sql index aee8191aa..614958499 100644 --- a/data/sql/updates/pending_db_world/rev_1687026584471372200.sql +++ b/data/sql/updates/db_world/2023_06_17_10.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_09 -> 2023_06_17_10 -- UPDATE `quest_template` SET `RequiredNpcOrGoCount1`=10 WHERE `ID`=182; From f0c724559e8794110f0ea0c25dcc195d048a4d18 Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Sat, 17 Jun 2023 19:15:42 +0000 Subject: [PATCH 26/30] fix(DB/Creature): Set level of Durnholde Mage in OHF heroic appropriate for heroic (#16563) * Create rev_1686948961677753100.sql * Create rev_1686949481728636000.sql * Delete rev_1686948961677753100.sql --- data/sql/updates/pending_db_world/rev_1686949481728636000.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1686949481728636000.sql diff --git a/data/sql/updates/pending_db_world/rev_1686949481728636000.sql b/data/sql/updates/pending_db_world/rev_1686949481728636000.sql new file mode 100644 index 000000000..aea4ffade --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1686949481728636000.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `minlevel` = 71, `maxlevel` = 71 WHERE (`entry` = 20525); From 286125162080a53641847ad21ceb5fb72c0a2d6d Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Sat, 17 Jun 2023 13:16:08 -0600 Subject: [PATCH 27/30] fix(DB/Creature): Make "Ambient Minion of Terokk" not selectable (#16569) init --- data/sql/updates/pending_db_world/rev_1687016239956745200.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1687016239956745200.sql diff --git a/data/sql/updates/pending_db_world/rev_1687016239956745200.sql b/data/sql/updates/pending_db_world/rev_1687016239956745200.sql new file mode 100644 index 000000000..166ae8f1a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1687016239956745200.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `unit_flags` = `unit_flags`|33554432 WHERE `entry`=22380; + From 908dee776eaf0a7af188a03737205e28723b7022 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 17 Jun 2023 19:18:56 +0000 Subject: [PATCH 28/30] chore(DB): import pending files Referenced commit(s): 286125162080a53641847ad21ceb5fb72c0a2d6d --- .../rev_1686949481728636000.sql => db_world/2023_06_17_11.sql} | 1 + .../rev_1687016239956745200.sql => db_world/2023_06_17_12.sql} | 1 + 2 files changed, 2 insertions(+) rename data/sql/updates/{pending_db_world/rev_1686949481728636000.sql => db_world/2023_06_17_11.sql} (67%) rename data/sql/updates/{pending_db_world/rev_1687016239956745200.sql => db_world/2023_06_17_12.sql} (67%) diff --git a/data/sql/updates/pending_db_world/rev_1686949481728636000.sql b/data/sql/updates/db_world/2023_06_17_11.sql similarity index 67% rename from data/sql/updates/pending_db_world/rev_1686949481728636000.sql rename to data/sql/updates/db_world/2023_06_17_11.sql index aea4ffade..891cd97d1 100644 --- a/data/sql/updates/pending_db_world/rev_1686949481728636000.sql +++ b/data/sql/updates/db_world/2023_06_17_11.sql @@ -1,2 +1,3 @@ +-- DB update 2023_06_17_10 -> 2023_06_17_11 -- UPDATE `creature_template` SET `minlevel` = 71, `maxlevel` = 71 WHERE (`entry` = 20525); diff --git a/data/sql/updates/pending_db_world/rev_1687016239956745200.sql b/data/sql/updates/db_world/2023_06_17_12.sql similarity index 67% rename from data/sql/updates/pending_db_world/rev_1687016239956745200.sql rename to data/sql/updates/db_world/2023_06_17_12.sql index 166ae8f1a..e41f8604e 100644 --- a/data/sql/updates/pending_db_world/rev_1687016239956745200.sql +++ b/data/sql/updates/db_world/2023_06_17_12.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_11 -> 2023_06_17_12 -- UPDATE `creature_template` SET `unit_flags` = `unit_flags`|33554432 WHERE `entry`=22380; From ab3982b65968bc0106437385c54df1b73f63f412 Mon Sep 17 00:00:00 2001 From: Eddy Vega <61223313+Si1ker@users.noreply.github.com> Date: Sat, 17 Jun 2023 18:00:24 -0600 Subject: [PATCH 29/30] fix(DB/Creature): Make 'Grandmaster Vorpil' not interruptible (#16577) * init * . * . --- data/sql/updates/pending_db_world/rev_1687040404660689100.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1687040404660689100.sql diff --git a/data/sql/updates/pending_db_world/rev_1687040404660689100.sql b/data/sql/updates/pending_db_world/rev_1687040404660689100.sql new file mode 100644 index 000000000..4bb1579d8 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1687040404660689100.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|33554432 WHERE `entry` IN (18732,20653); + From 8a01b194b12736b12da2a7180d74d0a221aeba73 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sun, 18 Jun 2023 00:02:53 +0000 Subject: [PATCH 30/30] chore(DB): import pending files Referenced commit(s): ab3982b65968bc0106437385c54df1b73f63f412 --- .../rev_1687040404660689100.sql => db_world/2023_06_18_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1687040404660689100.sql => db_world/2023_06_18_00.sql} (73%) diff --git a/data/sql/updates/pending_db_world/rev_1687040404660689100.sql b/data/sql/updates/db_world/2023_06_18_00.sql similarity index 73% rename from data/sql/updates/pending_db_world/rev_1687040404660689100.sql rename to data/sql/updates/db_world/2023_06_18_00.sql index 4bb1579d8..3ce2979b9 100644 --- a/data/sql/updates/pending_db_world/rev_1687040404660689100.sql +++ b/data/sql/updates/db_world/2023_06_18_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_06_17_12 -> 2023_06_18_00 -- UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|33554432 WHERE `entry` IN (18732,20653);