josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Removed most uses of SpellIcon to identify spells

Browse Source
This commit is contained in:
Shauren
2017-04-02 23:29:26 +02:00
parent cbc8a0e4dd
commit 2a8294031b
15 changed files with 88 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Spells/spell_generic.cpp
+13 -5
View File
@@ -627,7 +627,7 @@ enum BreakShieldSpells
SPELL_BREAK_SHIELD_TRIGGER_UNK = 66480
};
class spell_gen_break_shield: public SpellScriptLoader
class spell_gen_break_shield : public SpellScriptLoader
{
public:
spell_gen_break_shield(const char* name) : SpellScriptLoader(name) { }
@@ -636,6 +636,11 @@ class spell_gen_break_shield: public SpellScriptLoader
{
PrepareSpellScript(spell_gen_break_shield_SpellScript);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ 62552, 62719, 64100, 66482 });
}
void HandleScriptEffect(SpellEffIndex effIndex)
{
Unit* target = GetHitUnit();
@@ -672,8 +677,7 @@ class spell_gen_break_shield: public SpellScriptLoader
{
if (Aura* aura = itr->second->GetBase())
{
SpellInfo const* auraInfo = aura->GetSpellInfo();
if (auraInfo && auraInfo->SpellIconID == 2007 && aura->HasEffectType(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN))
if (aura->GetId() == 62552 || aura->GetId() == 62719 || aura->GetId() == 64100 || aura->GetId() == 66482)
{
aura->ModStackAmount(-1, AURA_REMOVE_BY_ENEMY_SPELL);
// Remove dummys from rider (Necessary for updating visual shields)
@@ -2008,6 +2012,11 @@ class spell_gen_mounted_charge: public SpellScriptLoader
{
PrepareSpellScript(spell_gen_mounted_charge_SpellScript);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ 62552, 62719, 64100, 66482 });
}
void HandleScriptEffect(SpellEffIndex effIndex)
{
Unit* target = GetHitUnit();
@@ -2048,8 +2057,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader
{
if (Aura* aura = itr->second->GetBase())
{
SpellInfo const* auraInfo = aura->GetSpellInfo();
if (auraInfo && auraInfo->SpellIconID == 2007 && aura->HasEffectType(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN))
if (aura->GetId() == 62552 || aura->GetId() == 62719 || aura->GetId() == 64100 || aura->GetId() == 66482)
{
aura->ModStackAmount(-1, AURA_REMOVE_BY_ENEMY_SPELL);
// Remove dummys from rider (Necessary for updating visual shields)