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

Fix one palain seal damage calculation (remove dead code)

Browse source 
Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-01-17 20:24:24 +03:00
parent 2cd801a9ef
commit a17dd3c0a0
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/SpellEffects.cpp
View file

@ -1608,6 +1608,14 @@ void Spell::EffectDummy(uint32 i)
switch(m_spellInfo->Id) switch(m_spellInfo->Id)
{ {
// Judgement of Righteousness (0.2*$AP+0.32*$SPH) holy added in spellDamagBonus
case 20187:
{
if (!unitTarget)
return;
m_damage+=int32(0.2f*m_caster->GetTotalAttackPowerValue(BASE_ATTACK));
return;
}
case 31789: // Righteous Defense (step 1) case 31789: // Righteous Defense (step 1)
{ {
// 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target) // 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target)

22
src/game/Unit.cpp
View file

@ -7375,21 +7375,10 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
DotFactor = 0.95f; DotFactor = 0.95f;
CastingTime = 3500; CastingTime = 3500;
} }
// Seal of Righteousness - 10.2%/9.8% ( based on weapon type ) of Holy Damage, multiplied by weapon speed // Judgement of Righteousness - 32%
else if((spellProto->SpellFamilyFlags & 0x8000000LL) && spellProto->SpellIconID == 25) else if (spellProto->SpellFamilyFlags & 0x0000000000000400LL)
{ {
Item *item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND); CastingTime = 1120;
float wspeed = GetAttackTime(BASE_ATTACK)/1000.0f;
if( item && item->GetProto()->InventoryType == INVTYPE_2HWEAPON)
CastingTime = uint32(wspeed*3500*0.102f);
else
CastingTime = uint32(wspeed*3500*0.098f);
}
// Judgement of Righteousness - 73%
else if ((spellProto->SpellFamilyFlags & 1024) && spellProto->SpellIconID == 25)
{
CastingTime = 2555;
} }
// Seal of Vengeance - 17% per Fully Stacked Tick - 5 Applications // Seal of Vengeance - 17% per Fully Stacked Tick - 5 Applications
else if ((spellProto->SpellFamilyFlags & 0x80000000000LL) && spellProto->SpellIconID == 2292) else if ((spellProto->SpellFamilyFlags & 0x80000000000LL) && spellProto->SpellIconID == 2292)
@ -7407,11 +7396,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
{ {
CastingTime = 0; CastingTime = 0;
} }
// Seal of Righteousness trigger - already computed for parent spell
else if ( spellProto->SpellFamilyName==SPELLFAMILY_PALADIN && spellProto->SpellIconID==25 && spellProto->AttributesEx4 & 0x00800000LL )
{
return pdamage;
}
break; break;
case SPELLFAMILY_SHAMAN: case SPELLFAMILY_SHAMAN:
// totem attack // totem attack