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

Core/Spells: Fix Chain Heal

Browse Source
This commit is contained in:
mik1893
2016-08-02 19:33:09 +01:00
committed by Yehonal
parent 5b51a76848
commit 6773cd3128
1 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+5 -26
View File
@@ -1930,39 +1930,22 @@ void Spell::SearchChainTargets(std::list<WorldObject*>& targets, uint32 chainTar
// max dist which spell can reach // max dist which spell can reach
float searchRadius = jumpRadius; float searchRadius = jumpRadius;
if (isBouncingFar && !isChainHeal) if (isBouncingFar)
searchRadius *= chainTargets; searchRadius *= chainTargets;
// Xinef: the distance should be increased by caster size, it is neglected in latter calculations
std::list<WorldObject*> tempTargets; std::list<WorldObject*> tempTargets;
SearchAreaTargets(tempTargets, searchRadius, (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE ? m_caster : target), m_caster, objectType, selectType, condList); SearchAreaTargets(tempTargets, searchRadius, target, m_caster, objectType, selectType, condList);
tempTargets.remove(target); tempTargets.remove(target);
// xinef: if we have select category nearby and checktype entry, select random of what we have, not by distance
if (selectCategory == TARGET_SELECT_CATEGORY_NEARBY && selectType == TARGET_CHECK_ENTRY)
{
Trinity::Containers::RandomResizeList(tempTargets, chainTargets);
targets = tempTargets;
return;
}
// remove targets which are always invalid for chain spells // remove targets which are always invalid for chain spells
// for some spells allow only chain targets in front of caster (swipe for example) // for some spells allow only chain targets in front of caster (swipe for example)
if (!isBouncingFar) if (!isBouncingFar)
{ {
float allowedArc = 0.0f;
if (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE)
allowedArc = (M_PI*7.0f) / 18.0f; // 70 degrees
else if (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED)
allowedArc = M_PI*0.5f; // 90 degrees
for (std::list<WorldObject*>::iterator itr = tempTargets.begin(); itr != tempTargets.end();) for (std::list<WorldObject*>::iterator itr = tempTargets.begin(); itr != tempTargets.end();)
{ {
std::list<WorldObject*>::iterator checkItr = itr++; std::list<WorldObject*>::iterator checkItr = itr++;
if (!m_caster->HasInArc(static_cast<float>(M_PI), *checkItr)) if (!m_caster->HasInArc(static_cast<float>(M_PI), *checkItr))
tempTargets.erase(checkItr); tempTargets.erase(checkItr);
else if (allowedArc > 0.0f && !m_caster->HasInArc(allowedArc, *checkItr, (*checkItr)->GetObjectSize()))
tempTargets.erase(checkItr);
} }
} }
@@ -1976,14 +1959,10 @@ void Spell::SearchChainTargets(std::list<WorldObject*>& targets, uint32 chainTar
uint32 maxHPDeficit = 0; uint32 maxHPDeficit = 0;
for (std::list<WorldObject*>::iterator itr = tempTargets.begin(); itr != tempTargets.end(); ++itr) for (std::list<WorldObject*>::iterator itr = tempTargets.begin(); itr != tempTargets.end(); ++itr)
{ {
if (Unit* itrTarget = (*itr)->ToUnit()) if (Unit* unit = (*itr)->ToUnit())
{ {
uint32 deficit = itrTarget->GetMaxHealth() - itrTarget->GetHealth(); uint32 deficit = unit->GetMaxHealth() - unit->GetHealth();
// xinef: chain should not heal targets with max health if ((deficit > maxHPDeficit || foundItr == tempTargets.end()) && target->IsWithinDist(unit, jumpRadius) && target->IsWithinLOSInMap(unit))
if (deficit == 0)
continue;
if ((deficit > maxHPDeficit || foundItr == tempTargets.end()) && target->IsWithinDist(itrTarget, jumpRadius) && target->IsWithinLOSInMap(itrTarget))
{ {
foundItr = itr; foundItr = itr;
maxHPDeficit = deficit; maxHPDeficit = deficit;