From dcff70c935309947f8a41ea75198a1ca74a48665 Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Mon, 8 Apr 2024 01:29:59 +0200 Subject: [PATCH 1/5] fix(Scripts/TheEye): increase Void Reaver boundary so he does not reset when tanked against the wall (#18683) * Update instance_the_eye.cpp * increase range --- src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 835e9e9b2..5164b994d 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -45,7 +45,7 @@ DoorData const doorData[] = BossBoundaryData const boundaries = { - { DATA_REAVER, new CircleBoundary(Position(432.741809f, 371.859589f), 105.052554f) }, + { DATA_REAVER, new CircleBoundary(Position(432.741809f, 371.8595890f), 115.0f) }, { DATA_ALAR, new CircleBoundary(Position(331.000000f, -2.38000000f), 108.29246f) }, { DATA_ASTROMANCER, new CircleBoundary(Position(432.869202f, -374.213806f), 103.74374f) } }; From e701f3c615bc4d47ddf9d801c165a148c9f1dff8 Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Mon, 8 Apr 2024 01:30:19 +0200 Subject: [PATCH 2/5] fix(DB/Hyjal): weird loot format for Archimonde (#18682) Create archi_loot_fix.sql --- data/sql/updates/pending_db_world/archi_loot_fix.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/archi_loot_fix.sql diff --git a/data/sql/updates/pending_db_world/archi_loot_fix.sql b/data/sql/updates/pending_db_world/archi_loot_fix.sql new file mode 100644 index 000000000..811511733 --- /dev/null +++ b/data/sql/updates/pending_db_world/archi_loot_fix.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `creature_loot_template` WHERE `Entry` = 17968 AND `Item` = 190068; +UPDATE `creature_loot_template` SET `MaxCount` = 3 WHERE `Entry` = 17968 AND `Item` = 34068; From b80dc095d3026966f057e84326ca87ca0c9507cc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 7 Apr 2024 23:30:49 +0000 Subject: [PATCH 3/5] chore(DB): import pending files Referenced commit(s): dcff70c935309947f8a41ea75198a1ca74a48665 --- .../archi_loot_fix.sql => db_world/2024_04_07_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/archi_loot_fix.sql => db_world/2024_04_07_00.sql} (80%) diff --git a/data/sql/updates/pending_db_world/archi_loot_fix.sql b/data/sql/updates/db_world/2024_04_07_00.sql similarity index 80% rename from data/sql/updates/pending_db_world/archi_loot_fix.sql rename to data/sql/updates/db_world/2024_04_07_00.sql index 811511733..ac0751da2 100644 --- a/data/sql/updates/pending_db_world/archi_loot_fix.sql +++ b/data/sql/updates/db_world/2024_04_07_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_04_03_01 -> 2024_04_07_00 -- DELETE FROM `creature_loot_template` WHERE `Entry` = 17968 AND `Item` = 190068; UPDATE `creature_loot_template` SET `MaxCount` = 3 WHERE `Entry` = 17968 AND `Item` = 34068; From 39b94880dbec8881eaa9a1f4c3414cba2cf98089 Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Mon, 8 Apr 2024 01:32:28 +0200 Subject: [PATCH 4/5] fix(Scripts/Hyjal): make sure Jaina takes no damage from Death and Decay (#18680) init --- .../CavernsOfTime/BattleForMountHyjal/hyjal.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 9768ba034..49d5b34cd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -70,7 +70,10 @@ enum Spells SPELL_FROST_BREATH = 31688, // Fel Stalker - SPELL_MANA_BURN = 31729 + SPELL_MANA_BURN = 31729, + + // Misc + SPELL_DEATH_AND_DECAY = 31258 }; enum Talk @@ -98,7 +101,10 @@ public: } struct hyjalJainaAI : public ScriptedAI { - hyjalJainaAI(Creature* creature) : ScriptedAI(creature) { } + hyjalJainaAI(Creature* creature) : ScriptedAI(creature) + { + me->ApplySpellImmune(SPELL_DEATH_AND_DECAY, IMMUNITY_ID, SPELL_DEATH_AND_DECAY, true); + } void Reset() override { From 4199cb8ce0603274d9ae6d3996bb129ea000738b Mon Sep 17 00:00:00 2001 From: Letic92 Date: Tue, 9 Apr 2024 21:09:55 +0200 Subject: [PATCH 5/5] (Scripts/Ahnkahet): Fixed problem gathering GUIDS from bosses. (#18689) --- .../scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h | 2 +- .../Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp | 2 +- .../AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp | 4 ++-- .../Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp | 8 ++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h index 13479f0d6..ef352c14b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h @@ -40,7 +40,7 @@ enum AhnKahetCreatures NPC_ELDER_NADOX = 29309, NPC_PRINCE_TALDARAM = 29308, NPC_JEDOGA_SHADOWSEEKER = 29310, - NPC_HERALD_JOLAZJ = 29311, + NPC_HERALD_VOLAZJ = 29311, NPC_AMANITAR = 30258, // Teldaram and Jedoga encounter related NPC_JEDOGA_CONTROLLER = 30181, diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index 6dcd6128e..ff7b04141 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -73,7 +73,7 @@ enum Yells struct boss_elder_nadox : public BossAI { - boss_elder_nadox(Creature* creature) : BossAI(creature, DATA_PRINCE_TALDARAM), + boss_elder_nadox(Creature* creature) : BossAI(creature, DATA_ELDER_NADOX), guardianSummoned(false), respectYourElders(true) { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 6e105c38a..6bd5244fe 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -641,7 +641,7 @@ struct npc_twilight_volunteer : public ScriptedAI } else if (id == POINT_RITUAL) { - if (Creature* jedoga = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_JEDOGA_SHADOWSEEKER))) + if (Creature* jedoga = pInstance->GetCreature(DATA_JEDOGA_SHADOWSEEKER)) { jedoga->AI()->Talk(SAY_SACRIFICE_2); jedoga->CastSpell(nullptr, SPELL_SACRIFICE_BEAM); /// @todo: Visual is not working. (cosmetic) @@ -665,7 +665,7 @@ struct npc_twilight_volunteer : public ScriptedAI me->SetWalk(true); me->GetMotionMaster()->MovePoint(POINT_RITUAL, JedogaPosition[2], false); - if (Creature* jedoga = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_JEDOGA_SHADOWSEEKER))) + if (Creature* jedoga = pInstance->GetCreature(DATA_JEDOGA_SHADOWSEEKER)) { if (Creature* ritualTrigger = jedoga->SummonCreature(NPC_JEDOGA_CONTROLLER, JedogaPosition[2], TEMPSUMMON_TIMED_DESPAWN, 15000)) { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 461514dfb..8b7264421 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -24,8 +24,12 @@ ObjectData const creatureData[] = { - { NPC_PRINCE_TALDARAM, DATA_PRINCE_TALDARAM }, - { 0, 0 } + { NPC_PRINCE_TALDARAM, DATA_PRINCE_TALDARAM }, + { NPC_JEDOGA_SHADOWSEEKER, DATA_JEDOGA_SHADOWSEEKER }, + { NPC_ELDER_NADOX, DATA_ELDER_NADOX }, + { NPC_HERALD_VOLAZJ, DATA_HERALD_VOLAZJ }, + { NPC_AMANITAR, DATA_AMANITAR }, + { 0, 0 } }; DoorData const doorData[] =