Skip to content

Scripts/Zul'Aman: A couple changes for Malacrass #31991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
offl wants to merge 1 commit into
base: 3.3.5
Choose a base branch
from
+40 −5
Open

Scripts/Zul'Aman: A couple changes for Malacrass #31991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2026_08_232_00_world.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--
UPDATE `spell_script_names` SET `ScriptName` = 'spell_malacrass_lifebloom' WHERE `ScriptName` = 'spell_hexlord_lifebloom';
41 changes: 38 additions & 3 deletions src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
/*
* SAY_BERSERK is NYI, is it used?
* Combat timers requires to be revisited, mainly player class abilities, half of timers are guessed
* Move spell script of spell 43421 to this file
* Currently we generate random companions after every wipe, doubt it is correct
* We interrupt Siphon Soul instantly to allow casting player class abilities, that's a hack
*/
Expand Down Expand Up @@ -133,6 +132,7 @@ enum MalacrassSpells
SPELL_COLD_STARE = 43593,

// Scripts
SPELL_LIFEBLOOM_FINAL_HEAL = 43422,
SPELL_UNSTABLE_AFFL_DISPEL = 43523,
SPELL_SIPHON_SOUL_EFFECT = 43501,
SPELL_MARK_OF_BLOOD_HEAL = 61607
Expand Down Expand Up @@ -804,6 +804,30 @@ struct boss_koragg : public MalacrassCompanionBaseAI
}
};

// 43421 - Lifebloom
class spell_malacrass_lifebloom : public AuraScript
{
PrepareAuraScript(spell_malacrass_lifebloom);

bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_LIFEBLOOM_FINAL_HEAL });
}

void AfterRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE && GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL)
return;

GetTarget()->CastSpell(nullptr, SPELL_LIFEBLOOM_FINAL_HEAL, { aurEff, GetCasterGUID() });
}

void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_malacrass_lifebloom::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
}
};

// 43498 - Siphon Soul
class spell_malacrass_siphon_soul : public SpellScript
{
Expand All @@ -816,14 +840,21 @@ class spell_malacrass_siphon_soul : public SpellScript

void FilterTargets(std::list<WorldObject*>& targets)
{
// This is wrong, full list of targets is sent to client
Trinity::Containers::RandomResize(targets, 1);
if (targets.empty())
return;

WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);

_selectedTargetGuid = target->GetGUID();
}

void HandleDummy(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitUnit();

if (target->GetGUID() != _selectedTargetGuid)
return;

if (Creature* caster = GetCaster()->ToCreature())
{
caster->CastSpell(target, SPELL_SIPHON_SOUL_EFFECT);
Expand All @@ -836,6 +867,9 @@ class spell_malacrass_siphon_soul : public SpellScript
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malacrass_siphon_soul::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_malacrass_siphon_soul::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}

private:
ObjectGuid _selectedTargetGuid;
};

// 43522 - Unstable Affliction
Expand Down Expand Up @@ -910,6 +944,7 @@ void AddSC_boss_hex_lord_malacrass()
RegisterZulAmanCreatureAI(boss_fenstalker);
RegisterZulAmanCreatureAI(boss_darkheart);
RegisterZulAmanCreatureAI(boss_koragg);
RegisterSpellScript(spell_malacrass_lifebloom);
RegisterSpellScript(spell_malacrass_siphon_soul);
RegisterSpellScript(spell_malacrass_unstable_affliction);
RegisterSpellScript(spell_malacrass_mind_control);
Expand Down
2 changes: 0 additions & 2 deletions src/server/scripts/Spells/spell_generic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,7 +2211,6 @@ class spell_gen_lifeblood_aura : public AuraScript

enum GenericLifebloom
{
SPELL_HEXLORD_MALACRASS_LIFEBLOOM_FINAL_HEAL = 43422,
SPELL_TUR_RAGEPAW_LIFEBLOOM_FINAL_HEAL = 52552,
SPELL_CENARION_SCOUT_LIFEBLOOM_FINAL_HEAL = 53692,
SPELL_TWISTED_VISAGE_LIFEBLOOM_FINAL_HEAL = 57763,
Expand Down Expand Up @@ -4776,7 +4775,6 @@ void AddSC_generic_spell_scripts()
RegisterSpellScriptWithArgs(spell_gen_knock_away_threat_reduction, "spell_gen_knock_away_threat_reduction_50", 50); // 18670, 18945
RegisterSpellScriptWithArgs(spell_gen_knock_away_threat_reduction, "spell_gen_knock_away_threat_reduction_25", 25); // 18813, 25778
RegisterSpellAndAuraScriptPair(spell_gen_lifeblood, spell_gen_lifeblood_aura);
RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_hexlord_lifebloom", SPELL_HEXLORD_MALACRASS_LIFEBLOOM_FINAL_HEAL);
RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_tur_ragepaw_lifebloom", SPELL_TUR_RAGEPAW_LIFEBLOOM_FINAL_HEAL);
RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_cenarion_scout_lifebloom", SPELL_CENARION_SCOUT_LIFEBLOOM_FINAL_HEAL);
RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_twisted_visage_lifebloom", SPELL_TWISTED_VISAGE_LIFEBLOOM_FINAL_HEAL);
Expand Down
Loading