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

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-10-24 08:50:01 -06:00
committed by GitHub
parent e0b905aef7 c54d56c7d0
commit b68c3a733a
10 changed files with 139 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/db_world/2022_10_23_00.sql
+9
View File
@@ -0,0 +1,9 @@
-- DB update 2022_10_22_00 -> 2022_10_23_00
--
UPDATE `quest_template_addon` SET `PrevQuestId`=0, `ExclusiveGroup`=11361 WHERE `Id`=11361;
UPDATE `quest_template_addon` SET `PrevQuestId`=0, `ExclusiveGroup`=11361 WHERE `Id`=11449;
UPDATE `quest_template_addon` SET `PrevQuestId`=0, `ExclusiveGroup`=11361 WHERE `Id`=11450;
UPDATE `quest_template_addon` SET `PrevQuestId`=0, `ExclusiveGroup`=11360 WHERE `Id`=11360;
UPDATE `quest_template_addon` SET `PrevQuestId`=0, `ExclusiveGroup`=11360 WHERE `Id`=11439;
UPDATE `quest_template_addon` SET `PrevQuestId`=0, `ExclusiveGroup`=11360 WHERE `Id`=11440;
data/sql/updates/db_world/2022_10_23_01.sql
+3
View File
@@ -0,0 +1,3 @@
-- DB update 2022_10_23_00 -> 2022_10_23_01
--
UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00000200 WHERE `entry`=23543;
data/sql/updates/db_world/2022_10_23_02.sql
+3
View File
@@ -0,0 +1,3 @@
-- DB update 2022_10_23_01 -> 2022_10_23_02
--
UPDATE `creature_template` SET `flags_extra`=2 WHERE `entry`=37915;
src/server/game/Entities/Unit/Unit.cpp
+8 -2
View File
@@ -17481,10 +17481,16 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit* victim, Aura* aura, WeaponAttackTyp
// Xinef: additional check for player auras - only player spells can trigger player proc auras // Xinef: additional check for player auras - only player spells can trigger player proc auras
// Xinef: skip victim auras // Xinef: skip victim auras
// Excluded player shoot spells // Excluded player shoot spells
if (!isVictim && GetTypeId() == TYPEID_PLAYER) //spellProto->SpellFamilyName != SPELLFAMILY_GENERIC) // Excluded player item spells
if (!(EventProcFlag & (PROC_FLAG_KILL | PROC_FLAG_DEATH)) && procSpell && procSpell->SpellFamilyName == SPELLFAMILY_GENERIC && procSpell->GetCategory() != 76 && if (!isVictim && IsPlayer() && !(EventProcFlag & (PROC_FLAG_KILL | PROC_FLAG_DEATH)))
{
if (procSpell && procSpell->SpellFamilyName == SPELLFAMILY_GENERIC && procSpell->GetCategory() != 76 &&
(!eventInfo.GetProcSpell() || !eventInfo.GetProcSpell()->m_CastItem) &&
(!eventInfo.GetTriggerAuraSpell() || eventInfo.GetTriggerAuraSpell()->SpellFamilyName == SPELLFAMILY_GENERIC)) (!eventInfo.GetTriggerAuraSpell() || eventInfo.GetTriggerAuraSpell()->SpellFamilyName == SPELLFAMILY_GENERIC))
{
return false; return false;
}
}
// Check spellProcEvent data requirements // Check spellProcEvent data requirements
if (!sSpellMgr->IsSpellProcEventCanTriggeredBy(spellProto, spellProcEvent, EventProcFlag, eventInfo, active)) if (!sSpellMgr->IsSpellProcEventCanTriggeredBy(spellProto, spellProcEvent, EventProcFlag, eventInfo, active))
src/server/game/Spells/SpellEffects.cpp
+5
View File
@@ -5530,6 +5530,11 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex)
ExecuteLogEffectSummonObject(effIndex, linkedTrap); ExecuteLogEffectSummonObject(effIndex, linkedTrap);
} }
if (Player* player = m_caster->ToPlayer())
{
player->SetCanTeleport(true);
}
} }
void Spell::EffectProspecting(SpellEffIndex /*effIndex*/) void Spell::EffectProspecting(SpellEffIndex /*effIndex*/)
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
{ {
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ struct boss_sartura : public BossAI
{ {
SetGazeOn(target); SetGazeOn(target);
} }
DoCastSelf(SPELL_WHIRLWIND, true); DoCastSelf(SPELL_WHIRLWIND);
events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND_RANDOM, 2s, 7s); events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND_RANDOM, 2s, 7s);
events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND_END, 15s); events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND_END, 15s);
break; break;
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+1 -1
View File
@@ -309,7 +309,7 @@ struct boss_veknilash : public boss_twinemperorsAI
_scheduler _scheduler
.Schedule(14s, [this](TaskContext context) .Schedule(14s, [this](TaskContext context)
{ {
DoCastRandomTarget(SPELL_UPPERCUT, 0, me->GetMeleeReach(), true); DoCastRandomTarget(SPELL_UPPERCUT, 0, me->GetMeleeReach(), true, true);
context.Repeat(4s, 15s); context.Repeat(4s, 15s);
}) })
.Schedule(12s, [this](TaskContext context) .Schedule(12s, [this](TaskContext context)
src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ enum Spells
SPELL_SHADOW_STORM = 26555, SPELL_SHADOW_STORM = 26555,
SPELL_THUNDERCLAP = 26554, SPELL_THUNDERCLAP = 26554,
SPELL_ENRAGE = 14204, SPELL_ENRAGE = 14204,
SPELL_EXPLODE = 25699, SPELL_EXPLODE = 25698,
SPELL_SUMMON_WARRIOR = 17431, SPELL_SUMMON_WARRIOR = 17431,
SPELL_SUMMON_SWARMGUARD = 17430, SPELL_SUMMON_SWARMGUARD = 17430,
SPELL_SUMMON_LARGE_OBSIDIAN_CHUNK = 27630, // Server-side SPELL_SUMMON_LARGE_OBSIDIAN_CHUNK = 27630, // Server-side
src/server/scripts/World/npcs_special.cpp
+3 -3
View File
@@ -265,7 +265,7 @@ public:
} }
if (sWorld->getWorldState(STV_FISHING_ANNOUNCE_EVENT_BEGIN)) if (sWorld->getWorldState(STV_FISHING_ANNOUNCE_EVENT_BEGIN))
{ {
me->Yell(RIGGLE_SAY_START); me->AI()->Talk(RIGGLE_SAY_START);
sWorld->setWorldState(STV_FISHING_ANNOUNCE_EVENT_BEGIN, 0); sWorld->setWorldState(STV_FISHING_ANNOUNCE_EVENT_BEGIN, 0);
} }
} }
@@ -285,7 +285,7 @@ public:
{ {
if (sWorld->getWorldState(STV_FISHING_ANNOUNCE_POOLS_DESPAN)) if (sWorld->getWorldState(STV_FISHING_ANNOUNCE_POOLS_DESPAN))
{ {
me->Yell(RIGGLE_SAY_POOLS_END); me->AI()->Talk(RIGGLE_SAY_POOLS_END);
sWorld->setWorldState(STV_FISHING_ANNOUNCE_POOLS_DESPAN, 0); sWorld->setWorldState(STV_FISHING_ANNOUNCE_POOLS_DESPAN, 0);
} }
} }
@@ -328,7 +328,7 @@ public:
if (quest->GetQuestId() == QUEST_MASTER_ANGLER) if (quest->GetQuestId() == QUEST_MASTER_ANGLER)
{ {
creature->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); creature->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
creature->Yell(RIGGLE_SAY_WINNER, player); creature->AI()->Talk(RIGGLE_SAY_WINNER, player);
sWorld->setWorldState(STV_FISHING_PREV_WIN_TIME, GameTime::GetGameTime().count()); sWorld->setWorldState(STV_FISHING_PREV_WIN_TIME, GameTime::GetGameTime().count());
sWorld->setWorldState(STV_FISHING_HAS_WINNER, 1); sWorld->setWorldState(STV_FISHING_HAS_WINNER, 1);
} }