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

[7561] Cleanup effectWeaponDmg from now oudataed special case.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
pasdVn 2009-03-28 06:04:56 +03:00 • committed by VladimirMangos
parent 036a74b284
commit 1ad5f9a7b2
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/game/SpellEffects.cpp
View file

@ -4282,11 +4282,9 @@ void Spell::EffectWeaponDmg(uint32 i)
} }
// some spell specific modifiers // some spell specific modifiers
bool customBonusDamagePercentMod = false;
bool spellBonusNeedWeaponDamagePercentMod = false; // if set applied weapon damage percent mode to spell bonus bool spellBonusNeedWeaponDamagePercentMod = false; // if set applied weapon damage percent mode to spell bonus
float bonusDamagePercentMod = 1.0f; // applied to fixed effect damage bonus if set customBonusDamagePercentMod float weaponDamagePercentMod = 1.0f; // applied to weapon damage and to fixed effect damage bonus
float weaponDamagePercentMod = 1.0f; // applied to weapon damage (and to fixed effect damage bonus if customBonusDamagePercentMod not set
float totalDamagePercentMod = 1.0f; // applied to final bonus+weapon damage float totalDamagePercentMod = 1.0f; // applied to final bonus+weapon damage
bool normalized = false; bool normalized = false;
@ -4325,14 +4323,8 @@ void Spell::EffectWeaponDmg(uint32 i)
} }
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:
{ {
// Ambush
if(m_spellInfo->SpellFamilyFlags & 0x00000200LL)
{
customBonusDamagePercentMod = true;
bonusDamagePercentMod = 2.5f; // 250%
}
// Mutilate (for each hand) // Mutilate (for each hand)
else if(m_spellInfo->SpellFamilyFlags & 0x600000000LL) if(m_spellInfo->SpellFamilyFlags & 0x600000000LL)
{ {
bool found = false; bool found = false;
// fast check // fast check
@ -4405,9 +4397,6 @@ void Spell::EffectWeaponDmg(uint32 i)
weaponDamagePercentMod *= float(CalculateDamage(j,unitTarget)) / 100.0f; weaponDamagePercentMod *= float(CalculateDamage(j,unitTarget)) / 100.0f;
// applied only to prev.effects fixed damage // applied only to prev.effects fixed damage
if(customBonusDamagePercentMod)
fixed_bonus = int32(fixed_bonus*bonusDamagePercentMod);
else
fixed_bonus = int32(fixed_bonus*weaponDamagePercentMod); fixed_bonus = int32(fixed_bonus*weaponDamagePercentMod);
break; break;
default: default:

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 "7560" #define REVISION_NR "7561"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__