[patch] Lock and Load cooldown

[KAPATEJIb]

What bug does the patch fix? What features does the patch add?

added 22 secs cooldown for http://www.wowhead.com/?spell=56342 and ranks

For which repository revision was the patch created?

any

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

can't find any

Who has been writing this patch? Please include either forum user names or email addresses.

Me

update spell_proc_event set Cooldown=22 where entry in (56342,56343,56344);

[przemratajczak]

it is also not procing from effects of Frost Trap. other traps and spells that should proc spell are directly casted by player ( respective shots and traps has has assigned final effect spells) are working fine. Frost trap has assigned spell 63487 which triggers two other spells and thos handle final effects. Maybe this is a clue.

[laise]

try this :

-- (56342) Lock and Load (Rank 1,2,3)
DELETE FROM `spell_proc_event` WHERE `entry` IN (56342,56343,56344);
INSERT INTO `spell_proc_event` VALUES
(56342, 0x00, 9, 0x00000080, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0.000000, 0.000000, 22);
INSERT INTO `spell_proc_event` VALUES
(56343, 0x00, 9, 0x00000080, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0.000000, 0.000000, 22);
INSERT INTO `spell_proc_event` VALUES
(56344, 0x00, 9, 0x00000080, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0.000000, 0.000000, 22);

[pasdVn]

Won't work :-(. This requires some deeper changes in proc system, because frost trap applies a persistent area aura and has no direct unit target.

Edit: But the cooldown part is correct ofc imo!

[KAPATEJIb]

bump.......

[reeshack]

I am not sure, but I think that the CD should be handled by spell Lock and Load Marker and not by sql update...

EDIT: my idea was to do it somehow like this:

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 95ae494..a0d3701 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2619,6 +2619,13 @@ void Spell::cast(bool skipCheck)
                AddTriggeredSpell(52874);                   // Fan of Knives (offhand)
            }
            break;
+        case SPELLFAMILY_HUNTER:
+        {
+            // Lock and Load 
+            if (m_spellInfo->Id == 56453) 
+                AddPrecastSpell(67544);                 // Lock and Load Marker
+            break;
+        }
        case SPELLFAMILY_PALADIN:
        {
            // Hand of Reckoning
@@ -3959,6 +3966,10 @@ SpellCastResult Spell::CheckCast(bool strict)
            return SPELL_FAILED_NOT_READY;
    }

+    // Lock and Load Marker - sets Lock and Load cooldown
+    if (m_caster->HasAura(67544) && m_spellInfo->Id == 56453)
+        return SPELL_FAILED_DONT_REPORT;
+
    // only allow triggered spells if at an ended battleground
    if( !m_IsTriggeredSpell && m_caster->GetTypeId() == TYPEID_PLAYER)
        if(BattleGround * bg = ((Player*)m_caster)->GetBattleGround())

but it is rather an advise, have not tested it properly

[jluis859]

What bug does the patch fix? What features does the patch add?

added 22 secs cooldown for http://www.wowhead.com/?spell=56342 and ranks

For which repository revision was the patch created?

any

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

can't find any

Who has been writing this patch? Please include either forum user names or email addresses.

Me

update spell_proc_event set Cooldown=22 where entry in (56342,56343,56344);

does this fix work properly??

[zergtmn]

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 29592ad..32eb6d4 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2654,6 +2654,13 @@ void Spell::cast(bool skipCheck)
                AddTriggeredSpell(52874);                   // Fan of Knives (offhand)
            }
            break;
+        case SPELLFAMILY_HUNTER:
+        {
+            // Lock and Load
+            if (m_spellInfo->Id == 56453)
+                AddPrecastSpell(67544);                     // Lock and Load Marker
+            break;
+        }
        case SPELLFAMILY_PALADIN:
        {
            // Hand of Reckoning
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c29ce02..0bab448 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7515,6 +7515,13 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
                if (!(procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000020)))
                    return false;
            }
+            // Lock and Load
+            else if (auraSpellInfo->SpellIconID == 3579)
+            {
+                // Check for Lock and Load Marker
+                if (HasAura(67544))
+                    return false;
+            }
            break;
        case SPELLFAMILY_PALADIN:
        {