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

Core/Spells: Fixed Elemental Blast random buff (shaman)

Browse Source
This commit is contained in:
Shauren
2016-05-10 17:06:39 +02:00
parent 42ab42ce27
commit 9fa5906c40
2 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/6.x/2016_05_10_00_world.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sha_elemental_blast';
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(117014,'spell_sha_elemental_blast');

65
src/server/scripts/Spells/spell_shaman.cpp
View File

@@ -32,6 +32,12 @@
enum ShamanSpells
{
SPELL_SHAMAN_EARTH_SHIELD_HEAL = 379,
SPELL_SHAMAN_ELEMENTAL_BLAST_CRIT = 118522,
SPELL_SHAMAN_ELEMENTAL_BLAST_HASTE = 173183,
SPELL_SHAMAN_ELEMENTAL_BLAST_MASTERY = 173184,
SPELL_SHAMAN_ELEMENTAL_BLAST_MULTISTRIKE = 173185,
SPELL_SHAMAN_ELEMENTAL_BLAST_AGILITY = 173186,
SPELL_SHAMAN_ELEMENTAL_BLAST_SPIRIT = 173187,
SPELL_SHAMAN_ELEMENTAL_MASTERY = 16166,
SPELL_SHAMAN_EXHAUSTION = 57723,
SPELL_SHAMAN_FIRE_NOVA_TRIGGERED = 8349,
@@ -252,6 +258,64 @@ class spell_sha_earth_shield : public SpellScriptLoader
}
};
uint32 const ElementalBlastBuffSpells[] =
{
SPELL_SHAMAN_ELEMENTAL_BLAST_CRIT,
SPELL_SHAMAN_ELEMENTAL_BLAST_HASTE,
SPELL_SHAMAN_ELEMENTAL_BLAST_MASTERY,
SPELL_SHAMAN_ELEMENTAL_BLAST_MULTISTRIKE,
SPELL_SHAMAN_ELEMENTAL_BLAST_AGILITY,
};
// 117014 - Elemental Blast
class spell_sha_elemental_blast : public SpellScriptLoader
{
public:
spell_sha_elemental_blast() : SpellScriptLoader("spell_sha_elemental_blast") { }
class spell_sha_elemental_blast_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_elemental_blast_SpellScript);
static TRINITY_CONSTEXPR uint32 EnhancementBuffCount = std::extent<decltype(ElementalBlastBuffSpells)>::value;
static TRINITY_CONSTEXPR uint32 BuffCount = EnhancementBuffCount - 1;
bool Validate(SpellInfo const* /*spellInfo*/) override
{
for (uint32 i = 0; i < EnhancementBuffCount; ++i)
if (!sSpellMgr->GetSpellInfo(ElementalBlastBuffSpells[i]))
return false;
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ELEMENTAL_BLAST_SPIRIT))
return false;
return true;
}
bool Load()
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
}
void TriggerBuff()
{
Player* caster = GetCaster()->ToPlayer();
uint32 possbleSpells = (caster->GetSpecId(caster->GetActiveTalentGroup()) == TALENT_SPEC_SHAMAN_ENHANCEMENT ? EnhancementBuffCount : BuffCount) - 1;
caster->CastSpell(caster, ElementalBlastBuffSpells[urand(0, possbleSpells)], TRIGGERED_FULL_MASK);
if (caster->GetSpecId(caster->GetActiveTalentGroup()) == TALENT_SPEC_SHAMAN_RESTORATION)
caster->CastSpell(caster, SPELL_SHAMAN_ELEMENTAL_BLAST_SPIRIT, TRIGGERED_FULL_MASK);
}
void Register() override
{
AfterCast += SpellCastFn(spell_sha_elemental_blast_SpellScript::TriggerBuff);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_sha_elemental_blast_SpellScript();
}
};
// 1535 Fire Nova
class spell_sha_fire_nova : public SpellScriptLoader
{
@@ -1018,6 +1082,7 @@ void AddSC_shaman_spell_scripts()
new spell_sha_bloodlust();
new spell_sha_chain_heal();
new spell_sha_earth_shield();
new spell_sha_elemental_blast();
new spell_sha_fire_nova();
new spell_sha_flametongue();
new spell_sha_fulmination();