fix(Scripts/UP): rework Skadi the Ruthless encounter (#25195)

Co-authored-by: Gustavo <sirikfoll@hotmail.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Andrew 2026-03-24 18:43:32 -03:00 committed by GitHub
parent eaf97ce954
commit 8ff031dbd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 761 additions and 372 deletions

View file

@ -1695,12 +1695,6 @@ void SpellMgr::LoadSpellInfoCorrections()
spellInfo->Effects[0].TargetB = SpellImplicitTargetInfo();
});
// Flame Breath
ApplySpellFix({ 47592 }, [](SpellInfo* spellInfo)
{
spellInfo->Effects[EFFECT_0].Amplitude = 200;
});
// Skarvald, Charge
ApplySpellFix({ 43651 }, [](SpellInfo* spellInfo)
{

View file

@ -23,9 +23,18 @@
ObjectData const creatureData[] =
{
{ NPC_SKADI_THE_RUTHLESS, DATA_SKADI_THE_RUTHLESS },
{ NPC_GARUF, DATA_GRAUF },
{ 0, 0 }
};
ObjectData const summonData[] =
{
{ NPC_YMIRJAR_WARRIOR, DATA_SKADI_THE_RUTHLESS },
{ NPC_YMIRJAR_WITCH_DOCTOR, DATA_SKADI_THE_RUTHLESS },
{ NPC_YMIRJAR_HARPOONER, DATA_SKADI_THE_RUTHLESS },
{ 0, 0 }
};
class instance_utgarde_pinnacle : public InstanceMapScript
{
public:
@ -65,6 +74,7 @@ public:
{
SetHeaders(DataHeader);
LoadObjectData(creatureData, nullptr);
LoadSummonData(summonData);
SkadiHits = 0;
SkadiInRange = 0;

View file

@ -49,6 +49,7 @@ enum Data
DATA_SVALA_ACHIEVEMENT = 50,
DATA_SKADI_ACHIEVEMENT = 51,
DATA_YMIRON_ACHIEVEMENT = 52,
DATA_LOVE_TO_SKADI = 53,
};
enum Objects
@ -71,6 +72,9 @@ enum Objects
NPC_MASSIVE_JORMUNGAR = 26685,
NPC_FEROCIOUS_RHINO = 26686,
NPC_GARUF = 26893,
NPC_YMIRJAR_WARRIOR = 26690,
NPC_YMIRJAR_WITCH_DOCTOR = 26691,
NPC_YMIRJAR_HARPOONER = 26692,
};
template <class AI, class T>
@ -79,4 +83,6 @@ inline AI* GetUtgardePinnacleAI(T* obj)
return GetInstanceAI<AI>(obj, UtgardePinnacleScriptName);
}
#define RegisterUtgardePinnacleCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetUtgardePinnacleAI)
#endif