Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: fixed warrior Strikes of Opportunity mastery

Browse Source
This commit is contained in:
Ovah
2017-11-30 13:12:07 +00:00
committed by Aokromes
parent c8746c560f
commit 0da466eecc
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/updates/world/4.3.4/2017_11_30_13_world.sql Normal file
View File

@@ -0,0 +1,8 @@
--
DELETE FROM `spell_proc` WHERE `SpellID`= 76838;
INSERT INTO `spell_proc` (`SpellID`, `SpellFamilyName`, `SpellFamilyMask0`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `AttributesMask`) VALUES
(76838, 4, 0, 0, 1, 1, 0x0000020);
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_warr_strikes_of_opportunity';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(76838, 'spell_warr_strikes_of_opportunity');

44
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -44,6 +44,7 @@ enum WarriorSpells
SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_TALENT = 64976,
SPELL_WARRIOR_LAST_STAND_TRIGGERED = 12976,
SPELL_WARRIOR_MORTAL_STRIKE = 12294,
SPELL_WARRIOR_OPPORTUNITY_STRIKE = 76858,
SPELL_WARRIOR_RALLYING_CRY = 97463,
SPELL_WARRIOR_REND = 94009,
SPELL_WARRIOR_RETALIATION_DAMAGE = 22858,
@@ -1056,6 +1057,48 @@ class spell_warr_vigilance_trigger : public SpellScriptLoader
}
};
// 76838 - Strikes of Opportunity
class spell_warr_strikes_of_opportunity : public SpellScriptLoader
{
public:
spell_warr_strikes_of_opportunity() : SpellScriptLoader("spell_warr_strikes_of_opportunity") { }
class spell_warr_strikes_of_opportunity_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warr_strikes_of_opportunity_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_OPPORTUNITY_STRIKE });
}
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
return roll_chance_i(GetEffect(EFFECT_0)->GetAmount());
}
void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
if (Unit* caster = GetCaster())
if (Unit* target = eventInfo.GetActionTarget())
caster->CastSpell(target, SPELL_WARRIOR_OPPORTUNITY_STRIKE, true, nullptr, aurEff);
}
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warr_strikes_of_opportunity_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warr_strikes_of_opportunity_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_warr_strikes_of_opportunity_AuraScript();
}
};
void AddSC_warrior_spell_scripts()
{
new spell_warr_bloodthirst();
@@ -1077,6 +1120,7 @@ void AddSC_warrior_spell_scripts()
new spell_warr_second_wind_trigger();
new spell_warr_shattering_throw();
new spell_warr_slam();
new spell_warr_strikes_of_opportunity();
new spell_warr_sudden_death();
new spell_warr_sweeping_strikes();
new spell_warr_sword_and_board();