nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-15 18:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/MagtheridonLair): Magtheridon Debris (#17249)

Browse Source 
* fix(Core/Scripts): Magtheridon Debris

* unhack

* cleanup

* eof line

* unused variable

* more cleanup
This commit is contained in:
Angelo Venturini
2023-09-17 07:43:10 -03:00
committed by GitHub
parent c149f213fe
commit be5db26d24
5 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
View File

@@ -55,8 +55,10 @@ enum Spells
SPELL_QUAKE_KNOCKBACK = 30571,
SPELL_COLLAPSE_DAMAGE = 36449,
SPELL_CAMERA_SHAKE = 36455,
SPELL_DEBRIS_TARGET = 30629,
SPELL_DEBRIS_SPAWN = 30630,
SPELL_DEBRIS_DAMAGE = 30631,
SPELL_DEBRIS_VISUAL = 30632,
SPELL_DEBRIS_DAMAGE = 30631
};
enum Groups
@@ -70,26 +72,9 @@ enum Actions
ACTION_INCREASE_HELLFIRE_CHANNELER_DEATH_COUNT = 1
};
class DealDebrisDamage : public BasicEvent
{
public:
DealDebrisDamage(Creature& creature, ObjectGuid targetGUID) : _owner(creature), _targetGUID(targetGUID) { }
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
if (Unit* target = ObjectAccessor::GetUnit(_owner, _targetGUID))
target->CastSpell(target, SPELL_DEBRIS_DAMAGE, true, nullptr, nullptr, _owner.GetGUID());
return true;
}
private:
Creature& _owner;
ObjectGuid _targetGUID;
};
struct boss_magtheridon : public BossAI
{
boss_magtheridon(Creature* creature) : BossAI(creature, TYPE_MAGTHERIDON)
boss_magtheridon(Creature* creature) : BossAI(creature, DATA_MAGTHERIDON)
{
scheduler.SetValidator([this]
{
@@ -137,11 +122,7 @@ struct boss_magtheridon : public BossAI
_currentPhase = 0;
scheduler.Schedule(20s, [this](TaskContext context)
{
if (Unit* target = SelectTarget(SelectTargetMethod::Random))
{
target->CastSpell(target, SPELL_DEBRIS_VISUAL, true, nullptr, nullptr, me->GetGUID());
me->m_Events.AddEvent(new DealDebrisDamage(*me, target->GetGUID()), me->m_Events.CalculateTime(5000));
}
DoCastAOE(SPELL_DEBRIS_TARGET);
context.Repeat(20s);
});
});
@@ -248,7 +229,7 @@ struct boss_magtheridon : public BossAI
BossAI::JustEngagedWith(who);
Talk(SAY_EMOTE_BEGIN);
instance->DoForAllMinions(TYPE_MAGTHERIDON, [&](Creature* creature) {
instance->DoForAllMinions(DATA_MAGTHERIDON, [&](Creature* creature) {
creature->SetInCombatWithZone();
});
@@ -289,6 +270,37 @@ private:
TaskScheduler _interruptScheduler;
};
struct npc_target_trigger : public ScriptedAI
{
npc_target_trigger(Creature* creature) : ScriptedAI(creature), _cast(false)
{
me->SetReactState(REACT_PASSIVE);
}
void Reset() override
{
if (!_cast)
{
DoCastSelf(SPELL_DEBRIS_VISUAL);
_cast = true;
_scheduler.Schedule(5s, [this](TaskContext /*context*/)
{
DoCastSelf(SPELL_DEBRIS_DAMAGE);
me->DespawnOrUnsummon(6000);
});
}
}
void UpdateAI(uint32 diff) override
{
_scheduler.Update(diff);
}
protected:
TaskScheduler _scheduler;
bool _cast;
};
class spell_magtheridon_blaze : public SpellScript
{
PrepareSpellScript(spell_magtheridon_blaze);
@@ -348,6 +360,33 @@ class spell_magtheridon_quake : public SpellScript
}
};
class spell_magtheridon_debris_target_selector : public SpellScript
{
PrepareSpellScript(spell_magtheridon_debris_target_selector);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if([&](WorldObject* target) -> bool
{
return target->GetEntry() != NPC_TARGET_TRIGGER;
});
Acore::Containers::RandomResize(targets, 1);
}
void HandleHit()
{
if (Unit* target = GetHitUnit())
target->CastSpell(target, SPELL_DEBRIS_SPAWN);
}
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magtheridon_debris_target_selector::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnHit += SpellHitFn(spell_magtheridon_debris_target_selector::HandleHit);
}
};
class go_manticron_cube : public GameObjectScript
{
public:
@@ -369,8 +408,10 @@ public:
void AddSC_boss_magtheridon()
{
RegisterMagtheridonsLairCreatureAI(boss_magtheridon);
RegisterMagtheridonsLairCreatureAI(npc_target_trigger);
RegisterSpellScript(spell_magtheridon_blaze);
RegisterSpellScript(spell_magtheridon_shadow_grasp);
RegisterSpellScript(spell_magtheridon_quake);
RegisterSpellScript(spell_magtheridon_debris_target_selector);
new go_manticron_cube();
}

10
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
View File

@@ -21,18 +21,18 @@
BossBoundaryData const boundaries =
{
{ TYPE_MAGTHERIDON, new CircleBoundary(Position(-18.70f, 2.24f), 52.30) }
{ DATA_MAGTHERIDON, new CircleBoundary(Position(-18.70f, 2.24f), 52.30) }
};
DoorData const doorData[] =
{
{ GO_MAGTHERIDON_DOORS, TYPE_MAGTHERIDON, DOOR_TYPE_ROOM },
{ GO_MAGTHERIDON_DOORS, DATA_MAGTHERIDON, DOOR_TYPE_ROOM },
{ 0, 0, DOOR_TYPE_ROOM } // END
};
MinionData const minionData[] =
{
{ NPC_HELLFIRE_CHANNELER, TYPE_MAGTHERIDON }
{ NPC_HELLFIRE_CHANNELER, DATA_MAGTHERIDON }
};
class instance_magtheridons_lair : public InstanceMapScript
@@ -133,7 +133,7 @@ public:
if (!InstanceScript::SetBossState(id, state))
return false;
if (id == TYPE_MAGTHERIDON)
if (id == DATA_MAGTHERIDON)
{
if (state == IN_PROGRESS)
{
@@ -163,7 +163,7 @@ public:
switch (type)
{
case DATA_CHANNELER_COMBAT:
if (GetBossState(TYPE_MAGTHERIDON) != IN_PROGRESS)
if (GetBossState(DATA_MAGTHERIDON) != IN_PROGRESS)
if (Creature* magtheridon = instance->GetCreature(_magtheridonGUID))
magtheridon->SetInCombatWithZone();
break;

3
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
View File

@@ -27,7 +27,7 @@
enum DataTypes
{
TYPE_MAGTHERIDON = 0,
DATA_MAGTHERIDON = 0,
MAX_ENCOUNTER = 1,
DATA_CHANNELER_COMBAT = 10,
@@ -41,6 +41,7 @@ enum NpcIds
NPC_HELLFIRE_CHANNELER = 17256,
NPC_HELLFIRE_WARDER = 18829,
NPC_HELLFIRE_RAID_TRIGGER = 17376,
NPC_TARGET_TRIGGER = 17474
};
enum GoIds