public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2023-09-05 00:13:44 +08:00
parent cc4ac0ab57 cacb32f423
commit 28fcb40b88
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
View File

@@ -53,7 +53,7 @@ struct boss_maiden_of_virtue : public BossAI
DoCastAOE(SPELL_HOLY_GROUND, true); DoCastAOE(SPELL_HOLY_GROUND, true);
scheduler.Schedule(25s, [this](TaskContext context) scheduler.Schedule(25s, [this](TaskContext context)
{ {
DoCastAOE(SPELL_REPENTANCE, true); DoCastAOE(SPELL_REPENTANCE);
Talk(SAY_REPENTANCE); Talk(SAY_REPENTANCE);
context.Repeat(25s, 35s); context.Repeat(25s, 35s);
}).Schedule(8s, [this](TaskContext context) }).Schedule(8s, [this](TaskContext context)

1
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
View File

@@ -838,6 +838,7 @@ struct boss_bigbadwolf : public ScriptedAI
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {
instance->DoUseDoorOrButton(instance->GetGuidData(DATA_GO_STAGEDOORLEFT));
Talk(SAY_WOLF_AGGRO); Talk(SAY_WOLF_AGGRO);
DoZoneInCombat(); DoZoneInCombat();

21
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
View File

@@ -69,6 +69,14 @@ enum Misc
OZ_GOSSIP2_OID = 0, 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_GOSSIP1 "[GM] Change event to EVENT_OZ"
#define OZ_GM_GOSSIP2 "[GM] Change event to EVENT_HOOD" #define OZ_GM_GOSSIP2 "[GM] Change event to EVENT_HOOD"
#define OZ_GM_GOSSIP3 "[GM] Change event to EVENT_RAJ" #define OZ_GM_GOSSIP3 "[GM] Change event to EVENT_RAJ"
@@ -192,7 +200,10 @@ public:
} }
break; break;
case 8: 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; PerformanceReady = true;
break; break;
case 9: case 9:
@@ -341,7 +352,7 @@ public:
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
AddGossipItemFor(player, OZ_GOSSIP2_MID, OZ_GOSSIP2_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); 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; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
CloseGossipMenuFor(player); CloseGossipMenuFor(player);
@@ -383,16 +394,16 @@ public:
if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI())) if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()))
{ {
if (!pBarnesAI->RaidWiped) if (!pBarnesAI->RaidWiped)
SendGossipMenuFor(player, 8970, creature->GetGUID()); SendGossipMenuFor(player, BARNES_TEXT_IS_READY, creature->GetGUID());
else else
SendGossipMenuFor(player, 8975, creature->GetGUID()); SendGossipMenuFor(player, BARNES_TEXT_WIPED, creature->GetGUID());
return true; return true;
} }
} }
} }
SendGossipMenuFor(player, 8978, creature->GetGUID()); SendGossipMenuFor(player, BARNES_TEXT_NOT_READY, creature->GetGUID());
return true; return true;
} }