Skip to content
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

fix(ICC/Sindragosa): add a cooldown to proccing Unchained Magic #18901

Merged
merged 5 commits into from
May 26, 2024
Merged

fix(ICC/Sindragosa): add a cooldown to proccing Unchained Magic #18901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25b6102
add cooldown to proc
sogladev May 14, 2024
cc9d7b5
convert to spell and aurascript pair macro
sogladev May 14, 2024
d73da98
remove no longer needed validate override
sogladev May 15, 2024
a115658
Merge branch 'azerothcore:master' into fix(ICC/Sindragosa)UnchainedMagic
sogladev May 18, 2024
1e8c004
set cooldown with Cooldown field in table spell_proc_event
sogladev May 23, 2024
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 data/sql/updates/pending_db_world/rev_1716477609336515289.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--
UPDATE `spell_proc_event` SET `Cooldown`=600 WHERE `entry`=69762;
92 changes: 18 additions & 74 deletions src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,85 +869,29 @@ class UnchainedMagicTargetSelector
bool _removeHealers;
};

class spell_sindragosa_unchained_magic : public SpellScriptLoader
class spell_sindragosa_unchained_magic : public SpellScript
{
public:
spell_sindragosa_unchained_magic() : SpellScriptLoader("spell_sindragosa_unchained_magic") { }

class spell_sindragosa_unchained_magic_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sindragosa_unchained_magic_SpellScript);

void FilterTargets(std::list<WorldObject*>& unitList)
{
std::list<WorldObject*> healList = unitList;
std::list<WorldObject*> dpsList = unitList;
unitList.clear();
uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1);
healList.remove_if(UnchainedMagicTargetSelector(false));
if (healList.size() > maxSize)
Acore::Containers::RandomResize(healList, maxSize);
dpsList.remove_if(UnchainedMagicTargetSelector(true));
if (dpsList.size() > maxSize)
Acore::Containers::RandomResize(dpsList, maxSize);
unitList.splice(unitList.begin(), healList);
unitList.splice(unitList.begin(), dpsList);
}

void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_unchained_magic_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
PrepareSpellScript(spell_sindragosa_unchained_magic);

SpellScript* GetSpellScript() const override
void FilterTargets(std::list<WorldObject*>& unitList)
{
return new spell_sindragosa_unchained_magic_SpellScript();
std::list<WorldObject*> healList = unitList;
std::list<WorldObject*> dpsList = unitList;
unitList.clear();
uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1);
healList.remove_if(UnchainedMagicTargetSelector(false));
if (healList.size() > maxSize)
Acore::Containers::RandomResize(healList, maxSize);
dpsList.remove_if(UnchainedMagicTargetSelector(true));
if (dpsList.size() > maxSize)
Acore::Containers::RandomResize(dpsList, maxSize);
unitList.splice(unitList.begin(), healList);
unitList.splice(unitList.begin(), dpsList);
}

class spell_sindragosa_unchained_magic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sindragosa_unchained_magic_AuraScript);

std::map<uint32, uint32> _lastMSTimeForSpell;

bool Validate(SpellInfo const* /*spellInfo*/) override
{
_lastMSTimeForSpell.clear();
return true;
}

bool CheckProc(ProcEventInfo& eventInfo)
{
SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
if (!spellInfo)
return false;

uint32 currMSTime = GameTime::GetGameTimeMS().count();
std::map<uint32, uint32>::iterator itr = _lastMSTimeForSpell.find(spellInfo->Id);
if (itr != _lastMSTimeForSpell.end())
{
uint32 lastMSTime = itr->second;
itr->second = currMSTime;
if (getMSTimeDiff(lastMSTime, currMSTime) < 600)
return false;

return true;
}

_lastMSTimeForSpell[spellInfo->Id] = currMSTime;
return true;
}

void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sindragosa_unchained_magic_AuraScript::CheckProc);
}
};

AuraScript* GetAuraScript() const override
void Register() override
{
return new spell_sindragosa_unchained_magic_AuraScript();
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_unchained_magic::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
}
};

Expand Down Expand Up @@ -2012,7 +1956,7 @@ void AddSC_boss_sindragosa()
new boss_sindragosa();
new npc_ice_tomb();
new spell_sindragosa_s_fury();
new spell_sindragosa_unchained_magic();
RegisterSpellScript(spell_sindragosa_unchained_magic);
new spell_sindragosa_permeating_chill();
new spell_sindragosa_instability();
new spell_sindragosa_icy_grip();
Expand Down
Loading