nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-23 13:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-08-05 01:22:16 +08:00
parent 3e2509e20c fcdc50306f
commit c3be0fa2a8
5 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
View File

@@ -267,9 +267,11 @@ struct boss_archimonde : public BossAI
Talk(SAY_AGGRO);
ScheduleTimedEvent(25s, 35s, [&]
{
scheduler.DelayGroup(GROUP_FEAR, 5s);
Talk(SAY_AIR_BURST);
DoCastRandomTarget(SPELL_AIR_BURST);
if (DoCastRandomTarget(SPELL_AIR_BURST, 1) == SPELL_CAST_OK)
{
scheduler.DelayGroup(GROUP_FEAR, 5s);
Talk(SAY_AIR_BURST);
}
}, 25s, 40s);
ScheduleTimedEvent(8s, [&]
{
@@ -471,24 +473,6 @@ class spell_red_sky_effect : public SpellScript
}
};
class spell_air_burst : public SpellScript
{
PrepareSpellScript(spell_air_burst);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (Unit* victim = GetCaster()->GetVictim())
{
targets.remove_if(Acore::ObjectGUIDCheck(victim->GetGUID(), true));
}
}
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_air_burst::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
class spell_doomfire : public AuraScript
{
PrepareAuraScript(spell_doomfire);
@@ -519,7 +503,6 @@ class spell_doomfire : public AuraScript
void AddSC_boss_archimonde()
{
RegisterSpellScript(spell_red_sky_effect);
RegisterSpellScript(spell_air_burst);
RegisterSpellScript(spell_doomfire);
RegisterHyjalAI(boss_archimonde);
RegisterHyjalAI(npc_ancient_wisp);

2
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
View File

@@ -54,7 +54,6 @@ enum Spells
SPELL_FATAL_ATTRACTION_AURA = 41001,
SPELL_FATAL_ATTRACTION_DAMAGE = 40871,
SPELL_ENRAGE = 45078,
SPELL_FRENZY = 40683,
SPELL_SABER_LASH_IMMUNITY = 43690
};
@@ -74,7 +73,6 @@ struct boss_mother_shahraz : public BossAI
_canTalk = true;
ScheduleHealthCheckEvent(10, [&] {
DoCastSelf(SPELL_FRENZY, true);
Talk(SAY_EMOTE_FRENZY);
});
}