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

Core/Spells: Fixed Dragon's Breath with Living Bomb explosion

Browse Source
This commit is contained in:
Aokromes
2017-10-17 14:29:43 +02:00
parent 4a0ecb7404
commit bb077c1d6f
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/3.3.5/2017_10_16_04_world.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `scriptname`='spell_mage_dragon_breath';
INSERT INTO `spell_script_names` (`spell_id`,`scriptname`) VALUES
(-31661,'spell_mage_dragon_breath');

24
src/server/scripts/Spells/spell_mage.cpp
View File

@@ -95,7 +95,8 @@ enum MageIcons
ICON_MAGE_IMPROVED_FLAMESTRIKE = 37,
ICON_MAGE_IMPROVED_FREEZE = 94,
ICON_MAGE_INCANTER_S_ABSORPTION = 2941,
ICON_MAGE_IMPROVED_MANA_GEM = 1036
ICON_MAGE_IMPROVED_MANA_GEM = 1036,
SPELL_ICON_MAGE_LIVING_BOMB = 3000
};
enum MiscSpells
@@ -460,6 +461,26 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader
}
};
// -31661 - Dragon's Breath
class spell_mage_dragon_breath : public AuraScript
{
PrepareAuraScript(spell_mage_dragon_breath);
bool CheckProc(ProcEventInfo& eventInfo)
{
// Dont proc with Living Bomb explosion
SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
if (spellInfo && spellInfo->SpellIconID == SPELL_ICON_MAGE_LIVING_BOMB && spellInfo->SpellFamilyName == SPELLFAMILY_MAGE)
return false;
return true;
}
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_dragon_breath::CheckProc);
}
};
// 543 - Fire War
class spell_mage_fire_frost_ward : public SpellScriptLoader
{
@@ -1518,6 +1539,7 @@ void AddSC_mage_spell_scripts()
new spell_mage_cold_snap();
new spell_mage_cone_of_cold();
new spell_mage_conjure_refreshment();
RegisterAuraScript(spell_mage_dragon_breath);
new spell_mage_fire_frost_ward();
new spell_mage_focus_magic();
new spell_mage_frostbolt();