mirror/azerothcore-wotlk
1
0
Fork 1
mirror of https://gitcode.com/GitHub_Trending/az/azerothcore-wotlk.git synced 2026-10-10 07:06:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Ulduar): summon Sif during Thorim's intro instead of pre-spawning her (#27058)

Browse Source
This commit is contained in:
Andrew
2026-08-09 11:19:14 -03:00
committed by GitHub
parent f027e8b4a5
commit d85c8a7823
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+13 -19
View File
@@ -219,7 +219,7 @@ enum ThorimEvents
EVENT_IH_GUARD_HAMSTRING = 91, EVENT_IH_GUARD_HAMSTRING = 91,
EVENT_IH_GUARD_SHIELD_SMASH = 92, EVENT_IH_GUARD_SHIELD_SMASH = 92,
EVENT_SIF_START_TALK = 100, EVENT_THORIM_SUMMON_SIF = 100,
EVENT_SIF_JOIN_TALK = 101, EVENT_SIF_JOIN_TALK = 101,
EVENT_SIF_FINISH_DOMINION = 102, EVENT_SIF_FINISH_DOMINION = 102,
EVENT_SIF_FROSTBOLT_VALLEY = 103, EVENT_SIF_FROSTBOLT_VALLEY = 103,
@@ -296,7 +296,6 @@ enum Misc
ACTION_START_TRASH_DIED = 1, ACTION_START_TRASH_DIED = 1,
ACTION_ALLOW_HIT = 2, ACTION_ALLOW_HIT = 2,
ACTION_SIF_JOIN_FIGHT = 3, ACTION_SIF_JOIN_FIGHT = 3,
ACTION_SIF_START_TALK = 4,
ACTION_SIF_START_DOMINION = 5, ACTION_SIF_START_DOMINION = 5,
ACTION_SIF_TRANSFORM = 6, ACTION_SIF_TRANSFORM = 6,
ACTION_IRON_HONOR_DIED = 7, ACTION_IRON_HONOR_DIED = 7,
@@ -389,9 +388,6 @@ struct boss_thorim : public BossAI
// Ancient Rune Giant 32873 // Ancient Rune Giant 32873
me->SummonCreature(NPC_ANCIENT_RUNE_GIANT, 2134.57f, -440.318f, 438.331f, 0.226893f); me->SummonCreature(NPC_ANCIENT_RUNE_GIANT, 2134.57f, -440.318f, 438.331f, 0.226893f);
// Sif 33196
me->SummonCreature(NPC_SIF, 2147.86f, -301.2f, 438.246f, 2.488f);
} }
void CloseDoors() void CloseDoors()
@@ -656,13 +652,12 @@ struct boss_thorim : public BossAI
break; break;
case EVENT_THORIM_AGGRO2: case EVENT_THORIM_AGGRO2:
{ Talk(SAY_AGGRO_2);
Talk(SAY_AGGRO_2); events.ScheduleEvent(EVENT_THORIM_SUMMON_SIF, 6500ms);
break;
EntryCheckPredicate pred(NPC_SIF); case EVENT_THORIM_SUMMON_SIF:
summons.DoAction(ACTION_SIF_START_TALK, pred); me->SummonCreature(NPC_SIF, 2148.3f, -297.845f, 438.331f, 2.688f);
break; break;
}
case EVENT_THORIM_START_PHASE1: case EVENT_THORIM_START_PHASE1:
{ {
events.ScheduleEvent(EVENT_THORIM_STORMHAMMER, 8s, 0, EVENT_PHASE_START); events.ScheduleEvent(EVENT_THORIM_STORMHAMMER, 8s, 0, EVENT_PHASE_START);
@@ -806,11 +801,14 @@ struct boss_thorim_sif : public ScriptedAI
_allowCast = false; _allowCast = false;
} }
void IsSummonedBy(WorldObject* /*summoner*/) override
{
Talk(SAY_SIF_AGGRO);
}
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if (param == ACTION_SIF_START_TALK) if (param == ACTION_SIF_START_DOMINION)
events.ScheduleEvent(EVENT_SIF_START_TALK, 9s);
else if (param == ACTION_SIF_START_DOMINION)
{ {
if (me->GetInstanceScript()) if (me->GetInstanceScript())
if (Creature* cr = me->GetInstanceScript()->GetCreature(BOSS_THORIM)) if (Creature* cr = me->GetInstanceScript()->GetCreature(BOSS_THORIM))
@@ -822,7 +820,6 @@ struct boss_thorim_sif : public ScriptedAI
{ {
me->InterruptNonMeleeSpells(false); me->InterruptNonMeleeSpells(false);
events.ScheduleEvent(EVENT_SIF_JOIN_TALK, 9s); events.ScheduleEvent(EVENT_SIF_JOIN_TALK, 9s);
events.CancelEvent(EVENT_SIF_START_TALK);
events.CancelEvent(EVENT_SIF_FINISH_DOMINION); events.CancelEvent(EVENT_SIF_FINISH_DOMINION);
} }
else if (param == ACTION_SIF_TRANSFORM) else if (param == ACTION_SIF_TRANSFORM)
@@ -846,9 +843,6 @@ struct boss_thorim_sif : public ScriptedAI
Talk(SAY_SIF_HM_MISSED); Talk(SAY_SIF_HM_MISSED);
me->DespawnOrUnsummon(5s); me->DespawnOrUnsummon(5s);
break; break;
case EVENT_SIF_START_TALK:
Talk(SAY_SIF_AGGRO);
break;
case EVENT_SIF_JOIN_TALK: case EVENT_SIF_JOIN_TALK:
Talk(SAY_SIF_HM_REACHED); Talk(SAY_SIF_HM_REACHED);
events.ScheduleEvent(EVENT_SIF_FROST_NOVA_START, 1s); events.ScheduleEvent(EVENT_SIF_FROST_NOVA_START, 1s);