diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2016_09_04_01_world.sql | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 17 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_hunter.cpp | 69 |
5 files changed, 74 insertions, 20 deletions
diff --git a/sql/updates/world/3.3.5/2016_09_04_01_world.sql b/sql/updates/world/3.3.5/2016_09_04_01_world.sql new file mode 100644 index 00000000000..a2836a57364 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_04_01_world.sql @@ -0,0 +1,4 @@ +UPDATE `spell_proc_event` SET `SpellFamilyName`=9, `SpellFamilyMask0`=24, `SpellFamilyMask1`=0x08000000, `SpellFamilyMask2`=0x00024000, `procFlags`=0, `procEx`=0, `ppmRate`=0, `CustomChance`=0, `Cooldown`=0 WHERE `entry`=-56342; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hun_lock_and_load'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(-56342, 'spell_hun_lock_and_load'); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e9bb3b5b92b..0feebfce220 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6433,15 +6433,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } break; } - case 3579: // Lock and Load - { - // Proc only from periodic (from trap activation proc another aura of this spell) - if (!(procFlag & PROC_FLAG_DONE_PERIODIC) || !roll_chance_i(triggerAmount)) - return false; - triggered_spell_id = 56453; - target = this; - break; - } } switch (dummySpell->Id) @@ -8127,14 +8118,6 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg return false; break; } - // Lock and Load - case 56453: - { - // Proc only from Frost/Freezing trap activation or from Freezing Arrow (the periodic dmg proc handled elsewhere) - if (!(procFlag & PROC_FLAG_DONE_TRAP_ACTIVATION) || !procSpell || !(procSpell->SchoolMask & SPELL_SCHOOL_MASK_FROST) || !roll_chance_i(triggerAmount)) - return false; - break; - } // Glyph of Death's Embrace case 58679: { diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index fe42b517780..f9e128f9d89 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1998,7 +1998,6 @@ void Spell::prepareDataForTriggerSystem(AuraEffect const* /*triggeredByAura*/) (m_spellInfo->SpellFamilyFlags[0] & 0x18 || // Freezing and Frost Trap, Freezing Arrow m_spellInfo->Id == 57879 || // Snake Trap - done this way to avoid double proc m_spellInfo->SpellFamilyFlags[2] & 0x00024000)) // Explosive and Immolation Trap - m_procAttacker |= PROC_FLAG_DONE_TRAP_ACTIVATION; /* Effects which are result of aura proc from triggered spell cannot proc diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index ba8e9fc8cf3..3852e78b479 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -843,8 +843,9 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellInfo const* spellProto, Spell return false; } /// Aura must have negative or neutral(PROC_FLAG_DONE_PERIODIC only) procflags for a DOT to proc + /// Traps are negative spells but not always do damage (only hunter traps set PROC_FLAG_DONE_TRAP_ACTIVATION) else if (EventProcFlag != PROC_FLAG_DONE_PERIODIC) - if (!(EventProcFlag & (PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG | PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_NEG))) + if (!(EventProcFlag & (PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG | PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_NEG | PROC_FLAG_DONE_TRAP_ACTIVATION))) return false; } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index a75294ad6e0..7888588b416 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -59,7 +59,9 @@ enum HunterSpells SPELL_HUNTER_VICIOUS_VIPER = 61609, SPELL_HUNTER_VIPER_ATTACK_SPEED = 60144, SPELL_DRAENEI_GIFT_OF_THE_NAARU = 59543, - SPELL_ROAR_OF_SACRIFICE_TRIGGERED = 67481 + SPELL_ROAR_OF_SACRIFICE_TRIGGERED = 67481, + SPELL_LOCK_AND_LOAD_TRIGGER = 56453, + SPELL_LOCK_AND_LOAD_MARKER = 67544 }; // 13161 - Aspect of the Beast @@ -476,6 +478,70 @@ class spell_hun_last_stand_pet : public SpellScriptLoader } }; +// -56342 - Lock and Load +class spell_hun_lock_and_load : public SpellScriptLoader +{ + public: + spell_hun_lock_and_load() : SpellScriptLoader("spell_hun_lock_and_load") { } + + class spell_hun_lock_and_load_AuraScript : public AuraScript + { + PrepareAuraScript(spell_hun_lock_and_load_AuraScript); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + if (!sSpellMgr->GetSpellInfo(SPELL_LOCK_AND_LOAD_TRIGGER) || + !sSpellMgr->GetSpellInfo(SPELL_LOCK_AND_LOAD_MARKER)) + return false; + return true; + } + + bool CheckProc(ProcEventInfo& eventInfo) + { + if (eventInfo.GetActor()->HasAura(SPELL_LOCK_AND_LOAD_MARKER)) + return false; + + return true; + } + + template <uint32 mask> + void HandleProcs(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + { + PreventDefaultAction(); + + if (!(eventInfo.GetTypeMask() & mask)) + return; + + if (!roll_chance_i(aurEff->GetAmount())) + return; + + Unit* caster = eventInfo.GetActor(); + caster->CastSpell(caster, SPELL_LOCK_AND_LOAD_TRIGGER, true); + } + + void ApplyMarker(ProcEventInfo& eventInfo) + { + Unit* caster = eventInfo.GetActor(); + caster->CastSpell(caster, SPELL_LOCK_AND_LOAD_MARKER, true); + } + + void Register() override + { + DoCheckProc += AuraCheckProcFn(spell_hun_lock_and_load_AuraScript::CheckProc); + + OnEffectProc += AuraEffectProcFn(spell_hun_lock_and_load_AuraScript::HandleProcs<PROC_FLAG_DONE_TRAP_ACTIVATION>, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc += AuraEffectProcFn(spell_hun_lock_and_load_AuraScript::HandleProcs<PROC_FLAG_DONE_PERIODIC>, EFFECT_1, SPELL_AURA_DUMMY); + + AfterProc += AuraProcFn(spell_hun_lock_and_load_AuraScript::ApplyMarker); + } + }; + + AuraScript* GetAuraScript() const override + { + return new spell_hun_lock_and_load_AuraScript(); + } +}; + // 53271 - Masters Call class spell_hun_masters_call : public SpellScriptLoader { @@ -1168,6 +1234,7 @@ void AddSC_hunter_spell_scripts() new spell_hun_improved_mend_pet(); new spell_hun_invigoration(); new spell_hun_last_stand_pet(); + new spell_hun_lock_and_load(); new spell_hun_masters_call(); new spell_hun_misdirection(); new spell_hun_misdirection_proc(); |