[patch]Charge (Warrior)

[Auntie Mangos]

http://getmangos.eu/community/viewtopic.php?id=10273

[virusav]

Warrior for leveling talent Warbringer (http://www.wowhead.com/spell=57499) may use the ability Charge (http://www.wowhead.com/search?q=Charge#abilities) regardless of the battle.

Currently you can not use Charge during the battle.

Path:

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 5e1e430..0b6fee5 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4212,7 +4212,13 @@ SpellCastResult Spell::CheckCast(bool strict)
            if(bg->GetStatus() == STATUS_WAIT_LEAVE)
                return SPELL_FAILED_DONT_REPORT;

-    if (m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo))
+    bool bNonCombatSpell = IsNonCombatSpell(m_spellInfo);
+    
+    // Warbringer
+    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && m_spellInfo->Category == 1219 && m_spellInfo->SpellIconID == 457 && (m_caster->HasAura(57499) || m_caster->HasAura(64976)))
+        bNonCombatSpell = false;
+
+    if (m_caster->isInCombat() && bNonCombatSpell)
        return m_triggeredByAuraSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_AFFECTING_COMBAT;

    if (m_caster->GetTypeId() == TYPEID_PLAYER && !((Player*)m_caster)->isGameMaster() && 

[michalpolko]

what about Effect#1: Apply Aura #262? shouldn't it be handled somehow in this case? this patch looks like an ugly hack to me...

[virusav]

Updated patch with the addition of processing spell 64976.

Function SPELL_AURA_262 effect is still unknown, different spells with this effect I have found no resolution of spells in different racks.

[michalpolko]

how about checking if caster HasAuraType(SPELL_AURA_#262) in CheckCast()?

I know that it is still unresolved what this aura really is... I'll check the rest of spells with this aura type.

something like:

-    if (m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo))
+    if (m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo) && !HasAuraType(SPELL_AURA_262))

plus of course the whole stuff connected with adding the new SPELL_AURA_TYPE ;p

I think it should be called SPELL_AURA_MOD_IGNORE_SPELL_RESTRICTIONS

[VladimirMangos]

In [10762] added alt. patch