Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Fix Whispering Shadows target selection logic if there are less than 8 units hit that don't have Vampiric Touch on them

Browse Source
This commit is contained in:
Shauren
2024-03-25 11:36:02 +01:00
parent 84fb575f01
commit a83d4491f8
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -3257,32 +3257,28 @@ class spell_pri_whispering_shadows_effect : public SpellScript
if (targets.size() <= GetSpellValue()->MaxAffectedTargets)
return;
auto getVampiricTouch = [&](WorldObject const* target)
{
return target->ToUnit()->GetAura(SPELL_PRIEST_VAMPIRIC_TOUCH, GetCaster()->GetGUID());
};
// prioritize targets without Vampiric Touch
targets.sort([&](WorldObject const* target1, WorldObject const* target2)
{
int32 duration1 = 0;
if (Aura const* aura1 = target1->ToUnit()->GetAura(SPELL_PRIEST_VAMPIRIC_TOUCH, GetCaster()->GetGUID()))
if (Aura const* aura1 = getVampiricTouch(target1))
duration1 = aura1->GetDuration();
int32 duration2 = 0;
if (Aura const* aura2 = target2->ToUnit()->GetAura(SPELL_PRIEST_VAMPIRIC_TOUCH, GetCaster()->GetGUID()))
if (Aura const* aura2 = getVampiricTouch(target2))
duration2 = aura2->GetDuration();
return duration1 < duration2;
});
bool needRandomization = false;
auto firstVtTarget = std::find_if(targets.begin(), targets.end(), [&, noVtTargets = 0u](WorldObject const* target) mutable
{
if (target->ToUnit()->HasAura(SPELL_PRIEST_VAMPIRIC_TOUCH, GetCaster()->GetGUID()))
return true;
needRandomization = ++noVtTargets > GetSpellValue()->MaxAffectedTargets;
return false;
});
// remove targets that definitely will not get Vampiric Touch applied (excess targets with longest remaining duration)
while (targets.size() > GetSpellValue()->MaxAffectedTargets && getVampiricTouch(targets.back()) != nullptr)
targets.pop_back();
if (needRandomization)
{
targets.erase(firstVtTarget, targets.end());
// actual randomization done in Spell code before adding targets
}
Trinity::Containers::RandomResize(targets, GetSpellValue()->MaxAffectedTargets);
}
void HandleEffectHitTarget(SpellEffIndex /*effIndex*/) const