Scripts/Misc: resolved cherrypick issues and regressions

This commit is contained in:
Ovahlord committed 2021-12-31 15:53:53 +01:00
1 parent a322e4eb37
commit 39da927196
5 files changed
+31 -13

No files matched your search

@@ -1554,7 +1554,7 @@ class spell_omnotron_flamethrower : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect.Register(&spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104);
OnObjectAreaTargetSelect.Register(&spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY);
}
};
@@ -1287,7 +1287,7 @@ class spell_brazie_spit : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect.Register(&spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_ENEMY_104);
OnObjectAreaTargetSelect.Register(&spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY);
}
};
@@ -1193,6 +1193,28 @@ class spell_conclave_of_wind_wind_blast_triggered : public SpellScript
}
};
class spell_conclave_of_wind_wind_blast_effect : public SpellScript
{
void CopyTargets(std::list<WorldObject*>& targets)
{
_targets = targets;
}
void StoreTargets(std::list<WorldObject*>& targets)
{
targets = _targets;
}
void Register() override
{
OnObjectAreaTargetSelect.Register(&spell_conclave_of_wind_wind_blast_effect::CopyTargets, EFFECT_0, TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_conclave_of_wind_wind_blast_effect::StoreTargets, EFFECT_1, TARGET_UNIT_CONE_CASTER_TO_DEST_ENTRY);
}
private:
std::list<WorldObject*> _targets;
};
class spell_conclave_of_wind_hurricane : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -1284,6 +1306,7 @@ void AddSC_boss_conclave_of_wind()
RegisterSpellScript(spell_conclave_of_wind_winds);
RegisterSpellAndAuraScriptPair(spell_conclave_of_wind_wind_blast, spell_conclave_of_wind_wind_blast_AuraScript);
RegisterSpellScript(spell_conclave_of_wind_wind_blast_triggered);
RegisterSpellScript(spell_conclave_of_wind_wind_blast_effect);
RegisterSpellScript(spell_conclave_of_wind_hurricane);
RegisterSpellScript(spell_conclave_of_wind_hurricane_ride_vehicle);
RegisterSpellScript(spell_conclave_of_wind_toxic_spores);