Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Brittle Armor & Mercurial Shield (#23576)

Browse Source
This commit is contained in:
Sorikoff
2019-07-08 13:42:35 +00:00
committed by Wyrserth
parent e71773140c
commit a64d7df662
3 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/3.3.5/9999_99_99_99_world.sql Normal file
View File

@@ -0,0 +1,4 @@
DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_item_brittle_armor','spell_item_mercurial_shield');
INSERT INTO `spell_script_names` VALUES
(24590,'spell_item_brittle_armor'),
(26465,'spell_item_mercurial_shield');

8
src/server/game/Spells/SpellEffects.cpp
View File

@@ -3431,14 +3431,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
{
switch (m_spellInfo->Id)
{
// Brittle Armor - need remove one 24575 Brittle Armor aura
case 24590:
unitTarget->RemoveAuraFromStack(24575);
return;
// Mercurial Shield - need remove one 26464 Mercurial Shield aura
case 26465:
unitTarget->RemoveAuraFromStack(26464);
return;
// Shadow Flame (All script effects, not just end ones to prevent player from dodging the last triggered spell)
case 22539:
case 22972:

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

@@ -404,6 +404,27 @@ class spell_item_dementia : public AuraScript
}
};
// 24590 - Brittle Armor
enum BrittleArmor
{
SPELL_BRITTLE_ARMOR = 24575
};
class spell_item_brittle_armor : public SpellScript
{
PrepareSpellScript(spell_item_brittle_armor);
void HandleScript(SpellEffIndex /* effIndex */)
{
GetHitUnit()->RemoveAuraFromStack(SPELL_BRITTLE_ARMOR);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_item_brittle_armor::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 64411 - Blessing of Ancient Kings (Val'anyr, Hammer of Ancient Kings)
enum BlessingOfAncientKings
{
@@ -1278,6 +1299,27 @@ class spell_item_mark_of_conquest : public AuraScript
}
};
// 26465 - Mercurial Shield
enum MercurialShield
{
SPELL_MERCURIAL_SHIELD = 26464
};
class spell_item_mercurial_shield : public SpellScript
{
PrepareSpellScript(spell_item_mercurial_shield);
void HandleScript(SpellEffIndex /* effIndex */)
{
GetHitUnit()->RemoveAuraFromStack(SPELL_MERCURIAL_SHIELD);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_item_mercurial_shield::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// http://www.wowhead.com/item=32686 Mingo's Fortune Giblets
// 40802 Mingo's Fortune Generator
class spell_item_mingos_fortune_generator : public SpellScript
@@ -4212,6 +4254,7 @@ void AddSC_item_spell_scripts()
RegisterAuraScript(spell_item_arcane_shroud);
RegisterAuraScript(spell_item_aura_of_madness);
RegisterAuraScript(spell_item_dementia);
RegisterSpellScript(spell_item_brittle_armor);
RegisterAuraScript(spell_item_blessing_of_ancient_kings);
RegisterAuraScript(spell_item_valanyr_hammer_of_ancient_kings);
RegisterAuraScript(spell_item_deadly_precision);
@@ -4239,6 +4282,7 @@ void AddSC_item_spell_scripts()
RegisterAuraScript(spell_item_crystal_spire_of_karabor);
RegisterSpellScript(spell_item_make_a_wish);
RegisterAuraScript(spell_item_mark_of_conquest);
RegisterSpellScript(spell_item_mercurial_shield);
RegisterSpellScript(spell_item_mingos_fortune_generator);
RegisterAuraScript(spell_item_necrotic_touch);
RegisterSpellScript(spell_item_net_o_matic);