sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/HallowsEnd): Fixed starting "Let the fires come" event. (#13487)

Browse Source 
Fixes #13440
Fixes #13441
This commit is contained in:
UltraNix
2022-10-23 17:04:55 +02:00
committed by GitHub
parent 55a5684c87
commit dbd785593d
2 changed files with 107 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1666431872120651800.sql
+2
View File
@@ -0,0 +1,2 @@
--
UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00000200 WHERE `entry`=23543;
src/server/scripts/Events/hallows_end.cpp
+105 -104
View File
@@ -233,8 +233,6 @@ enum costumedOrphan
// Actions // Actions
ACTION_START_EVENT = 1, ACTION_START_EVENT = 1,
DATA_EVENT = 1,
DATA_ALLOW_START = 2,
// Talks // Talks
TALK_SHADE_CONFLAGRATION = 0, TALK_SHADE_CONFLAGRATION = 0,
@@ -323,7 +321,7 @@ class spell_hallows_end_base_fire : public AuraScript
struct npc_costumed_orphan_matron : public ScriptedAI struct npc_costumed_orphan_matron : public ScriptedAI
{ {
npc_costumed_orphan_matron(Creature* c) : ScriptedAI(c) { } npc_costumed_orphan_matron(Creature* c) : ScriptedAI(c) {}
uint32 eventStarted; uint32 eventStarted;
bool allowQuest; bool allowQuest;
@@ -340,48 +338,48 @@ struct npc_costumed_orphan_matron : public ScriptedAI
{ {
switch (me->GetAreaId()) switch (me->GetAreaId())
{ {
case 87: // Goldshire case 87: // Goldshire
x = -9494.4f; x = -9494.4f;
y = 48.53f; y = 48.53f;
z = 70.5f; z = 70.5f;
o = 0.5f; o = 0.5f;
path = 235431; path = 235431;
break; break;
case 131: // Kharanos case 131: // Kharanos
x = -5558.34f; x = -5558.34f;
y = -499.46f; y = -499.46f;
z = 414.12f; z = 414.12f;
o = 2.08f; o = 2.08f;
path = 235432; path = 235432;
break; break;
case 3576: // Azure Watch case 3576: // Azure Watch
x = -4163.58f; x = -4163.58f;
y = -12460.30f; y = -12460.30f;
z = 63.02f; z = 63.02f;
o = 4.31f; o = 4.31f;
path = 235433; path = 235433;
break; break;
case 362: // Razor Hill case 362: // Razor Hill
x = 373.2f; x = 373.2f;
y = -4723.4f; y = -4723.4f;
z = 31.2f; z = 31.2f;
o = 3.2f; o = 3.2f;
path = 235434; path = 235434;
break; break;
case 159: // Brill case 159: // Brill
x = 2195.2f; x = 2195.2f;
y = 264.0f; y = 264.0f;
z = 55.62f; z = 55.62f;
o = 0.15f; o = 0.15f;
path = 235435; path = 235435;
break; break;
case 3665: // Falcon Wing Square case 3665: // Falcon Wing Square
x = 9547.91f; x = 9547.91f;
y = -6809.9f; y = -6809.9f;
z = 27.96f; z = 27.96f;
o = 3.4f; o = 3.4f;
path = 235436; path = 235436;
break; break;
} }
} }
@@ -403,14 +401,6 @@ struct npc_costumed_orphan_matron : public ScriptedAI
} }
} }
uint32 GetData(uint32 param) const override
{
if (param == DATA_ALLOW_START)
return allowQuest;
return 0;
}
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if (eventStarted) if (eventStarted)
@@ -423,67 +413,78 @@ struct npc_costumed_orphan_matron : public ScriptedAI
} }
} }
} }
};
bool OnGossipHello(Player* player, Creature* creature) void sGossipHello(Player* player) override
{
QuestRelationBounds pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(creature->GetEntry());
QuestRelationBounds pObjectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(creature->GetEntry());
QuestMenu& qm = player->PlayerTalkClass->GetQuestMenu();
qm.ClearMenu();
for (QuestRelations::const_iterator i = pObjectQIR.first; i != pObjectQIR.second; ++i)
{ {
uint32 quest_id = i->second; QuestRelationBounds pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(me->GetEntry());
QuestStatus status = player->GetQuestStatus(quest_id); QuestRelationBounds pObjectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(me->GetEntry());
if (status == QUEST_STATUS_COMPLETE)
qm.AddMenuItem(quest_id, 4);
else if (status == QUEST_STATUS_INCOMPLETE)
qm.AddMenuItem(quest_id, 4);
}
for (QuestRelations::const_iterator i = pObjectQR.first; i != pObjectQR.second; ++i) QuestMenu& qm = player->PlayerTalkClass->GetQuestMenu();
{ qm.ClearMenu();
uint32 quest_id = i->second;
Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id);
if (!pQuest)
continue;
if (!player->CanTakeQuest(pQuest, false)) for (QuestRelations::const_iterator i = pObjectQIR.first; i != pObjectQIR.second; ++i)
continue;
else if (player->GetQuestStatus(quest_id) == QUEST_STATUS_NONE)
{ {
switch (quest_id) uint32 quest_id = i->second;
QuestStatus status = player->GetQuestStatus(quest_id);
if (status == QUEST_STATUS_COMPLETE)
{ {
case QUEST_LET_THE_FIRES_COME_A: qm.AddMenuItem(quest_id, 4);
case QUEST_LET_THE_FIRES_COME_H: }
if (!creature->AI()->GetData(DATA_ALLOW_START)) else if (status == QUEST_STATUS_INCOMPLETE)
qm.AddMenuItem(quest_id, 2); {
break; qm.AddMenuItem(quest_id, 4);
case QUEST_STOP_THE_FIRES_A:
case QUEST_STOP_THE_FIRES_H:
if (creature->AI()->GetData(DATA_ALLOW_START))
qm.AddMenuItem(quest_id, 2);
break;
default:
qm.AddMenuItem(quest_id, 2);
break;
} }
} }
for (QuestRelations::const_iterator i = pObjectQR.first; i != pObjectQR.second; ++i)
{
uint32 quest_id = i->second;
Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id);
if (!pQuest)
{
continue;
}
if (!player->CanTakeQuest(pQuest, false))
{
continue;
}
else if (player->GetQuestStatus(quest_id) == QUEST_STATUS_NONE)
{
switch (quest_id)
{
case QUEST_LET_THE_FIRES_COME_A:
case QUEST_LET_THE_FIRES_COME_H:
if (!allowQuest)
{
qm.AddMenuItem(quest_id, 2);
}
break;
case QUEST_STOP_THE_FIRES_A:
case QUEST_STOP_THE_FIRES_H:
if (allowQuest)
{
qm.AddMenuItem(quest_id, 2);
}
break;
default:
qm.AddMenuItem(quest_id, 2);
break;
}
}
}
player->SendPreparedQuest(me->GetGUID());
} }
player->SendPreparedQuest(creature->GetGUID()); void sQuestAccept(Player* /*player*/, Quest const* quest) override
return true; {
} if ((quest->GetQuestId() == QUEST_LET_THE_FIRES_COME_A || quest->GetQuestId() == QUEST_LET_THE_FIRES_COME_H) && !allowQuest)
{
bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) DoAction(ACTION_START_EVENT);
{ }
if ((quest->GetQuestId() == QUEST_LET_THE_FIRES_COME_A || quest->GetQuestId() == QUEST_LET_THE_FIRES_COME_H) && !creature->AI()->GetData(DATA_ALLOW_START)) }
creature->AI()->DoAction(ACTION_START_EVENT); };
return true;
}
struct npc_soh_fire_trigger : public NullCreatureAI struct npc_soh_fire_trigger : public NullCreatureAI
{ {