From 253f4bf374ccaa83d20a7ff58e31b37300f4a26e Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 24 Dec 2008 10:57:04 -0600 Subject: *Fix the bug that many talents lose one point. --HG-- branch : trunk --- src/game/SharedDefines.h | 3 +-- src/game/Spell.cpp | 15 +++++++-------- src/game/SpellAuras.cpp | 2 +- src/game/SpellMgr.cpp | 1 + src/game/Unit.cpp | 19 ++++++++++++++++++- 5 files changed, 28 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index bf23a724520..51fba0b48ed 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -868,8 +868,7 @@ enum Targets TARGET_DEST_TARGET_ENEMY = 53, TARGET_UNIT_CONE_ENEMY_UNKNOWN = 54, TARGET_DEST_CASTER_FRONT_LEAP = 55, // for a leap spell - TARGET_RANDOM_RAID_MEMBER = 56, - //TARGET_UNIT_AREA_RAID + TARGET_UNIT_RAID = 56, TARGET_SINGLE_FRIEND_2 = 57, TARGET_UNIT_TARGET_RAID = 57, TARGET_UNIT_CONE_ALLY = 59, diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index ffac28c7c58..b3930a85520 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1473,6 +1473,12 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list &TagUnitMap) case TARGET_UNIT_PARTY_CASTER: m_caster->GetPartyMember(TagUnitMap, radius); break; + case TARGET_UNIT_RAID: + if(Unit *target = m_targets.getUnitTarget()) + TagUnitMap.push_back(target); + else + m_caster->GetRaidMember(TagUnitMap, radius); + break; } }break; @@ -1759,13 +1765,6 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list &TagUnitMap) TagUnitMap.push_back(m_caster); break; } - - case TARGET_RANDOM_RAID_MEMBER: - { - if (m_caster->GetTypeId() == TYPEID_PLAYER) - if(Player* target = ((Player*)m_caster)->GetNextRandomRaidMember(radius)) - TagUnitMap.push_back(target); - }break; case TARGET_CHAIN_HEAL: { Unit* pUnitTarget = m_targets.getUnitTarget(); @@ -3914,7 +3913,7 @@ uint8 Spell::CanCast(bool strict) SkillValue = 0; // add the damage modifier from the spell casted (cheat lock / skeleton key etc.) (use m_currentBasePoints, CalculateDamage returns wrong value) - SkillValue += m_currentBasePoints[i]+1; + SkillValue += m_currentBasePoints[i]/*+1*/; // get the required lock value int32 ReqValue=0; diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 36feb9b9375..1597b4a2b25 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -342,7 +342,7 @@ m_periodicTimer(0), m_PeriodicEventId(0), m_AuraDRGroup(DIMINISHING_NONE) if(!caster) { m_caster_guid = target->GetGUID(); - damage = m_currentBasePoints+1; // stored value-1 + //damage = m_currentBasePoints+1; // stored value-1 m_maxduration = target->CalculateSpellDuration(m_spellProto, m_effIndex, target); } else diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 432682d618e..705a69ea2a4 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -81,6 +81,7 @@ SpellMgr::SpellMgr() case TARGET_UNIT_MASTER: case TARGET_UNIT_PET: case TARGET_UNIT_PARTY_CASTER: + case TARGET_UNIT_RAID: SpellTargetType[i] = TARGET_TYPE_UNIT_CASTER; break; case TARGET_UNIT_MINIPET: diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e00b2446010..123dbbcf2eb 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -12943,8 +12943,25 @@ bool Unit::IsInRaidWith(Unit const *unit) const return false; } -void Unit::GetRaidMember(std::list &TagUnitMap, float radius) +void Unit::GetRaidMember(std::list &nearMembers, float radius) { + Player *owner = GetCharmerOrOwnerPlayerOrPlayerItself(); + if(!owner) + return; + + Group *pGroup = owner->GetGroup(); + if(!pGroup) + return; + + for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + { + Player* Target = itr->getSource(); + + // IsHostileTo check duel and controlled by enemy + if( Target && Target != this && Target->isAlive() + && IsWithinDistInMap(Target, radius) && !IsHostileTo(Target) ) + nearMembers.push_back(Target); + } } void Unit::GetPartyMember(std::list &TagUnitMap, float radius) -- cgit v1.2.3 From 4a917033c5da12c838d47bff6798434a1698655a Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 24 Dec 2008 11:12:34 -0600 Subject: *Fix the bug that boss is stunned by proc stun aura. --HG-- branch : trunk --- src/game/Unit.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 123dbbcf2eb..86d1d23be75 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -13003,17 +13003,23 @@ void Unit::GetPartyMember(std::list &TagUnitMap, float radius) void Unit::AddAura(uint32 spellId, Unit* target) { - if(!target) + if(!target || !target->isAlive()) return; SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); if(!spellInfo) return; + if (target->IsImmunedToSpell(spellInfo)) + return; + for(uint32 i = 0; i < 3; ++i) { if(spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA) { + if(target->IsImmunedToSpellEffect(spellInfo->Effect[i], spellInfo->EffectMechanic[i])) + continue; + if(spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_CASTER) { Aura *Aur = CreateAura(spellInfo, i, NULL, this, this); -- cgit v1.2.3