diff options
| author | megamage <none@none> | 2009-07-12 18:09:41 +0800 |
|---|---|---|
| committer | megamage <none@none> | 2009-07-12 18:09:41 +0800 |
| commit | 2750d95a5d644a6d1a7b30001f69c80007e4cfd5 (patch) | |
| tree | 51085bc1ca875e1f50814b697c0d465d28562424 /src | |
| parent | 8fedc832e8dc2655c7a6ef357c675233a4537e07 (diff) | |
[8165] Correctly add quest talent points count for characters on lvl 55. Author: ApoC
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Player.cpp | 3 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 029a2b0f86b..7ea38d6ba0d 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -20496,7 +20496,8 @@ uint32 Player::CalculateTalentsPoints() const if(getClass() != CLASS_DEATH_KNIGHT) return uint32(base_talent * sWorld.getRate(RATE_TALENT)); - uint32 talentPointsForLevel = getLevel() < 56 ? 0 : getLevel() - 55 + m_questRewardTalentCount; + uint32 talentPointsForLevel = getLevel() < 56 ? 0 : getLevel() - 55; + talentPointsForLevel += m_questRewardTalentCount; if(talentPointsForLevel > base_talent) talentPointsForLevel = base_talent; diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 5e2dd395101..49690e63d74 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1079,14 +1079,7 @@ void Spell::EffectDummy(uint32 i) else // backfire 20% m_caster->CastSpell(unitTarget, 30504, true, m_CastItem); return; - case 55004: //Nitro Boosts - if(!m_CastItem) return; - if(roll_chance_i(95)) //success - m_caster->CastSpell(m_caster, 54861, true, m_CastItem); - else //backfire 5% - m_caster->CastSpell(m_caster, 46014, true, m_CastItem); - return; - case 33060: // Make a Wish + case 33060: // Make a Wish { if(m_caster->GetTypeId()!=TYPEID_PLAYER) return; @@ -1208,6 +1201,13 @@ void Spell::EffectDummy(uint32 i) m_caster->CastSpell(m_caster, 45088, true); return; } + case 55004: // Nitro Boosts + if(!m_CastItem) return; + if(roll_chance_i(95)) //success + m_caster->CastSpell(m_caster, 54861, true, m_CastItem); + else //backfire 5% + m_caster->CastSpell(m_caster, 46014, true, m_CastItem); + return; case 50243: // Teach Language { if(m_caster->GetTypeId() != TYPEID_PLAYER) |