mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 04:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9020] Re-implement 1680 (and triggred spell for 46924) in less hack way.

Browse source
This commit is contained in:
VladimirMangos 2009-12-18 06:11:00 +03:00
parent cc9072c89f
commit 6b78ed534d
3 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/Spell.cpp
View file

@ -581,11 +581,13 @@ void Spell::FillTargetMap()
SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap);
} }
break; break;
case 0:
SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap);
tmpUnitMap.push_back(m_caster);
break;
default: default:
{
SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); SetTargetMap(i, m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap);
SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); SetTargetMap(i, m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap);
}
break; break;
} }
break; break;
@ -1304,7 +1306,7 @@ void Spell::SetTargetMap(uint32 effIndex,uint32 targetMode,UnitList& TagUnitMap)
{ {
case SPELLFAMILY_DRUID: case SPELLFAMILY_DRUID:
// Starfall // Starfall
if (m_spellInfo->SpellFamilyFlags2 & UI64LIT(0x00000100)) if (m_spellInfo->SpellFamilyFlags2 & 0x00000100)
unMaxTargets = 2; unMaxTargets = 2;
break; break;
default: default:

8
src/game/SpellEffects.cpp
View file

@ -4580,14 +4580,8 @@ void Spell::EffectWeaponDmg(uint32 i)
{ {
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{ {
// Whirlwind, single only spell with 2 weapon white damage apply if have
if(m_caster->GetTypeId()==TYPEID_PLAYER && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x00000400000000)))
{
if(((Player*)m_caster)->GetWeaponForAttack(OFF_ATTACK, true, true))
spell_bonus += m_caster->CalculateDamage (OFF_ATTACK, normalized);
}
// Devastate bonus and sunder armor refresh // Devastate bonus and sunder armor refresh
else if(m_spellInfo->SpellVisual[0] == 12295 && m_spellInfo->SpellIconID == 1508) if(m_spellInfo->SpellVisual[0] == 12295 && m_spellInfo->SpellIconID == 1508)
{ {
uint32 stack = 0; uint32 stack = 0;
// Need refresh all Sunder Armor auras from this caster // Need refresh all Sunder Armor auras from this caster

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9019" #define REVISION_NR "9020"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__