Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented binary resistances and some more

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ca26c33145cb40ae7fd2c84fc7577fc6f11bdbbf)
This commit is contained in:
hondacrx
2019-08-16 23:15:19 -04:00
parent d3bce6a75c
commit bdfea4ecad
8 changed files with 322 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/AuraEffect.cs
+2 -2
View File
@@ -1310,7 +1310,7 @@ namespace Game.Spells
case ShapeShiftForm.MoonkinForm:
{
// remove movement affects
target.RemoveMovementImpairingAuras();
target.RemoveAurasByShapeShift();
// and polymorphic affects
if (target.IsPolymorphed())
@@ -1351,7 +1351,7 @@ namespace Game.Spells
if (target.GetClass() == Class.Druid)
{
// Remove movement impairing effects also when shifting out
target.RemoveMovementImpairingAuras();
target.RemoveAurasByShapeShift();
}
}
Source/Game/Spells/SpellEffects.cs
+3 -46
View File
@@ -346,14 +346,14 @@ namespace Game.Spells
// Vanish (not exist)
case 18461:
{
unitTarget.RemoveMovementImpairingAuras();
unitTarget.RemoveMovementImpairingAuras(true);
unitTarget.RemoveAurasByType(AuraType.ModStalked);
return;
}
// Demonic Empowerment -- succubus
case 54437:
{
unitTarget.RemoveMovementImpairingAuras();
unitTarget.RemoveMovementImpairingAuras(true);
unitTarget.RemoveAurasByType(AuraType.ModStalked);
unitTarget.RemoveAurasByType(AuraType.ModStun);
@@ -1300,49 +1300,6 @@ namespace Game.Spells
}
m_caster.EnergizeBySpell(unitTarget, m_spellInfo.Id, damage, power);
// Mad Alchemist's Potion
if (m_spellInfo.Id == 45051)
{
// find elixirs on target
bool guardianFound = false;
bool battleFound = false;
foreach (var app in unitTarget.GetAppliedAuras())
{
uint spell_id = app.Value.GetBase().GetId();
if (!guardianFound)
if (Global.SpellMgr.IsSpellMemberOfSpellGroup(spell_id, SpellGroup.ElixirGuardian))
guardianFound = true;
if (!battleFound)
if (Global.SpellMgr.IsSpellMemberOfSpellGroup(spell_id, SpellGroup.ElixirBattle))
battleFound = true;
if (battleFound && guardianFound)
break;
}
// get all available elixirs by mask and spell level
List<int> avalibleElixirs = new List<int>();
if (!guardianFound)
Global.SpellMgr.GetSetOfSpellsInSpellGroup(SpellGroup.ElixirGuardian, out avalibleElixirs);
if (!battleFound)
Global.SpellMgr.GetSetOfSpellsInSpellGroup(SpellGroup.ElixirBattle, out avalibleElixirs);
foreach (int spellId in avalibleElixirs)
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo((uint)spellId);
if (spellInfo.SpellLevel < m_spellInfo.SpellLevel || spellInfo.SpellLevel > unitTarget.getLevel())
avalibleElixirs.Remove(spellId);
else if (Global.SpellMgr.IsSpellMemberOfSpellGroup((uint)spellId, SpellGroup.ElixirShattrath))
avalibleElixirs.Remove(spellId);
else if (Global.SpellMgr.IsSpellMemberOfSpellGroup((uint)spellId, SpellGroup.ElixirUnstable))
avalibleElixirs.Remove(spellId);
}
if (!avalibleElixirs.Empty())
{
// cast random elixir on target
m_caster.CastSpell(unitTarget, (uint)avalibleElixirs.SelectRandom(), true, m_CastItem);
}
}
}
[SpellEffectHandler(SpellEffectName.EnergizePct)]
@@ -2988,7 +2945,7 @@ namespace Game.Spells
case 30918: // Improved Sprint
{
// Removes snares and roots.
unitTarget.RemoveMovementImpairingAuras();
unitTarget.RemoveMovementImpairingAuras(true);
break;
}
// Plant Warmaul Ogre Banner
Source/Game/Spells/SpellInfo.cs
+7 -1
View File
@@ -2433,7 +2433,13 @@ namespace Game.Spells
target.ApplySpellImmune(Id, SpellImmunity.Mechanic, i, apply);
if (apply && HasAttribute(SpellAttr1.DispelAurasOnImmunity))
target.RemoveAurasWithMechanic(mechanicImmunity, AuraRemoveMode.Default, Id);
{
// exception for purely snare mechanic (eg. hands of freedom)!
if (mechanicImmunity == (1 << (int)Mechanics.Snare))
target.RemoveMovementImpairingAuras(false);
else
target.RemoveAurasWithMechanic(mechanicImmunity, AuraRemoveMode.Default, Id);
}
}
uint dispelImmunity = immuneInfo.DispelImmune;
Source/Game/Spells/SpellManager.cs
+149
View File
@@ -2155,6 +2155,14 @@ namespace Game.Entities
switch (effect.ApplyAuraName)
{
case AuraType.ModPossess:
case AuraType.ModConfuse:
case AuraType.ModCharm:
case AuraType.AoeCharm:
case AuraType.ModFear:
case AuraType.ModStun:
spellInfo.AttributesCu |= SpellCustomAttributes.AuraCC;
break;
case AuraType.PeriodicHeal:
case AuraType.PeriodicDamage:
case AuraType.PeriodicDamagePercent:
@@ -2232,6 +2240,89 @@ namespace Game.Entities
}
}
// spells ignoring hit result should not be binary
if (!spellInfo.HasAttribute(SpellAttr3.IgnoreHitResult))
{
bool setFlag = false;
foreach (SpellEffectInfo effect in spellInfo.GetEffectsForDifficulty(Difficulty.None))
{
if (effect == null)
continue;
if (effect.IsEffect())
{
switch (effect.Effect)
{
case SpellEffectName.SchoolDamage:
case SpellEffectName.WeaponDamage:
case SpellEffectName.WeaponDamageNoschool:
case SpellEffectName.NormalizedWeaponDmg:
case SpellEffectName.WeaponPercentDamage:
case SpellEffectName.TriggerSpell:
case SpellEffectName.TriggerSpellWithValue:
break;
case SpellEffectName.PersistentAreaAura:
case SpellEffectName.ApplyAura:
case SpellEffectName.ApplyAreaAuraParty:
case SpellEffectName.ApplyAreaAuraRaid:
case SpellEffectName.ApplyAreaAuraFriend:
case SpellEffectName.ApplyAreaAuraEnemy:
case SpellEffectName.ApplyAreaAuraPet:
case SpellEffectName.ApplyAreaAuraOwner:
{
if (effect.ApplyAuraName == AuraType.PeriodicDamage ||
effect.ApplyAuraName == AuraType.PeriodicDamagePercent ||
effect.ApplyAuraName == AuraType.PeriodicDummy ||
effect.ApplyAuraName == AuraType.PeriodicLeech ||
effect.ApplyAuraName == AuraType.PeriodicHealthFunnel ||
effect.ApplyAuraName == AuraType.PeriodicDummy)
break;
goto default;
}
default:
{
// No value and not interrupt cast or crowd control without SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY flag
if (effect.CalcValue() == 0 && !((effect.Effect == SpellEffectName.InterruptCast || spellInfo.HasAttribute(SpellCustomAttributes.AuraCC)) && !spellInfo.HasAttribute(SpellAttr0.UnaffectedByInvulnerability)))
break;
// Sindragosa Frost Breath
if (spellInfo.Id == 69649 || spellInfo.Id == 71056 || spellInfo.Id == 71057 || spellInfo.Id == 71058 || spellInfo.Id == 73061 || spellInfo.Id == 73062 || spellInfo.Id == 73063 || spellInfo.Id == 73064)
break;
// Frostbolt
if (spellInfo.SpellFamilyName == SpellFamilyNames.Mage && spellInfo.SpellFamilyFlags[0].HasAnyFlag(0x20u))
break;
// Frost Fever
if (spellInfo.Id == 55095)
break;
// Haunt
if (spellInfo.SpellFamilyName == SpellFamilyNames.Warlock && spellInfo.SpellFamilyFlags[1].HasAnyFlag(0x40000u))
break;
setFlag = true;
break;
}
}
if (setFlag)
{
spellInfo.AttributesCu |= SpellCustomAttributes.BinarySpell;
break;
}
}
}
}
// Remove normal school mask to properly calculate damage
if (spellInfo.SchoolMask.HasAnyFlag(SpellSchoolMask.Normal) && spellInfo.SchoolMask.HasAnyFlag(SpellSchoolMask.Magic))
{
spellInfo.SchoolMask &= ~SpellSchoolMask.Normal;
spellInfo.AttributesCu |= SpellCustomAttributes.SchoolmaskNormalWithMagic;
}
if (!spellInfo._IsPositiveEffect(0, false))
spellInfo.AttributesCu |= SpellCustomAttributes.NegativeEff0;
@@ -2244,9 +2335,67 @@ namespace Game.Entities
if (talentSpells.Contains(spellInfo.Id))
spellInfo.AttributesCu |= SpellCustomAttributes.IsTalent;
switch (spellInfo.SpellFamilyName)
{
case SpellFamilyNames.Warrior:
// Shout / Piercing Howl
if (spellInfo.SpellFamilyFlags[0].HasAnyFlag(0x20000u)/* || spellInfo->SpellFamilyFlags[1] & 0x20*/)
spellInfo.AttributesCu |= SpellCustomAttributes.AuraCC;
break;
case SpellFamilyNames.Druid:
// Roar
if (spellInfo.SpellFamilyFlags[0].HasAnyFlag(0x8u))
spellInfo.AttributesCu |= SpellCustomAttributes.AuraCC;
break;
case SpellFamilyNames.Generic:
// Stoneclaw Totem effect
if (spellInfo.Id == 5729)
spellInfo.AttributesCu |= SpellCustomAttributes.AuraCC;
break;
default:
break;
}
spellInfo._InitializeExplicitTargetMask();
}
// addition for binary spells, ommit spells triggering other spells
foreach (var spellInfo in mSpellInfoMap.Values)
{
if (spellInfo.HasAttribute(SpellCustomAttributes.BinarySpell))
continue;
bool allNonBinary = true;
bool overrideAttr = false;
foreach (SpellEffectInfo effect in spellInfo.GetEffectsForDifficulty(Difficulty.None))
{
if (effect == null)
continue;
if (effect.IsAura() && effect.TriggerSpell != 0)
{
switch (effect.ApplyAuraName)
{
case AuraType.PeriodicTriggerSpell:
case AuraType.PeriodicTriggerSpellWithValue:
SpellInfo triggerSpell = Global.SpellMgr.GetSpellInfo(effect.TriggerSpell);
if (triggerSpell != null)
{
overrideAttr = true;
if (triggerSpell.HasAttribute(SpellCustomAttributes.BinarySpell))
allNonBinary = false;
}
break;
default:
break;
}
}
}
if (overrideAttr && allNonBinary)
spellInfo.AttributesCu &= ~SpellCustomAttributes.BinarySpell;
}
Log.outInfo(LogFilter.ServerLoading, "Loaded spell custom attributes in {0} ms", Time.GetMSTimeDiffToNow(oldMSTime));
}