fix(instance): Ruby Sanctum - Resistances ignored (#1371)

This commit is contained in:
Vitoco
2019-02-16 16:08:50 -03:00
committed by Francesco Borzì
parent f960d8e848
commit edd88fbd1e
2 changed files with 49 additions and 2 deletions

View File

@@ -5846,6 +5846,17 @@ void SpellMgr::LoadDbcDataCorrections()
case 74637:
spellInfo->speed = 0;
break;
//Blazing Aura
case 75885:
case 75886:
spellInfo->AttributesEx4 &= ~SPELL_ATTR4_IGNORE_RESISTANCES;
break;
//Meteor Strike
case 75952:
//Combustion Periodic
case 74629:
spellInfo->AttributesEx4 &= ~SPELL_ATTR4_IGNORE_RESISTANCES;
break;
// ///////////////////////////////////////////

View File

@@ -46,6 +46,9 @@ enum Spells
SPELL_METEOR_STRIKE_TARGETING = 74638,
SPELL_TAIL_LASH = 74531,
// Living Inferno
SPELL_BLAZING_AURA = 75885,
// Combustion / Consumption
SPELL_SCALE_AURA = 70507,
SPELL_FIERY_COMBUSTION = 74562,
@@ -1430,12 +1433,45 @@ class spell_halion_twilight_mending : public SpellScriptLoader
}
};
class npc_living_inferno : public CreatureScript
{
public:
npc_living_inferno() : CreatureScript("npc_living_inferno") { }
struct npc_living_infernoAI : public ScriptedAI
{
npc_living_infernoAI(Creature* creature) : ScriptedAI(creature) { }
void IsSummonedBy(Unit* /*summoner*/)
{
me->SetInCombatWithZone();
me->CastSpell(me, SPELL_BLAZING_AURA, true);
if (InstanceScript* instance = me->GetInstanceScript())
if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_HALION_CONTROLLER)))
controller->AI()->JustSummoned(me);
}
void JustDied(Unit* /*killer*/)
{
me->DespawnOrUnsummon(1);
}
};
CreatureAI* GetAI(Creature* creature) const
{
return GetInstanceAI<npc_living_infernoAI>(creature);
}
};
void AddSC_boss_halion()
{
new boss_halion();
new boss_twilight_halion();
new npc_halion_controller();
new npc_orb_carrier();
new npc_living_inferno();
new spell_halion_meteor_strike_targeting();
new spell_halion_meteor_strike_marker();