sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/ZulAman): Fix Electric Storm shouldnt hit safe players (#20897)

Browse Source 
* fix(Scripts/ZulAman): Fix Electric Storm shouldnt hit safe players

* increase cloud duration by 500ms

Co-Authored-By: killerwife <killerwife@users.noreply.github.com>

---------

Co-authored-by: killerwife <killerwife@users.noreply.github.com>
This commit is contained in:
Andrew
2024-12-17 12:28:46 -03:00
committed by GitHub
parent 1078433bb2
commit 2923a4aa43
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+11 -1
View File
@@ -114,8 +114,12 @@ struct boss_akilzon : public BossAI
EnterEvadeMode(); EnterEvadeMode();
return; return;
} }
target->CastSpell(target, SPELL_ELECTRICAL_STORM_AREA, true); // cloud visual
DoCast(target, SPELL_ELECTRICAL_STORM); // storm cyclon + visual DoCast(target, SPELL_ELECTRICAL_STORM); // storm cyclon + visual
target->CastSpell(target, SPELL_ELECTRICAL_STORM_AREA, true); // cloud visual
if (DynamicObject* dynObj = target->GetDynObject(SPELL_ELECTRICAL_STORM_AREA))
dynObj->SetDuration(8500);
float x, y, z; float x, y, z;
target->GetPosition(x, y, z); target->GetPosition(x, y, z);
@@ -328,6 +332,11 @@ class spell_electrical_storm_proc : public SpellScript
{ {
PrepareSpellScript(spell_electrical_storm_proc); PrepareSpellScript(spell_electrical_storm_proc);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Acore::UnitAuraCheck(true, SPELL_ELECTRICAL_STORM_AREA));
}
void HandleDamageCalc(SpellEffIndex /*effIndex*/) void HandleDamageCalc(SpellEffIndex /*effIndex*/)
{ {
if (Aura* aura = GetCaster()->GetAura(SPELL_ELECTRICAL_STORM)) if (Aura* aura = GetCaster()->GetAura(SPELL_ELECTRICAL_STORM))
@@ -339,6 +348,7 @@ class spell_electrical_storm_proc : public SpellScript
void Register() override void Register() override
{ {
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_electrical_storm_proc::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnEffectHitTarget += SpellEffectFn(spell_electrical_storm_proc::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnEffectHitTarget += SpellEffectFn(spell_electrical_storm_proc::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
} }
}; };