araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Implement warrior talent Tactician (#31564)

Browse Source
This commit is contained in:
MoltenCrystal
2026-02-16 18:53:43 +01:00
committed by GitHub
parent 6b35cce86b
commit 79db3981ff
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/updates/world/master/2026_02_16_02_world.sql Normal file
View File

@@ -0,0 +1,8 @@
DELETE FROM `spell_proc` WHERE `SpellId` IN (184783,199854);
INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES
(184783,0x00,4,0x00000000,0x00000000,0x00000000,0x00000000,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0,0,0,0), -- Tactician
(199854,0x00,4,0x00000004,0x00000000,0x00000000,0x00000000,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0,0,0,0); -- Tactician
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_tactician';
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(184783,'spell_warr_tactician');

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

@@ -83,6 +83,7 @@ enum WarriorSpells
SPELL_WARRIOR_IMPROVED_HEROIC_LEAP = 157449,
SPELL_WARRIOR_MORTAL_STRIKE = 12294,
SPELL_WARRIOR_MORTAL_WOUNDS = 115804,
SPELL_WARRIOR_OVERPOWER = 7384,
SPELL_WARRIOR_POWERFUL_ENRAGE = 440277,
SPELL_WARRIOR_RALLYING_CRY = 97463,
SPELL_WARRIOR_RAVAGER = 228920,
@@ -107,6 +108,7 @@ enum WarriorSpells
SPELL_WARRIOR_SUDDEN_DEATH_BUFF = 52437,
SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1 = 12723,
SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_2 = 26654,
SPELL_WARRIOR_TACTICIAN_ACTION_BUTTON_GLOW = 199854,
SPELL_WARRIOR_TAUNT = 355,
SPELL_WARRIOR_THUNDER_CLAP_SLOW = 435203,
SPELL_WARRIOR_TITANIC_RAGE = 394329,
@@ -1545,6 +1547,46 @@ class spell_warr_sweeping_strikes : public AuraScript
Unit* _procTarget = nullptr;
};
// 184783 - Tactician
class spell_warr_tactician : public AuraScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_OVERPOWER, SPELL_WARRIOR_TACTICIAN_ACTION_BUTTON_GLOW })
&& sSpellMgr->AssertSpellInfo(SPELL_WARRIOR_OVERPOWER, DIFFICULTY_NONE)->ChargeCategoryId;
}
static bool CheckEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
SpellInfo const* procSpell = eventInfo.GetSpellInfo();
if (!procSpell)
return false;
if (!procSpell->CalcPowerCost(POWER_RAGE, false, eventInfo.GetActor(), SpellSchoolMask(procSpell->SchoolMask)))
return false;
return roll_chance_i(aurEff->GetAmount());
}
static void HandleProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* caster = eventInfo.GetActor();
SpellInfo const* overpowerInfo = sSpellMgr->AssertSpellInfo(SPELL_WARRIOR_OVERPOWER, DIFFICULTY_NONE);
caster->GetSpellHistory()->RestoreCharge(overpowerInfo->ChargeCategoryId);
caster->CastSpell(caster, SPELL_WARRIOR_TACTICIAN_ACTION_BUTTON_GLOW, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
.TriggeringSpell = eventInfo.GetProcSpell(),
.TriggeringAura = aurEff
});
}
void Register() override
{
DoCheckEffectProc += AuraCheckEffectProcFn(spell_warr_tactician::CheckEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc += AuraEffectProcFn(spell_warr_tactician::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 388933 - Tenderize
class spell_warr_tenderize : public AuraScript
{
@@ -1861,6 +1903,7 @@ void AddSC_warrior_spell_scripts()
RegisterSpellScript(spell_warr_strategist);
RegisterSpellScript(spell_warr_sudden_death);
RegisterSpellScript(spell_warr_sweeping_strikes);
RegisterSpellScript(spell_warr_tactician);
RegisterSpellScript(spell_warr_tenderize);
RegisterSpellScript(spell_warr_thunder_clap);
RegisterSpellScript(spell_warr_thunder_clap_rend);