diff options
| -rw-r--r-- | sql/updates/world/master/2024_11_05_00_world.sql | 25 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_rogue.cpp | 67 |
2 files changed, 92 insertions, 0 deletions
diff --git a/sql/updates/world/master/2024_11_05_00_world.sql b/sql/updates/world/master/2024_11_05_00_world.sql new file mode 100644 index 00000000000..794502aa58b --- /dev/null +++ b/sql/updates/world/master/2024_11_05_00_world.sql @@ -0,0 +1,25 @@ +SET @SPELL_GROUP := 1500; + +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rog_poisoned_knife'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(185565, 'spell_rog_poisoned_knife'); + +-- Non-lethal poisons +DELETE FROM `spell_group` WHERE `id`= @SPELL_GROUP; +INSERT INTO `spell_group` (`id`, `spell_id`) VALUES +(@SPELL_GROUP, 5761), +(@SPELL_GROUP, 381637), +(@SPELL_GROUP, 3408); + +-- Lethal poisons +DELETE FROM `spell_group` WHERE `id`= @SPELL_GROUP+1; +INSERT INTO `spell_group` (`id`, `spell_id`) VALUES +(@SPELL_GROUP+1, 315584), +(@SPELL_GROUP+1, 8679), +(@SPELL_GROUP+1, 2823), +(@SPELL_GROUP+1, 381664); + +DELETE FROM `spell_group_stack_rules` WHERE `group_id` IN (@SPELL_GROUP, @SPELL_GROUP+1); +INSERT INTO `spell_group_stack_rules` (`group_id`, `stack_rule`) VALUES +(@SPELL_GROUP, 1), +(@SPELL_GROUP+1, 1); diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 9a99bb566f3..a01b0d5fb31 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -37,6 +37,10 @@ enum RogueSpells { SPELL_ROGUE_ADRENALINE_RUSH = 13750, + SPELL_ROGUE_AMPLIFYING_POISON = 381664, + SPELL_ROGUE_AMPLIFYING_POISON_DEBUFF = 383414, + SPELL_ROGUE_ATROPHIC_POISON = 381637, + SPELL_ROGUE_ATROPHIC_POISON_DEBUFF = 392388, SPELL_ROGUE_BETWEEN_THE_EYES = 199804, SPELL_ROGUE_BLACKJACK_TALENT = 379005, SPELL_ROGUE_BLACKJACK = 394119, @@ -47,10 +51,16 @@ enum RogueSpells SPELL_ROGUE_CHEAT_DEATH_DUMMY = 31231, SPELL_ROGUE_CHEATED_DEATH = 45181, SPELL_ROGUE_CHEATING_DEATH = 45182, + SPELL_ROGUE_CRIPPLING_POISON = 3408, + SPELL_ROGUE_CRIPPLING_POISON_DEBUFF = 3409, + SPELL_ROGUE_DEADLY_POISON = 2823, + SPELL_ROGUE_DEADLY_POISON_DEBUFF = 2818, SPELL_ROGUE_DEATH_FROM_ABOVE = 152150, SPELL_ROGUE_GRAND_MELEE = 193358, SPELL_ROGUE_GRAPPLING_HOOK = 195457, SPELL_ROGUE_IMPROVED_SHIV = 319032, + SPELL_ROGUE_INSTANT_POISON = 315584, + SPELL_ROGUE_INSTANT_POISON_DAMAGE = 315585, SPELL_ROGUE_KILLING_SPREE = 51690, SPELL_ROGUE_KILLING_SPREE_TELEPORT = 57840, SPELL_ROGUE_KILLING_SPREE_WEAPON_DMG = 57841, @@ -59,6 +69,8 @@ enum RogueSpells SPELL_ROGUE_MASTER_OF_SUBTLETY_DAMAGE_PERCENT = 31665, SPELL_ROGUE_MASTER_OF_SUBTLETY_PASSIVE = 31223, SPELL_ROGUE_MAIN_GAUCHE = 86392, + SPELL_ROGUE_NUMBING_POISON = 5761, + SPELL_ROGUE_NUMBING_POISON_DEBUFF = 5760, SPELL_ROGUE_PREMEDITATION_PASSIVE = 343160, SPELL_ROGUE_PREMEDITATION_AURA = 343173, SPELL_ROGUE_PREY_ON_THE_WEAK_TALENT = 131511, @@ -85,8 +97,21 @@ enum RogueSpells SPELL_ROGUE_HONOR_AMONG_THIEVES_ENERGIZE = 51699, SPELL_ROGUE_T5_2P_SET_BONUS = 37169, SPELL_ROGUE_VENOMOUS_WOUNDS = 79134, + SPELL_ROGUE_WOUND_POISON = 8679, + SPELL_ROGUE_WOUND_POISON_DEBUFF = 8680, }; +static constexpr std::array<std::pair<uint32 /*poisonAura*/, uint32 /*triggeredPoisonSpell*/>, 7> PoisonAuraToDebuff +{{ + { SPELL_ROGUE_WOUND_POISON, SPELL_ROGUE_WOUND_POISON_DEBUFF }, + { SPELL_ROGUE_DEADLY_POISON, SPELL_ROGUE_DEADLY_POISON_DEBUFF }, + { SPELL_ROGUE_AMPLIFYING_POISON, SPELL_ROGUE_AMPLIFYING_POISON_DEBUFF }, + { SPELL_ROGUE_CRIPPLING_POISON, SPELL_ROGUE_CRIPPLING_POISON_DEBUFF }, + { SPELL_ROGUE_NUMBING_POISON, SPELL_ROGUE_NUMBING_POISON_DEBUFF }, + { SPELL_ROGUE_INSTANT_POISON, SPELL_ROGUE_INSTANT_POISON_DAMAGE }, + { SPELL_ROGUE_ATROPHIC_POISON, SPELL_ROGUE_ATROPHIC_POISON_DEBUFF } +}}; + /* Returns true if the spell is a finishing move. * A finishing move is a spell that cost combo points */ Optional<int32> GetFinishingMoveCPCost(Spell const* spell) @@ -566,6 +591,47 @@ class spell_rog_pickpocket : public SpellScript } }; +// 185565 - Poisoned Knife +class spell_rog_poisoned_knife : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo + ({ + SPELL_ROGUE_WOUND_POISON, + SPELL_ROGUE_WOUND_POISON_DEBUFF, + SPELL_ROGUE_DEADLY_POISON, + SPELL_ROGUE_DEADLY_POISON_DEBUFF, + SPELL_ROGUE_AMPLIFYING_POISON, + SPELL_ROGUE_AMPLIFYING_POISON_DEBUFF, + SPELL_ROGUE_CRIPPLING_POISON, + SPELL_ROGUE_CRIPPLING_POISON_DEBUFF, + SPELL_ROGUE_NUMBING_POISON, + SPELL_ROGUE_NUMBING_POISON_DEBUFF, + SPELL_ROGUE_INSTANT_POISON, + SPELL_ROGUE_INSTANT_POISON_DAMAGE, + SPELL_ROGUE_ATROPHIC_POISON, + SPELL_ROGUE_ATROPHIC_POISON_DEBUFF + }); + } + + void HandleHit(SpellEffIndex /*effIndex*/) const + { + Unit* caster = GetCaster(); + for (auto const& [poisonAura, debuffSpellId] : PoisonAuraToDebuff) + if (caster->HasAura(poisonAura)) + caster->CastSpell(GetHitUnit(), debuffSpellId, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_rog_poisoned_knife::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + } +}; + // 131511 - Prey on the Weak // Called by Cheap Shot - 1833 and Kidney Shot - 408 class spell_rog_prey_on_the_weak : public AuraScript @@ -1079,6 +1145,7 @@ void AddSC_rogue_spell_scripts() RegisterSpellScript(spell_rog_kingsbane); RegisterSpellScript(spell_rog_mastery_main_gauche); RegisterSpellScript(spell_rog_pickpocket); + RegisterSpellScript(spell_rog_poisoned_knife); RegisterSpellScript(spell_rog_prey_on_the_weak); RegisterSpellScript(spell_rog_restless_blades); RegisterSpellScript(spell_rog_roll_the_bones); |