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

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

Browse Source 
* add cooldown to proc

* convert to spell and aurascript pair macro

* remove no longer needed validate override

* set cooldown with Cooldown field in table spell_proc_event
This commit is contained in:
Jelle Meeus
2024-05-26 18:12:20 +02:00
committed by GitHub
parent 29dda79638
commit bb1f7622cc
2 changed files with 20 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sql/updates/pending_db_world/rev_1716477609336515289.sql
+2
View File
@@ -0,0 +1,2 @@
--
UPDATE `spell_proc_event` SET `Cooldown`=600 WHERE `entry`=69762;
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+18 -74
View File
@@ -869,85 +869,29 @@ private:
bool _removeHealers; bool _removeHealers;
}; };
class spell_sindragosa_unchained_magic : public SpellScriptLoader class spell_sindragosa_unchained_magic : public SpellScript
{ {
public: PrepareSpellScript(spell_sindragosa_unchained_magic);
spell_sindragosa_unchained_magic() : SpellScriptLoader("spell_sindragosa_unchained_magic") { }
class spell_sindragosa_unchained_magic_SpellScript : public SpellScript void FilterTargets(std::list<WorldObject*>& unitList)
{ {
PrepareSpellScript(spell_sindragosa_unchained_magic_SpellScript); std::list<WorldObject*> healList = unitList;
std::list<WorldObject*> dpsList = unitList;
void FilterTargets(std::list<WorldObject*>& unitList) unitList.clear();
{ uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1);
std::list<WorldObject*> healList = unitList; healList.remove_if(UnchainedMagicTargetSelector(false));
std::list<WorldObject*> dpsList = unitList; if (healList.size() > maxSize)
unitList.clear(); Acore::Containers::RandomResize(healList, maxSize);
uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1); dpsList.remove_if(UnchainedMagicTargetSelector(true));
healList.remove_if(UnchainedMagicTargetSelector(false)); if (dpsList.size() > maxSize)
if (healList.size() > maxSize) Acore::Containers::RandomResize(dpsList, maxSize);
Acore::Containers::RandomResize(healList, maxSize); unitList.splice(unitList.begin(), healList);
dpsList.remove_if(UnchainedMagicTargetSelector(true)); unitList.splice(unitList.begin(), dpsList);
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);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_sindragosa_unchained_magic_SpellScript();
} }
class spell_sindragosa_unchained_magic_AuraScript : public AuraScript void Register() override
{ {
PrepareAuraScript(spell_sindragosa_unchained_magic_AuraScript); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_unchained_magic::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
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
{
return new spell_sindragosa_unchained_magic_AuraScript();
} }
}; };
@@ -2012,7 +1956,7 @@ void AddSC_boss_sindragosa()
new boss_sindragosa(); new boss_sindragosa();
new npc_ice_tomb(); new npc_ice_tomb();
new spell_sindragosa_s_fury(); new spell_sindragosa_s_fury();
new spell_sindragosa_unchained_magic(); RegisterSpellScript(spell_sindragosa_unchained_magic);
new spell_sindragosa_permeating_chill(); new spell_sindragosa_permeating_chill();
new spell_sindragosa_instability(); new spell_sindragosa_instability();
new spell_sindragosa_icy_grip(); new spell_sindragosa_icy_grip();