From 4ce43d3f1f0d6d701e675825fce25ca2e90eb44f Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Sun, 3 Sep 2023 09:43:16 -0300 Subject: [PATCH 1/3] =?UTF-8?q?fix(Scripts/Karazhan):=20Maiden=20of=20Virt?= =?UTF-8?q?ue=20repentance=20should=20have=20a=20cast=E2=80=A6=20(#17153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Scripts/Karazhan): Maiden of Virtue repentance should have a cast time --- .../scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 6885556f3..353b669e5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -53,7 +53,7 @@ struct boss_maiden_of_virtue : public BossAI DoCastAOE(SPELL_HOLY_GROUND, true); scheduler.Schedule(25s, [this](TaskContext context) { - DoCastAOE(SPELL_REPENTANCE, true); + DoCastAOE(SPELL_REPENTANCE); Talk(SAY_REPENTANCE); context.Repeat(25s, 35s); }).Schedule(8s, [this](TaskContext context) From 4886dac9632961a248ecaa9690f018d0599445f6 Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Sun, 3 Sep 2023 14:44:13 +0200 Subject: [PATCH 2/3] fix(Scripts/Karazhan): make it so door closes when Big Bad Wolf is engaged in Little Red Riding Hood in the Opera (#17172) * initial * not a boolean --- src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp | 1 + src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 8f1ebd1ae..3753a61bc 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -838,6 +838,7 @@ struct boss_bigbadwolf : public ScriptedAI void JustEngagedWith(Unit* /*who*/) override { + instance->DoUseDoorOrButton(instance->GetGuidData(DATA_GO_STAGEDOORLEFT)); Talk(SAY_WOLF_AGGRO); DoZoneInCombat(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 46353f760..144f0c195 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -192,7 +192,10 @@ public: } break; case 8: - instance->DoUseDoorOrButton(instance->GetGuidData(DATA_GO_STAGEDOORLEFT)); + if (m_uiEventId != EVENT_HOOD) // in red riding hood door should close when gossip with grandma is over + { + instance->DoUseDoorOrButton(instance->GetGuidData(DATA_GO_STAGEDOORLEFT)); + } PerformanceReady = true; break; case 9: From cacb32f4232f6ca011c43e01316100b7ad2c3b8d Mon Sep 17 00:00:00 2001 From: Dan <83884799+elthehablo@users.noreply.github.com> Date: Sun, 3 Sep 2023 14:44:43 +0200 Subject: [PATCH 3/3] fix(Scripts/Karazhan): change to right gossip menu for Barnes (#17151) * initial * make sense of ids --- .../EasternKingdoms/Karazhan/karazhan.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 144f0c195..cbe5a9998 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -69,6 +69,14 @@ enum Misc OZ_GOSSIP2_OID = 0, }; +enum NPCTexts +{ + BARNES_TEXT_NOT_READY = 8969, + BARNES_TEXT_IS_READY = 8970, + BARNES_TEXT_IS_READY2 = 8971, + BARNES_TEXT_WIPED = 8975 +}; + #define OZ_GM_GOSSIP1 "[GM] Change event to EVENT_OZ" #define OZ_GM_GOSSIP2 "[GM] Change event to EVENT_HOOD" #define OZ_GM_GOSSIP3 "[GM] Change event to EVENT_RAJ" @@ -344,7 +352,7 @@ public: { case GOSSIP_ACTION_INFO_DEF+1: AddGossipItemFor(player, OZ_GOSSIP2_MID, OZ_GOSSIP2_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - SendGossipMenuFor(player, 8971, creature->GetGUID()); + SendGossipMenuFor(player, BARNES_TEXT_IS_READY2, creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: CloseGossipMenuFor(player); @@ -386,16 +394,16 @@ public: if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI())) { if (!pBarnesAI->RaidWiped) - SendGossipMenuFor(player, 8970, creature->GetGUID()); + SendGossipMenuFor(player, BARNES_TEXT_IS_READY, creature->GetGUID()); else - SendGossipMenuFor(player, 8975, creature->GetGUID()); + SendGossipMenuFor(player, BARNES_TEXT_WIPED, creature->GetGUID()); return true; } } } - SendGossipMenuFor(player, 8978, creature->GetGUID()); + SendGossipMenuFor(player, BARNES_TEXT_NOT_READY, creature->GetGUID()); return true; }