public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): add SPELL_ATTR0_CU_NO_INITIAL_THREAT to some spells (#7291)

Browse Source 
- Closes #7241
This commit is contained in:
UltraNix
2021-08-19 16:40:00 +02:00
committed by GitHub
parent f538eaceba
commit 122fd3ec74
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Spells/Spell.cpp
View File

@@ -5078,7 +5078,7 @@ void Spell::HandleThreatSpells()
threat += threatEntry->flatMod; threat += threatEntry->flatMod;
} }
else if (m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NO_INITIAL_THREAT) == 0) else if (!m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NO_INITIAL_THREAT))
threat += m_spellInfo->SpellLevel; threat += m_spellInfo->SpellLevel;
// past this point only multiplicative effects occur // past this point only multiplicative effects occur

54
src/server/game/Spells/SpellMgr.cpp
View File

@@ -2788,20 +2788,25 @@ void SpellMgr::LoadSpellCustomAttr()
case SPELL_AURA_OBS_MOD_HEALTH: case SPELL_AURA_OBS_MOD_HEALTH:
case SPELL_AURA_OBS_MOD_POWER: case SPELL_AURA_OBS_MOD_POWER:
case SPELL_AURA_POWER_BURN: case SPELL_AURA_POWER_BURN:
case SPELL_AURA_TRACK_CREATURES:
case SPELL_AURA_MOD_RANGED_HASTE:
case SPELL_AURA_MOD_POSSESS_PET:
case SPELL_AURA_MOD_INVISIBILITY_DETECT:
case SPELL_AURA_WATER_BREATHING:
spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT; spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT;
break; break;
} }
switch (spellInfo->Effects[j].ApplyAuraName) switch (spellInfo->Effects[j].ApplyAuraName)
{ {
case SPELL_AURA_MOD_POSSESS: case SPELL_AURA_MOD_POSSESS:
case SPELL_AURA_MOD_CONFUSE: case SPELL_AURA_MOD_CONFUSE:
case SPELL_AURA_MOD_CHARM: case SPELL_AURA_MOD_CHARM:
case SPELL_AURA_AOE_CHARM: case SPELL_AURA_AOE_CHARM:
case SPELL_AURA_MOD_FEAR: case SPELL_AURA_MOD_FEAR:
case SPELL_AURA_MOD_STUN: case SPELL_AURA_MOD_STUN:
spellInfo->AttributesCu |= SPELL_ATTR0_CU_AURA_CC; spellInfo->AttributesCu |= SPELL_ATTR0_CU_AURA_CC;
break; break;
} }
switch (spellInfo->Effects[j].Effect) switch (spellInfo->Effects[j].Effect)
@@ -2822,6 +2827,7 @@ void SpellMgr::LoadSpellCustomAttr()
case SPELL_EFFECT_ENERGIZE_PCT: case SPELL_EFFECT_ENERGIZE_PCT:
case SPELL_EFFECT_ENERGIZE: case SPELL_EFFECT_ENERGIZE:
case SPELL_EFFECT_HEAL_MECHANICAL: case SPELL_EFFECT_HEAL_MECHANICAL:
case SPELL_EFFECT_CREATE_ITEM:
spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT; spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT;
break; break;
case SPELL_EFFECT_CHARGE: case SPELL_EFFECT_CHARGE:
@@ -2937,18 +2943,23 @@ void SpellMgr::LoadSpellCustomAttr()
switch (spellInfo->SpellFamilyName) switch (spellInfo->SpellFamilyName)
{ {
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
// Shout // Shout
if (spellInfo->SpellFamilyFlags[0] & 0x20000 || spellInfo->SpellFamilyFlags[1] & 0x20) if (spellInfo->SpellFamilyFlags[0] & 0x20000 || spellInfo->SpellFamilyFlags[1] & 0x20)
spellInfo->AttributesCu |= SPELL_ATTR0_CU_AURA_CC; spellInfo->AttributesCu |= SPELL_ATTR0_CU_AURA_CC;
break; break;
case SPELLFAMILY_DRUID: case SPELLFAMILY_DRUID:
// Roar // Roar
if (spellInfo->SpellFamilyFlags[0] & 0x8) if (spellInfo->SpellFamilyFlags[0] & 0x8)
spellInfo->AttributesCu |= SPELL_ATTR0_CU_AURA_CC; spellInfo->AttributesCu |= SPELL_ATTR0_CU_AURA_CC;
break; break;
default: case SPELLFAMILY_HUNTER:
break; // Aspects
if (spellInfo->GetCategory() == 47)
spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT;
break;
default:
break;
} }
switch (spellInfo->Id) switch (spellInfo->Id)
@@ -3206,6 +3217,9 @@ void SpellMgr::LoadSpellCustomAttr()
case 43138: // North Fleet Reservist Kill Credit case 43138: // North Fleet Reservist Kill Credit
spellInfo->AttributesCu |= SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET; spellInfo->AttributesCu |= SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET;
break; break;
case 6197: // Eagle Eye
spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT;
break;
// Xinef: NOT CUSTOM, cant add in DBC CORRECTION because i need to swap effects, too much work to do there // Xinef: NOT CUSTOM, cant add in DBC CORRECTION because i need to swap effects, too much work to do there
// Envenom // Envenom