fix(DB/Scripts): CoS Brandon Eiredeck and citizens now talk (#24043)

Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
Co-authored-by: sudlud <sudlud@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-03-22 16:42:09 -05:00
committed by GitHub
parent fa9f28309b
commit 985b5922b9
2 changed files with 43 additions and 0 deletions

View File

@@ -175,6 +175,10 @@ enum Misc
ACTION_FORCE_CHANGE_LOCK = 2,
POINT_CHRONOS = 1,
// Brandon Eiredeck crowd
NPC_BRANDON_EIREDECK = 31023,
SAY_BRANDON_CROWD_AMBIENT = 3,
};
enum Events
@@ -1521,12 +1525,17 @@ public:
pInstance = me->GetInstanceScript();
if (!pInstance || pInstance->GetData(DATA_ARTHAS_EVENT) < COS_PROGRESS_FINISHED_CITY_INTRO)
allowTimer++;
isBrandonCrowd = me->GetDistance(2267.86f, 1144.93f, 138.403f) < 10.0f;
ambientTalkTimer = isBrandonCrowd ? urand(5000, 15000) : 0;
}
bool locked;
uint32 changeTimer;
InstanceScript* pInstance;
uint32 allowTimer;
bool isBrandonCrowd;
uint32 ambientTalkTimer;
void Reset() override
{
@@ -1587,6 +1596,19 @@ public:
{
ScriptedAI::UpdateAI(diff);
if (isBrandonCrowd && ambientTalkTimer)
{
if (ambientTalkTimer <= diff)
{
Talk(SAY_BRANDON_CROWD_AMBIENT);
ambientTalkTimer = urand(15000, 25000);
}
else
ambientTalkTimer -= diff;
return;
}
if (allowTimer)
{
allowTimer += diff;