Skip to content

Commit

Permalink
Scripts/Spells: Implement rogue talent Improved Shiv (TrinityCore#30147)
Browse files Browse the repository at this point in the history
  • Loading branch information
aquadeus authored Aug 20, 2024
1 parent 44719eb commit 9de1ee1
Showing 2 changed files with 32 additions and 0 deletions.
3 changes: 3 additions & 0 deletions sql/updates/world/master/2024_08_20_01_world.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rog_improved_shiv';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(5938, 'spell_rog_improved_shiv');
29 changes: 29 additions & 0 deletions src/server/scripts/Spells/spell_rogue.cpp
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@ enum RogueSpells
SPELL_ROGUE_DEATH_FROM_ABOVE = 152150,
SPELL_ROGUE_GRAND_MELEE = 193358,
SPELL_ROGUE_GRAPPLING_HOOK = 195457,
SPELL_ROGUE_IMPROVED_SHIV = 319032,
SPELL_ROGUE_KILLING_SPREE = 51690,
SPELL_ROGUE_KILLING_SPREE_TELEPORT = 57840,
SPELL_ROGUE_KILLING_SPREE_WEAPON_DMG = 57841,
@@ -67,6 +68,7 @@ enum RogueSpells
SPELL_ROGUE_SKULL_AND_CROSSBONES = 199603,
SPELL_ROGUE_SHADOW_FOCUS = 108209,
SPELL_ROGUE_SHADOW_FOCUS_EFFECT = 112942,
SPELL_ROGUE_SHIV_NATURE_DAMAGE = 319504,
SPELL_ROGUE_SLICE_AND_DICE = 315496,
SPELL_ROGUE_SPRINT = 2983,
SPELL_ROGUE_STEALTH = 1784,
@@ -404,6 +406,32 @@ class spell_rog_honor_among_thieves : public AuraScript
}
};

// 5938 - Shiv
class spell_rog_improved_shiv : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_SHIV_NATURE_DAMAGE });
}

bool Load() override
{
return GetCaster()->HasAura(SPELL_ROGUE_IMPROVED_SHIV);
}

void HandleDummy(SpellEffIndex /*effIndex*/) const
{
GetCaster()->CastSpell(GetHitUnit(), SPELL_ROGUE_SHIV_NATURE_DAMAGE, CastSpellExtraArgs()
.SetTriggerFlags(TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR)
.SetTriggeringSpell(GetSpell()));
}

void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_rog_improved_shiv::HandleDummy, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};

// 51690 - Killing Spree
class spell_rog_killing_spree_aura : public AuraScript
{
@@ -1046,6 +1074,7 @@ void AddSC_rogue_spell_scripts()
RegisterSpellScript(spell_rog_eviscerate);
RegisterSpellScript(spell_rog_grand_melee);
RegisterSpellScript(spell_rog_honor_among_thieves);
RegisterSpellScript(spell_rog_improved_shiv);
RegisterSpellAndAuraScriptPair(spell_rog_killing_spree, spell_rog_killing_spree_aura);
RegisterSpellScript(spell_rog_kingsbane);
RegisterSpellScript(spell_rog_mastery_main_gauche);

0 comments on commit 9de1ee1

Please sign in to comment.