Core/Combat: Unify combat permitted checks between CvC and PvC - only require "not friendly" in all cases. Fixes Yogg-Saron encounter. Closes #21380.
Also some bonus cleanup to Yogg's script to make transition cleaner. # Conflicts: # src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
This commit is contained in:
1 parent
7bbc603efa
commit
bd0408ff1a
2 files changed
+7
-14
No files matched your search
@@ -462,7 +462,7 @@ class boss_voice_of_yogg_saron : public CreatureScript
|
||||
void MoveInLineOfSight(Unit* who) override
|
||||
{
|
||||
// TODO: MoveInLineOfSight doesn't work for such a big distance
|
||||
if (who->GetTypeId() == TYPEID_PLAYER && me->GetDistance2d(who) < 99.0f && !me->IsInCombat())
|
||||
if (who->GetTypeId() == TYPEID_PLAYER && !who->ToPlayer()->IsGameMaster() && me->GetDistance2d(who) < 99.0f && !me->IsInCombat())
|
||||
me->SetInCombatWithZone();
|
||||
}
|
||||
|
||||
@@ -624,9 +624,9 @@ class boss_voice_of_yogg_saron : public CreatureScript
|
||||
me->SummonCreature(NPC_YOGG_SARON, YoggSaronSpawnPos);
|
||||
if (Creature* brain = instance->GetCreature(DATA_BRAIN_OF_YOGG_SARON))
|
||||
brain->SetInCombatWithZone();
|
||||
events.ScheduleEvent(EVENT_SUMMON_CORRUPTOR_TENTACLE, 1, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
|
||||
events.ScheduleEvent(EVENT_SUMMON_CONSTRICTOR_TENTACLE, 1, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
|
||||
events.ScheduleEvent(EVENT_SUMMON_CRUSHER_TENTACLE, 1, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
|
||||
events.ScheduleEvent(EVENT_SUMMON_CORRUPTOR_TENTACLE, 5s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
|
||||
events.ScheduleEvent(EVENT_SUMMON_CONSTRICTOR_TENTACLE, 7s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
|
||||
events.ScheduleEvent(EVENT_SUMMON_CRUSHER_TENTACLE, 5s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
|
||||
events.ScheduleEvent(EVENT_ILLUSION, 60000, 0, PHASE_TWO);
|
||||
break;
|
||||
case ACTION_TOGGLE_SHATTERED_ILLUSION:
|
||||
@@ -939,6 +939,7 @@ class boss_yogg_saron : public CreatureScript
|
||||
|
||||
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
|
||||
{
|
||||
// Val'anyr
|
||||
if (spell->Id == SPELL_IN_THE_MAWS_OF_THE_OLD_GOD)
|
||||
me->AddLootMode(32);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user