From 4bb524eec3a9be581d627872e4b1504242561695 Mon Sep 17 00:00:00 2001 From: breakwater Date: Sun, 29 May 2011 00:50:53 +0400 Subject: [PATCH] [11556] Implement spell 42005 proper target seelction. Also * added TargetDistanceOrderFarAway ordering function and * renamed TargetDistanceOrder -> TargetDistanceOrderFarAway Signed-off-by: VladimirMangos --- src/game/Spell.cpp | 47 ++++++++++++++++++++++++++++++---------- src/shared/revision_nr.h | 2 +- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index a758504e19b..9c2f391ab99 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1500,10 +1500,10 @@ class ChainHealingFullHealth: std::unary_function // Helper for targets nearest to the spell target // The spell target is always first unless there is a target at _completely_ the same position (unbelievable case) -struct TargetDistanceOrder : public std::binary_function +struct TargetDistanceOrderNear : public std::binary_function { const Unit* MainTarget; - TargetDistanceOrder(const Unit* Target) : MainTarget(Target) {}; + TargetDistanceOrderNear(const Unit* Target) : MainTarget(Target) {}; // functor for operator ">" bool operator()(const Unit* _Left, const Unit* _Right) const { @@ -1511,6 +1511,19 @@ struct TargetDistanceOrder : public std::binary_function +{ + const Unit* MainTarget; + TargetDistanceOrderFarAway(const Unit* Target) : MainTarget(Target) {}; + // functor for operator "<" + bool operator()(const Unit* _Left, const Unit* _Right) const + { + return !MainTarget->GetDistanceOrder(_Left, _Right); + } +}; + void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& targetUnitMap) { float radius; @@ -1676,7 +1689,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& if(tempTargetUnitMap.empty()) break; - tempTargetUnitMap.sort(TargetDistanceOrder(m_caster)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(m_caster)); //Now to get us a random target that's in the initial range of the spell uint32 t = 0; @@ -1694,7 +1707,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& tempTargetUnitMap.erase(itr); - tempTargetUnitMap.sort(TargetDistanceOrder(pUnitTarget)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget)); t = unMaxTargets - 1; Unit *prev = pUnitTarget; @@ -1714,7 +1727,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& prev = *next; targetUnitMap.push_back(prev); tempTargetUnitMap.erase(next); - tempTargetUnitMap.sort(TargetDistanceOrder(prev)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(prev)); next = tempTargetUnitMap.begin(); --t; @@ -1736,7 +1749,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& if(tempTargetUnitMap.empty()) break; - tempTargetUnitMap.sort(TargetDistanceOrder(m_caster)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(m_caster)); //Now to get us a random target that's in the initial range of the spell uint32 t = 0; @@ -1754,7 +1767,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& tempTargetUnitMap.erase(itr); - tempTargetUnitMap.sort(TargetDistanceOrder(pUnitTarget)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget)); t = unMaxTargets - 1; Unit *prev = pUnitTarget; @@ -1773,7 +1786,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& prev = *next; targetUnitMap.push_back(prev); tempTargetUnitMap.erase(next); - tempTargetUnitMap.sort(TargetDistanceOrder(prev)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(prev)); next = tempTargetUnitMap.begin(); --t; } @@ -1821,7 +1834,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& if (tempTargetUnitMap.empty()) break; - tempTargetUnitMap.sort(TargetDistanceOrder(pUnitTarget)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget)); if (*tempTargetUnitMap.begin() == pUnitTarget) tempTargetUnitMap.erase(tempTargetUnitMap.begin()); @@ -1843,7 +1856,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& prev = *next; targetUnitMap.push_back(prev); tempTargetUnitMap.erase(next); - tempTargetUnitMap.sort(TargetDistanceOrder(prev)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(prev)); next = tempTargetUnitMap.begin(); --t; } @@ -1852,6 +1865,16 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& } case TARGET_ALL_ENEMY_IN_AREA: FillAreaTargets(targetUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE); + + if (m_spellInfo->Id == 42005) // Bloodboil + { + // manually cuting, because the spell hits only the 5 furthest away targets + if (targetUnitMap.size() > unMaxTargets) + { + targetUnitMap.sort(TargetDistanceOrderFarAway(m_caster)); + targetUnitMap.resize(unMaxTargets); + } + } break; case TARGET_AREAEFFECT_INSTANT: { @@ -2358,7 +2381,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& if (m_caster != pUnitTarget && std::find(tempTargetUnitMap.begin(), tempTargetUnitMap.end(), m_caster) == tempTargetUnitMap.end()) tempTargetUnitMap.push_front(m_caster); - tempTargetUnitMap.sort(TargetDistanceOrder(pUnitTarget)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(pUnitTarget)); if (tempTargetUnitMap.empty()) break; @@ -2391,7 +2414,7 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& prev = *next; targetUnitMap.push_back(prev); tempTargetUnitMap.erase(next); - tempTargetUnitMap.sort(TargetDistanceOrder(prev)); + tempTargetUnitMap.sort(TargetDistanceOrderNear(prev)); next = tempTargetUnitMap.begin(); --t; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 49110816e59..fc60b0ac389 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11555" + #define REVISION_NR "11556" #endif // __REVISION_NR_H__