Revert "Implement Flametongue Totem handling"

This is not needed for wotlk Thanks @boxa, @killerwife This reverts commit 2150b905dbab87d54e5798155cb04590396e1863.
cmangos · Jan 15, 2017 · 48af468 · 48af468
1 parent 78810fa
commit 48af468
Showing 1 changed file with 4 additions and 17 deletions.
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
@@ -3817,17 +3817,17 @@ void Spell::EffectDummy(SpellEffectEntry const* effect)
                 m_caster->CastCustomSpell(unitTarget, 52032, &damage, nullptr, nullptr, TRIGGERED_OLD_TRIGGERED, nullptr, nullptr, m_originalCasterGUID);
                 return;
             }
-
-            if (shamClassOptions && shamClassOptions->SpellFamilyFlags & uint64(0x0000000000200000)) // Flametongue Weapon Proc, Ranks
+            // Flametongue Weapon Proc, Ranks
+            if (shamClassOptions && shamClassOptions->SpellFamilyFlags & uint64(0x0000000000200000))
             {
                 if (m_CastItem)
                 {
                     int32 bonusDamage = m_caster->SpellBaseDamageBonusDone(GetSpellSchoolMask(m_spellInfo))
                         + unitTarget->SpellBaseDamageBonusTaken(GetSpellSchoolMask(m_spellInfo));
-                    // Does Amplify Magic/Dampen Magic influence flametongue? If not, the above addition must be removed.
+                        // Does Amplify Magic/Dampen Magic influence flametongue? If not, the above addition must be removed.
                     float weaponSpeed = float(m_CastItem->GetProto()->Delay) / IN_MILLISECONDS;
                     bonusDamage = m_caster->SpellBonusWithCoeffs(m_spellInfo, bonusDamage, 0, 0, SPELL_DIRECT_DAMAGE, false); // apply spell coeff
-                    int32 totalDamage = (damage * 0.01 * weaponSpeed) + bonusDamage;
+                    int32 totalDamage = ((damage + bonusDamage) * 0.01 * weaponSpeed);
 
                     m_caster->CastCustomSpell(unitTarget, 10444, &totalDamage, nullptr, nullptr, TRIGGERED_OLD_TRIGGERED, m_CastItem);
                 }
@@ -3836,19 +3836,6 @@ void Spell::EffectDummy(SpellEffectEntry const* effect)
 
                 return;
             }
-            if (m_spellInfo->SpellFamilyFlags & uint64(0x0000000400000000)) // Flametongue Totem Proc, Ranks
-            {
-                if (m_CastItem) // Does not scale with gear
-                {
-                    float weaponSpeed = float(m_CastItem->GetProto()->Delay) / IN_MILLISECONDS;
-                    int32 totalDamage = (damage * 0.01 * weaponSpeed);
-                    m_caster->CastCustomSpell(unitTarget, 16368, &totalDamage, nullptr, nullptr, true, m_CastItem);
-                }
-                else
-                    sLog.outError("Spell::EffectDummy: spell %i requires cast Item", m_spellInfo->Id);
-
-                return;
-            }
             if (m_spellInfo->Id == 39610)                   // Mana Tide Totem effect
             {
                 if (!unitTarget || unitTarget->GetPowerType() != POWER_MANA)