[8173] Fixes for 1822 and ranks base at spell_check detection Author: VladimirMangos

* Update AP bonus per tick to 0.18 as expected in 3.0.2 and later.
    * Better spell selction to avoid unrelated spells for AP bonuses

--HG--
branch : trunk

src/game/SpellAuras.cpp

@@ -4763,8 +4763,8 @@ void AuraEffect::HandlePeriodicDamage(bool apply, bool Real, bool changeAmount)
             // Rake
             if (m_spellProto->SpellFamilyFlags[0] & 0x1000)
             {
-                // $AP*0.06 bonus per tick
-                m_amount += int32(caster->GetTotalAttackPowerValue(BASE_ATTACK) * 6 / 100);
+                // $AP*0.18 bonus per tick
+                m_amount += int32(caster->GetTotalAttackPowerValue(BASE_ATTACK) * 18 / 100);
                 return;
             }
             // Lacerate

src/game/SpellEffects.cpp

@@ -521,8 +521,9 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     damage += int32(((Player*)m_caster)->GetComboPoints() * ap * 7 / 100);
                 }
                 // Rake
-                else if(m_spellInfo->SpellFamilyFlags[0] & 0x1000)
+                else if(m_spellInfo->SpellFamilyFlags[0] & 0x1000 && m_spellInfo->Effect[2]==SPELL_EFFECT_ADD_COMBO_POINTS)
                 {
+                    // $AP*0.01 bonus
                     damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
                 }
                 // Swipe