Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-09 03:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/BWD: implement remaining abilities for Arcanotron

Browse Source 
* fixed Poison Bombs not attacking their targets after fixating their targets
This commit is contained in:
Ovahlord
2019-05-16 02:30:29 +02:00
parent 1caeb2c0fc
commit 8d0dc9da8d
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Spells/SpellMgr.cpp
View File

@@ -5255,6 +5255,15 @@ void SpellMgr::LoadSpellInfoCorrections()
spellInfo->Effects[EFFECT_0].TargetB = SpellImplicitTargetInfo(0);
});
// Arcane Annihiliation
ApplySpellFix({
91540,
91542
}, [](SpellInfo* spellInfo)
{
spellInfo->MaxAffectedTargets = 3;
});
// END OF BLACKWING DESCENT SPELLS
// Living Bomb

40
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp
View File

@@ -59,7 +59,7 @@ enum Spells
// Arcanotron
SPELL_POWER_GENERATOR = 79624,
SPELL_POWER_CONVERSION = 79729,
// Poison Bomb
SPELL_FIXATE_DUMMY = 80094,
@@ -70,6 +70,7 @@ enum Spells
#define SPELL_LIGHTNING_CONDUCTOR RAID_MODE<uint32>(79888, 91431, 91432, 91433)
#define SPELL_SOAKED_IN_POISON RAID_MODE<uint32>(80011, 91504, 91505, 91506)
#define SPELL_ARCANE_ANNIHILATION RAID_MODE<uint32>(79710, 91540, 91541, 91542)
enum Texts
{
@@ -117,6 +118,8 @@ enum Events
// Arcanotron
EVENT_POWER_GENERATOR,
EVENT_ARCANE_ANNIHILATION,
EVENT_POWER_CONVERSION
};
enum Actions
@@ -731,6 +734,7 @@ struct npc_omnotron_toxitron : public ScriptedAI
_events.Repeat(30s);
break;
case EVENT_POISON_PROTOCOL:
me->StopMoving();
DoCastSelf(SPELL_POISON_PROTOCOL);
break;
case EVENT_POISON_SOAKED_SHELL:
@@ -827,6 +831,7 @@ struct npc_omnotron_arcanotron : public ScriptedAI
break;
case ACTION_DEACTIVATE_GOLEM:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->MakeInterruptable(false);
_events.Reset();
break;
default:
@@ -839,10 +844,23 @@ struct npc_omnotron_arcanotron : public ScriptedAI
if (spell->Id == SPELL_ACTIVATED)
{
_events.ScheduleEvent(EVENT_POWER_GENERATOR, 16s);
_events.ScheduleEvent(EVENT_ARCANE_ANNIHILATION, 3s + 300ms);
_events.ScheduleEvent(EVENT_POWER_CONVERSION, IsHeroic() ? 40s : 50s);
}
}
void OnSuccessfulSpellCast(SpellInfo const* spell) override
{
if (spell->Id == SPELL_ARCANE_ANNIHILATION)
me->MakeInterruptable(true);
}
void OnSpellCastInterrupt(SpellInfo const* spell) override
{
if (spell->Id == SPELL_ARCANE_ANNIHILATION)
me->MakeInterruptable(true);
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
@@ -861,6 +879,23 @@ struct npc_omnotron_arcanotron : public ScriptedAI
DoCastAOE(SPELL_POWER_GENERATOR);
_events.Repeat(20s);
break;
case EVENT_ARCANE_ANNIHILATION:
me->MakeInterruptable(true);
if (!Is25ManRaid())
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, 0))
DoCast(target, SPELL_ARCANE_ANNIHILATION);
}
else
DoCastAOE(SPELL_ARCANE_ANNIHILATION);
_events.Repeat(6s, 7s);
break;
case EVENT_POWER_CONVERSION:
DoCastSelf(SPELL_POWER_CONVERSION);
Talk(SAY_ANNOUNCE_ABILITY_1);
if (Creature* omnotron = _instance->GetCreature(DATA_OMNOTRON_DEFENSE_SYSTEM))
omnotron->AI()->SetGUID(me->GetGUID(), DATA_SAY_GOLEM_SHIELD);
break;
default:
break;
}
@@ -916,6 +951,7 @@ struct npc_omnotron_poison_bomb : public ScriptedAI
if (Unit* target = targets.front())
{
DoCast(target, SPELL_FIXATE_DUMMY, true);
me->ClearUnitState(UNIT_STATE_CASTING);
me->AddThreat(target, 500000.0f);
}
}