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

Core/Spells: Refactor Player::ApplySpellMod to take SpellInfo argument instead of just spell id

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/624881bef5c90a91e4c59e5bf404d8775c2ca55d)
This commit is contained in:
hondacrx
2021-03-04 14:43:39 -05:00
parent 879c4dfed2
commit 923def9f4a
11 changed files with 65 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Spells.cs
+5 -17
View File
@@ -2682,12 +2682,8 @@ namespace Game.Entities
}
}
public void ApplySpellMod(uint spellId, SpellModOp op, ref int basevalue, Spell spell = null)
public void ApplySpellMod(SpellInfo spellInfo, SpellModOp op, ref int basevalue, Spell spell = null)
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(spellId, GetMap().GetDifficultyID());
if (spellInfo == null)
return;
float totalmul = 1.0f;
int totalflat = 0;
@@ -2781,12 +2777,8 @@ namespace Game.Entities
basevalue = (int)((float)(basevalue + totalflat) * totalmul);
}
public void ApplySpellMod(uint spellId, SpellModOp op, ref uint basevalue, Spell spell = null)
public void ApplySpellMod(SpellInfo spellInfo, SpellModOp op, ref uint basevalue, Spell spell = null)
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(spellId, GetMap().GetDifficultyID());
if (spellInfo == null)
return;
float totalmul = 1.0f;
int totalflat = 0;
@@ -2880,12 +2872,8 @@ namespace Game.Entities
basevalue = (uint)((float)(basevalue + totalflat) * totalmul);
}
public void ApplySpellMod(uint spellId, SpellModOp op, ref float basevalue, Spell spell = null)
public void ApplySpellMod(SpellInfo spellInfo, SpellModOp op, ref float basevalue, Spell spell = null)
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(spellId, GetMap().GetDifficultyID());
if (spellInfo == null)
return;
float totalmul = 1.0f;
int totalflat = 0;
@@ -2978,7 +2966,7 @@ namespace Game.Entities
basevalue = (basevalue + totalflat) * totalmul;
}
bool IsAffectedBySpellmod(SpellInfo spellInfo, SpellModifier mod, Spell spell)
{
if (mod == null || spellInfo == null)
@@ -3382,7 +3370,7 @@ namespace Game.Entities
}
// Apply spell mods
ApplySpellMod(pEnchant.EffectArg[s], SpellModOp.ChanceOfSuccess, ref chance);
ApplySpellMod(spellInfo, SpellModOp.ChanceOfSuccess, ref chance);
// Shiv has 100% chance to apply the poison
if (FindCurrentSpellBySpellId(5938) != null && e_slot == (byte)EnchantmentSlot.Temp)
Source/Game/Entities/StatSystem.cs
+4 -4
View File
@@ -717,22 +717,22 @@ namespace Game.Entities
public void SetRangedWeaponAttackPower(int attackPower) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.RangedWeaponAttackPower), attackPower); }
//Chances
float MeleeSpellMissChance(Unit victim, WeaponAttackType attType, uint spellId)
float MeleeSpellMissChance(Unit victim, WeaponAttackType attType, SpellInfo spellInfo)
{
//calculate miss chance
float missChance = victim.GetUnitMissChance(attType);
// melee attacks while dual wielding have +19% chance to miss
if (spellId == 0 && HaveOffhandWeapon() && !IsInFeralForm())
if (spellInfo == null && HaveOffhandWeapon() && !IsInFeralForm())
missChance += 19.0f;
// Spellmod from SPELLMOD_RESIST_MISS_CHANCE
float resistMissChance = 100.0f;
if (spellId != 0)
if (spellInfo != null)
{
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellId, SpellModOp.ResistMissChance, ref resistMissChance);
modOwner.ApplySpellMod(spellInfo, SpellModOp.ResistMissChance, ref resistMissChance);
}
missChance += resistMissChance - 100.0f;
Source/Game/Entities/Unit/Unit.Combat.cs
+4 -4
View File
@@ -1772,7 +1772,7 @@ namespace Game.Entities
{
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.ProcPerMinute, ref PPM);
modOwner.ApplySpellMod(spellProto, SpellModOp.ProcPerMinute, ref PPM);
}
return (float)Math.Floor((WeaponSpeed * PPM) / 600.0f); // result is chance in percents (probability = Speed_in_sec * (PPM / 60))
@@ -2049,7 +2049,7 @@ namespace Game.Entities
return MeleeHitOutcome.Evade;
// Miss chance based on melee
int miss_chance = (int)(MeleeSpellMissChance(victim, attType, 0) * 100.0f);
int miss_chance = (int)(MeleeSpellMissChance(victim, attType, null) * 100.0f);
// Critical hit chance
int crit_chance = (int)(GetUnitCriticalChance(attType, victim) + GetTotalAuraModifier(AuraType.ModAutoAttackCritChance) * 100.0f);
@@ -2737,7 +2737,7 @@ namespace Game.Entities
{
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellInfo.Id, SpellModOp.IgnoreArmor, ref armor);
modOwner.ApplySpellMod(spellInfo, SpellModOp.IgnoreArmor, ref armor);
}
var resIgnoreAuras = GetAuraEffectsByType(AuraType.ModIgnoreTargetResist);
@@ -2874,7 +2874,7 @@ namespace Game.Entities
{
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Damage, ref tmpDamage);
modOwner.ApplySpellMod(spellProto, SpellModOp.Damage, ref tmpDamage);
}
// bonus result can be negative
Source/Game/Entities/Unit/Unit.Spells.cs
+22 -22
View File
@@ -121,7 +121,7 @@ namespace Game.Entities
if (modOwner)
{
ApCoeffMod *= 100.0f;
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref ApCoeffMod);
modOwner.ApplySpellMod(spellProto, SpellModOp.BonusMultiplier, ref ApCoeffMod);
ApCoeffMod /= 100.0f;
}
@@ -145,7 +145,7 @@ namespace Game.Entities
if (modOwner)
{
coeff *= 100.0f;
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff);
modOwner.ApplySpellMod(spellProto, SpellModOp.BonusMultiplier, ref coeff);
coeff /= 100.0f;
}
DoneTotal += (int)(DoneAdvertisedBenefit * coeff * stack);
@@ -158,9 +158,9 @@ namespace Game.Entities
if (_modOwner)
{
if (damagetype == DamageEffectType.DOT)
_modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Dot, ref tmpDamage);
_modOwner.ApplySpellMod(spellProto, SpellModOp.Dot, ref tmpDamage);
else
_modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Damage, ref tmpDamage);
_modOwner.ApplySpellMod(spellProto, SpellModOp.Damage, ref tmpDamage);
}
return (uint)Math.Max(tmpDamage, 0.0f);
@@ -321,7 +321,7 @@ namespace Game.Entities
if (modOwner)
{
coeff *= 100.0f;
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff);
modOwner.ApplySpellMod(spellProto, SpellModOp.BonusMultiplier, ref coeff);
coeff /= 100.0f;
}
TakenTotal += (int)(TakenAdvertisedBenefit * coeff * stack);
@@ -462,7 +462,7 @@ namespace Game.Entities
if (modOwner)
{
coeff *= 100.0f;
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff);
modOwner.ApplySpellMod(spellProto, SpellModOp.BonusMultiplier, ref coeff);
coeff /= 100.0f;
}
@@ -493,9 +493,9 @@ namespace Game.Entities
if (_modOwner)
{
if (damagetype == DamageEffectType.DOT)
_modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Dot, ref heal);
_modOwner.ApplySpellMod(spellProto, SpellModOp.Dot, ref heal);
else
_modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Damage, ref heal);
_modOwner.ApplySpellMod(spellProto, SpellModOp.Damage, ref heal);
}
return (uint)Math.Max(heal, 0.0f);
@@ -594,7 +594,7 @@ namespace Game.Entities
if (modOwner)
{
coeff *= 100.0f;
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff);
modOwner.ApplySpellMod(spellProto, SpellModOp.BonusMultiplier, ref coeff);
coeff /= 100.0f;
}
@@ -758,7 +758,7 @@ namespace Game.Entities
// only players use intelligence for critical chance computations
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.CriticalChance, ref crit_chance);
modOwner.ApplySpellMod(spellProto, SpellModOp.CriticalChance, ref crit_chance);
// for this types the bonus was already added in GetUnitCriticalChance, do not add twice
if (spellProto.DmgClass != SpellDmgClass.Melee && spellProto.DmgClass != SpellDmgClass.Ranged)
@@ -847,7 +847,7 @@ namespace Game.Entities
int roll = RandomHelper.IRand(0, 9999);
int missChance = (int)(MeleeSpellMissChance(victim, attType, spellInfo.Id) * 100.0f);
int missChance = (int)(MeleeSpellMissChance(victim, attType, spellInfo) * 100.0f);
// Roll miss
int tmp = missChance;
if (roll < tmp)
@@ -1010,7 +1010,7 @@ namespace Game.Entities
// Spellmod from SPELLMOD_RESIST_MISS_CHANCE
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spell.Id, SpellModOp.ResistMissChance, ref modHitChance);
modOwner.ApplySpellMod(spell, SpellModOp.ResistMissChance, ref modHitChance);
// Spells with SPELL_ATTR3_IGNORE_HIT_RESULT will ignore target's avoidance effects
if (!spell.HasAttribute(SpellAttr3.IgnoreHitResult))
@@ -2002,7 +2002,7 @@ namespace Game.Entities
// called from caster
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellInfo.Id, SpellModOp.CastingTime, ref castTime, spell);
modOwner.ApplySpellMod(spellInfo, SpellModOp.CastingTime, ref castTime, spell);
if (!(spellInfo.HasAttribute(SpellAttr0.Ability | SpellAttr0.Tradespell) || spellInfo.HasAttribute(SpellAttr3.NoDoneBonus))
&& (IsTypeId(TypeId.Player) && spellInfo.SpellFamilyName != 0) || IsTypeId(TypeId.Unit))
@@ -2023,7 +2023,7 @@ namespace Game.Entities
// called from caster
Player modOwner = GetSpellModOwner();
if (modOwner)
modOwner.ApplySpellMod(spellInfo.Id, SpellModOp.CastingTime, ref duration, spell);
modOwner.ApplySpellMod(spellInfo, SpellModOp.CastingTime, ref duration, spell);
if (!(spellInfo.HasAttribute(SpellAttr0.Ability) || spellInfo.HasAttribute(SpellAttr0.Tradespell) || spellInfo.HasAttribute(SpellAttr3.NoDoneBonus)) &&
(IsTypeId(TypeId.Player) && spellInfo.SpellFamilyName != 0) || IsTypeId(TypeId.Unit))
@@ -2036,23 +2036,23 @@ namespace Game.Entities
Player modOwner = GetSpellModOwner();
if (modOwner != null)
{
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.AllEffects, ref value);
modOwner.ApplySpellMod(spellProto, SpellModOp.AllEffects, ref value);
switch (effect_index)
{
case 0:
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Effect1, ref value);
modOwner.ApplySpellMod(spellProto, SpellModOp.Effect1, ref value);
break;
case 1:
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Effect2, ref value);
modOwner.ApplySpellMod(spellProto, SpellModOp.Effect2, ref value);
break;
case 2:
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Effect3, ref value);
modOwner.ApplySpellMod(spellProto, SpellModOp.Effect3, ref value);
break;
case 3:
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Effect4, ref value);
modOwner.ApplySpellMod(spellProto, SpellModOp.Effect4, ref value);
break;
case 4:
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.Effect5, ref value);
modOwner.ApplySpellMod(spellProto, SpellModOp.Effect5, ref value);
break;
}
}
@@ -2211,7 +2211,7 @@ namespace Game.Entities
// adds additional damage to critBonus (from talents)
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.CritDamageBonus, ref crit_bonus);
modOwner.ApplySpellMod(spellProto, SpellModOp.CritDamageBonus, ref crit_bonus);
crit_bonus += (int)damage;
@@ -2425,7 +2425,7 @@ namespace Game.Entities
// Apply crit_damage bonus for melee spells
Player modOwner = GetSpellModOwner();
if (modOwner != null)
modOwner.ApplySpellMod(spellInfo.Id, SpellModOp.CritDamageBonus, ref crit_bonus);
modOwner.ApplySpellMod(spellInfo, SpellModOp.CritDamageBonus, ref crit_bonus);
damage += (int)crit_bonus;
// Increase crit damage from SPELL_AURA_MOD_CRIT_DAMAGE_BONUS