Merge ca10c7cbe245745719395be58077b8b5bd14dd6e into f6c4164765afe447476114e632ee3d70b04a1777

This commit is contained in:
tabooo 2025-02-20 17:53:52 +04:00 committed by GitHub
commit b84f4435b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -64,7 +64,14 @@ enum DruidSpells
enum DruidIcons
{
SPELL_ICON_REVITALIZE = 2862
SPELL_ICON_REVITALIZE = 2862,
SPELL_ICON_FUROR = 210,
SPELL_ICON_MOONKINAURA = 46, // SpellId: 24907
SPELL_ICON_MASTER_SHAPESHIFTER = 2851, // SpellId: 48421
SPELL_ICON_NURTURING_INSTINCT = 2254, // SpellId: 47180
SPELL_ICON_FERAL_SWIFTNESS_PASSIVE_2A = 67, // SpellId: 24864
SPELL_ICON_LEADER_OF_THE_PACK = 312, //SpellId: 24932
SPELL_ICON_TREE_OF_LIFE = 2257 //SpellId: 34123
};
// 1178 - Bear Form (Passive)
@ -223,6 +230,24 @@ class spell_dru_omen_of_clarity : public AuraScript
if (spellInfo->SpellFamilyName == SPELLFAMILY_DRUID)
{
// Exclude shapeshifting
if (spellInfo->SpellIconID == SPELL_ICON_MOONKINAURA)
return false;
if (spellInfo->SpellIconID == SPELL_ICON_MASTER_SHAPESHIFTER)
return false;
if (spellInfo->SpellIconID == SPELL_ICON_NURTURING_INSTINCT)
return false;
if (spellInfo->SpellIconID == SPELL_ICON_FERAL_SWIFTNESS_PASSIVE_2A)
return false;
if (spellInfo->SpellIconID == SPELL_ICON_LEADER_OF_THE_PACK)
return false;
if (spellInfo->SpellIconID == SPELL_ICON_TREE_OF_LIFE)
return false;
return !spellInfo->HasAura(SPELL_AURA_MOD_SHAPESHIFT);
}
@ -235,6 +260,12 @@ class spell_dru_omen_of_clarity : public AuraScript
return false;
}
// Furor 210
if (spellInfo->SpellIconID == SPELL_ICON_FUROR)
{
return false;
}
return true;
}