josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix bug that potions and other energize effects make client display twice as much of a gain, by nos4r2zod.

Browse Source 
* Rename 'EffectEnergisePct' to 'EffectEnergizePct'

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-06-08 21:19:34 +02:00
parent 065600bdf6
commit 91e9b27449
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.h
+1 -1
View File
@@ -354,7 +354,7 @@ class Spell
void EffectStealBeneficialBuff(uint32 i); void EffectStealBeneficialBuff(uint32 i);
void EffectUnlearnSpecialization(uint32 i); void EffectUnlearnSpecialization(uint32 i);
void EffectHealPct(uint32 i); void EffectHealPct(uint32 i);
void EffectEnergisePct(uint32 i); void EffectEnergizePct(uint32 i);
void EffectTriggerSpellWithValue(uint32 i); void EffectTriggerSpellWithValue(uint32 i);
void EffectTriggerRitualOfSummoning(uint32 i); void EffectTriggerRitualOfSummoning(uint32 i);
void EffectKillCredit(uint32 i); void EffectKillCredit(uint32 i);
src/game/SpellAuras.cpp
+1 -1
View File
@@ -1732,8 +1732,8 @@ void AuraEffect::TriggerSpell()
if (mana) if (mana)
{ {
mana /= 10; mana /= 10;
caster->ModifyPower( POWER_MANA, mana );
caster->SendEnergizeSpellLog(caster, 23493, mana, POWER_MANA); caster->SendEnergizeSpellLog(caster, 23493, mana, POWER_MANA);
caster->ModifyPower( POWER_MANA, mana );
} }
return; return;
} }
src/game/SpellEffects.cpp
+5 -5
View File
@@ -201,7 +201,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
&Spell::EffectKillCredit, //134 SPELL_EFFECT_KILL_CREDIT misc value is creature entry &Spell::EffectKillCredit, //134 SPELL_EFFECT_KILL_CREDIT misc value is creature entry
&Spell::EffectNULL, //135 SPELL_EFFECT_CALL_PET &Spell::EffectNULL, //135 SPELL_EFFECT_CALL_PET
&Spell::EffectHealPct, //136 SPELL_EFFECT_HEAL_PCT &Spell::EffectHealPct, //136 SPELL_EFFECT_HEAL_PCT
&Spell::EffectEnergisePct, //137 SPELL_EFFECT_ENERGIZE_PCT &Spell::EffectEnergizePct, //137 SPELL_EFFECT_ENERGIZE_PCT
&Spell::EffectJump2, //138 SPELL_EFFECT_138 Leap &Spell::EffectJump2, //138 SPELL_EFFECT_138 Leap
&Spell::EffectUnused, //139 SPELL_EFFECT_CLEAR_QUEST (misc - is quest ID) &Spell::EffectUnused, //139 SPELL_EFFECT_CLEAR_QUEST (misc - is quest ID)
&Spell::EffectForceCast, //140 SPELL_EFFECT_FORCE_CAST &Spell::EffectForceCast, //140 SPELL_EFFECT_FORCE_CAST
@@ -2441,9 +2441,9 @@ void Spell::EffectPowerDrain(uint32 i)
int32 gain = int32(new_damage * manaMultiplier); int32 gain = int32(new_damage * manaMultiplier);
m_caster->ModifyPower(POWER_MANA,gain);
//send log //send log
m_caster->SendEnergizeSpellLog(m_caster, m_spellInfo->Id, gain, POWER_MANA); m_caster->SendEnergizeSpellLog(m_caster, m_spellInfo->Id, gain, POWER_MANA);
m_caster->ModifyPower(POWER_MANA,gain);
} }
} }
@@ -2871,8 +2871,8 @@ void Spell::EffectEnergize(uint32 i)
if(unitTarget->GetMaxPower(power) == 0) if(unitTarget->GetMaxPower(power) == 0)
return; return;
unitTarget->ModifyPower(power,damage);
m_caster->SendEnergizeSpellLog(unitTarget, m_spellInfo->Id, damage, power); m_caster->SendEnergizeSpellLog(unitTarget, m_spellInfo->Id, damage, power);
unitTarget->ModifyPower(power,damage);
// Mad Alchemist's Potion // Mad Alchemist's Potion
if (m_spellInfo->Id == 45051) if (m_spellInfo->Id == 45051)
@@ -2917,7 +2917,7 @@ void Spell::EffectEnergize(uint32 i)
} }
} }
void Spell::EffectEnergisePct(uint32 i) void Spell::EffectEnergizePct(uint32 i)
{ {
if(!unitTarget) if(!unitTarget)
return; return;
@@ -2934,8 +2934,8 @@ void Spell::EffectEnergisePct(uint32 i)
return; return;
uint32 gain = damage * maxPower / 100; uint32 gain = damage * maxPower / 100;
unitTarget->ModifyPower(power, gain);
m_caster->SendEnergizeSpellLog(unitTarget, m_spellInfo->Id, gain, power); m_caster->SendEnergizeSpellLog(unitTarget, m_spellInfo->Id, gain, power);
unitTarget->ModifyPower(power, gain);
} }
void Spell::SendLoot(uint64 guid, LootType loottype) void Spell::SendLoot(uint64 guid, LootType loottype)