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

* Move Paladin Judgement bonuses to spell_bonus_data, thanks deltapower.inc

Browse Source 
* Avoid code duplication by moving spell interrupt code for jump effects to a common function for both EffectJump and EffectJumpDest, thanks devthenecro

--HG--
branch : trunk
This commit is contained in:
Shocker
2010-08-25 18:24:40 +03:00
parent 2c7cc99937
commit bd2ffab07a
4 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/base/world_database.sql
+3 -5
View File
@@ -5153,13 +5153,11 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
(32220, 0.0833, -1, 0.0533, -1, 'Paladin - Judgement of Blood Self'),
(20467, 0.25, -1, 0.16, -1, 'Paladin - Judgement of Command'),
(53733, 0.22, -1, 0.14, -1, 'Paladin - Judgement of Corruption'),
-- (20187, 0.4, -1, 0.25, -1, 'Paladin - Judgement of Righteousness'),
(20187, 0, 0, 0, 0, 'Paladin - Judgement of Righteousness'),
(20187, 0.32, 0, 0.2, 0, 'Paladin - Judgement of Righteousness'),
(53726, 0.25, -1, 0.16, -1, 'Paladin - Judgement of the Martyr Enemy'),
(53725, 0.0833, -1, 0.0533, -1, 'Paladin - Judgement of the Martyr Self'),
(31804, 0.22, -1, 0.14, -1, 'Paladin - Judgement of Vengeance'),
-- (54158, 0.25, -1, 0.16, -1, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'),
(54158, 0, 0, 0, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'),
(31804, 0.22, 0, 0.14, 0, 'Paladin - Judgement of Vengeance'),
(54158, 0.25, 0, 0.16, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'),
(58597, 0.75, -1, -1, -1, 'Paladin - Sacred Shield'),
(53601, 0.75, -1, -1, -1, 'Paladin - Sacred Shield'),
(31893, 0, 0, 0, 0, 'Paladin - Seal of Blood Proc Enemy'),
sql/updates/9587_world_spell_bonus_data.sql
+5
View File
@@ -0,0 +1,5 @@
DELETE FROM `spell_bonus_data` WHERE `entry` IN (54158, 20187, 31804);
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
(54158, 0.25, 0, 0.16, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'),
(20187, 0.32, 0, 0.2, 0, 'Paladin - Judgement of Righteousness'),
(31804, 0.22, 0, 0.14, 0, 'Paladin - Judgement of Vengeance');
src/server/game/Movement/MotionMaster.cpp
+4
View File
@@ -327,6 +327,10 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee
uint32 moveFlag = SPLINEFLAG_TRAJECTORY | SPLINEFLAG_WALKING;
uint32 time = uint32(speedZ * 100);
// Instantly interrupt non melee spells being casted
if (i_owner->IsNonMeleeSpellCasted(true))
i_owner->InterruptNonMeleeSpells(true);
i_owner->addUnitState(UNIT_STAT_CHARGING | UNIT_STAT_JUMPING);
i_owner->m_TempSpeed = speedXY;
if (i_owner->GetTypeId() == TYPEID_PLAYER)
src/server/game/Spells/SpellEffects.cpp
-24
View File
@@ -733,22 +733,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
{
damage += int32(m_caster->GetShieldBlockValue() * 1.3f);
}
// Judgements
else switch (m_spellInfo->Id)
{
case 20187:
case 54158:
case 31804:
float attackPower = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
float spellPower = (float)(m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)));
if (m_spellInfo->Id == 20187) // Judgement of Righteousness
damage += int32(0.2f * attackPower + 0.32f * spellPower);
if (m_spellInfo->Id == 54158) // Judgement of Wisdom, Light, Justice
damage += int32(0.16f * attackPower + 0.25f * spellPower);
if (m_spellInfo->Id == 31804) // Judgement of Vengeance
damage += int32(0.14f * attackPower + 0.22f * spellPower);
break;
}
break;
}
case SPELLFAMILY_DEATHKNIGHT:
@@ -2100,10 +2084,6 @@ void Spell::EffectJump(uint32 i)
if (m_caster->isInFlight())
return;
// Instantly interrupt non melee spells being casted
if (m_caster->IsNonMeleeSpellCasted(true))
m_caster->InterruptNonMeleeSpells(true);
float x,y,z,o;
if (m_targets.getUnitTarget())
{
@@ -2131,10 +2111,6 @@ void Spell::EffectJumpDest(uint32 i)
if (m_caster->isInFlight())
return;
// Instantly interrupt non melee spells being casted
if (m_caster->IsNonMeleeSpellCasted(true))
m_caster->InterruptNonMeleeSpells(true);
// Init dest coordinates
float x,y,z,o;
if (m_targets.HasDst())