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

Core/Script: Implement CalcCritChance hooks for spell and aura scripts

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f8255b15419cd1efdd2ccaf77298c8598322288f)
This commit is contained in:
hondacrx
2021-03-29 16:04:29 -04:00
parent 487aad55df
commit 3d40c868f6
6 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/ScriptsConst.cs
+3 -1
View File
@@ -42,7 +42,8 @@ namespace Framework.Constants
CheckCast,
BeforeCast,
OnCast,
AfterCast
AfterCast,
CalcCritChance
}
// AuraScript interface - enum used for runtime checks of script function calls
@@ -57,6 +58,7 @@ namespace Framework.Constants
EffectCalcAmount,
EffectCalcPeriodic,
EffectCalcSpellmod,
EffectCalcCritChance,
EffectAbsorb,
EffectAfterAbsorb,
EffectManaShield,
Source/Game/Entities/Unit/Unit.Spells.cs
+10 -3
View File
@@ -647,13 +647,14 @@ namespace Game.Entities
return (uint)Math.Max(heal, 0.0f);
}
public bool IsSpellCrit(Unit victim, SpellInfo spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = WeaponAttackType.BaseAttack)
public bool IsSpellCrit(Unit victim, Spell spell, AuraEffect aurEff, SpellSchoolMask schoolMask, WeaponAttackType attackType = WeaponAttackType.BaseAttack)
{
return RandomHelper.randChance(GetUnitSpellCriticalChance(victim, spellProto, schoolMask, attackType));
return RandomHelper.randChance(GetUnitSpellCriticalChance(victim, spell, aurEff, schoolMask, attackType));
}
public float GetUnitSpellCriticalChance(Unit victim, SpellInfo spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = WeaponAttackType.BaseAttack)
public float GetUnitSpellCriticalChance(Unit victim, Spell spell, AuraEffect aurEff, SpellSchoolMask schoolMask, WeaponAttackType attackType = WeaponAttackType.BaseAttack)
{
SpellInfo spellProto = spell.GetSpellInfo() ?? aurEff.GetSpellInfo();
//! Mobs can't crit with spells. Player Totems can
//! Fire Elemental (from totem) can too - but this part is a hack and needs more research
if (GetGUID().IsCreatureOrVehicle() && !(IsTotem() && GetOwnerGUID().IsPlayer()) && GetEntry() != 15438)
@@ -779,6 +780,12 @@ namespace Game.Entities
crit_chance += victim.GetTotalAuraModifier(AuraType.ModCritChanceForCasterPet, aurEff => aurEff.GetCasterGUID() == tempSummon.GetSummonerGUID());
}
// call script handlers
if (spell)
spell.CallScriptCalcCritChanceHandlers(victim, ref crit_chance);
else
aurEff.GetBase().CallScriptEffectCalcCritChanceHandlers(aurEff, aurEff.GetBase().GetApplicationOfTarget(victim.GetGUID()), victim, ref crit_chance);
return Math.Max(crit_chance, 0.0f);
}
Source/Game/Scripting/SpellScript.cs
+41
View File
@@ -151,6 +151,7 @@ namespace Game.Scripting
public delegate void SpellEffectFnType(uint index);
public delegate void SpellBeforeHitFnType(SpellMissInfo missInfo);
public delegate void SpellHitFnType();
public delegate void SpellOnCalcCritChanceFnType(Unit victim, ref float chance);
public delegate void SpellCastFnType();
public delegate void SpellObjectAreaTargetSelectFnType(List<WorldObject> targets);
public delegate void SpellObjectTargetSelectFnType(ref WorldObject targets);
@@ -243,6 +244,20 @@ namespace Game.Scripting
SpellHitFnType _pHitHandlerScript;
}
public class OnCalcCritChanceHandler
{
public OnCalcCritChanceHandler(SpellOnCalcCritChanceFnType onCalcCritChanceHandlerScript)
{
_onCalcCritChanceHandlerScript = onCalcCritChanceHandlerScript;
}
public void Call(Unit victim, ref float critChance)
{
_onCalcCritChanceHandlerScript(victim, ref critChance);
}
SpellOnCalcCritChanceFnType _onCalcCritChanceHandlerScript;
}
public class TargetHook : EffectHook
{
public TargetHook(uint effectIndex, Targets targetType, bool area, bool dest = false) : base(effectIndex)
@@ -463,6 +478,9 @@ namespace Game.Scripting
public List<HitHandler> OnHit = new();
public List<HitHandler> AfterHit = new();
// where function is void function(Unit victim, ref float critChance)
public List<OnCalcCritChanceHandler> OnCalcCritChance = new();
// where function is void function(List<WorldObject> targets)
public List<ObjectAreaTargetSelectHandler> OnObjectAreaTargetSelect = new();
@@ -771,6 +789,7 @@ namespace Game.Scripting
public delegate void AuraEffectCalcAmountDelegate(AuraEffect aura, ref int amount, ref bool canBeRecalculated);
public delegate void AuraEffectCalcPeriodicDelegate(AuraEffect aura, ref bool isPeriodic, ref int amplitude);
public delegate void AuraEffectCalcSpellModDelegate(AuraEffect aura, ref SpellModifier spellMod);
public delegate void AuraEffectCalcCritChanceFnType(AuraEffect aura, Unit victim, ref float critChance);
public delegate void AuraEffectAbsorbDelegate(AuraEffect aura, DamageInfo damageInfo, ref uint absorbAmount);
public delegate void AuraEffectSplitDelegate(AuraEffect aura, DamageInfo damageInfo, uint splitAmount);
public delegate bool AuraCheckProcDelegate(ProcEventInfo info);
@@ -889,6 +908,19 @@ namespace Game.Scripting
AuraEffectCalcSpellModDelegate pEffectHandlerScript;
}
public class EffectCalcCritChanceHandler : EffectBase
{
public EffectCalcCritChanceHandler(AuraEffectCalcCritChanceFnType effectHandlerScript, byte effIndex, AuraType effName) : base(effIndex, effName)
{
_effectHandlerScript = effectHandlerScript;
}
public void Call(AuraEffect aurEff, Unit victim, ref float critChance)
{
_effectHandlerScript(aurEff, victim, ref critChance);
}
AuraEffectCalcCritChanceFnType _effectHandlerScript;
}
public class EffectApplyHandler : EffectBase
{
public EffectApplyHandler(AuraEffectApplicationModeDelegate _pEffectHandlerScript, byte _effIndex, AuraType _effName, AuraEffectHandleModes _mode)
@@ -1074,6 +1106,10 @@ namespace Game.Scripting
if (eff.GetAffectedEffectsMask(entry) == 0)
Log.outError(LogFilter.Scripts, "Spell `{0}` Effect `{1}` of script `{2}` did not match dbc effect data - handler bound to hook `DoEffectCalcSpellMod` of AuraScript won't be executed", entry.Id, eff.ToString(), m_scriptName);
foreach (var eff in DoEffectCalcCritChance)
if (eff.GetAffectedEffectsMask(entry) == 0)
Log.outError(LogFilter.Scripts, $"Spell `{entry.Id}` Effect `{eff}` of script `{m_scriptName}` did not match dbc effect data - handler bound to hook `DoEffectCalcCritChance` of AuraScript won't be executed");
foreach (var eff in OnEffectAbsorb)
if (eff.GetAffectedEffectsMask(entry) == 0)
Log.outError(LogFilter.Scripts, "Spell `{0}` Effect `{1}` of script `{2}` did not match dbc effect data - handler bound to hook `OnEffectAbsorb` of AuraScript won't be executed", entry.Id, eff.ToString(), m_scriptName);
@@ -1248,6 +1284,11 @@ namespace Game.Scripting
// where function is: void function (AuraEffect aurEff, SpellModifier& spellMod);
public List<EffectCalcSpellModHandler> DoEffectCalcSpellMod = new();
// executed when aura effect calculates crit chance for dots and hots
// example: DoEffectCalcCritChance += AuraEffectCalcCritChanceFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier);
// where function is: void function (AuraEffect const* aurEff, Unit* victim, float& critChance);
public List<EffectCalcCritChanceHandler> DoEffectCalcCritChance = new();
// executed when absorb aura effect is going to reduce damage
// example: OnEffectAbsorb += AuraEffectAbsorbFn(class.function, EffectIndexSpecifier);
// where function is: void function (AuraEffect aurEff, DamageInfo& dmgInfo, uint& absorbAmount);
Source/Game/Spells/Auras/Aura.cs
+16 -3
View File
@@ -882,7 +882,7 @@ namespace Game.Spells
}
return maxStackAmount;
}
public bool ModStackAmount(int num, AuraRemoveMode removeMode = AuraRemoveMode.Default, bool resetPeriodicTimer = true)
{
int stackAmount = m_stackAmount + num;
@@ -1449,7 +1449,7 @@ namespace Game.Spells
effect.SetDonePct(caster.SpellDamagePctDone(target, m_spellInfo, DamageEffectType.DOT)); // Calculate done percentage first!
effect.SetDamage((int)(caster.SpellDamageBonusDone(target, m_spellInfo, damage, DamageEffectType.DOT, effect.GetSpellEffectInfo(), GetStackAmount()) * effect.GetDonePct()));
effect.SetCritChance(caster.GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo.GetSchoolMask()));
effect.SetCritChance(caster.GetUnitSpellCriticalChance(target, null, effect, m_spellInfo.GetSchoolMask()));
break;
}
case AuraType.PeriodicHeal:
@@ -1463,7 +1463,7 @@ namespace Game.Spells
effect.SetDonePct(caster.SpellHealingPctDone(target, m_spellInfo)); // Calculate done percentage first!
effect.SetDamage((int)(caster.SpellHealingBonusDone(target, m_spellInfo, damage, DamageEffectType.DOT, effect.GetSpellEffectInfo(), GetStackAmount()) * effect.GetDonePct()));
effect.SetCritChance(caster.GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo.GetSchoolMask()));
effect.SetCritChance(caster.GetUnitSpellCriticalChance(target, null, effect, m_spellInfo.GetSchoolMask()));
break;
}
default:
@@ -2074,6 +2074,19 @@ namespace Game.Spells
}
}
public void CallScriptEffectCalcCritChanceHandlers(AuraEffect aurEff, AuraApplication aurApp, Unit victim, ref float critChance)
{
foreach (AuraScript loadedScript in m_loadedScripts)
{
loadedScript._PrepareScriptCall(AuraScriptHookType.EffectCalcCritChance, aurApp);
foreach (var hook in loadedScript.DoEffectCalcCritChance)
if (hook.IsEffectAffected(m_spellInfo, aurEff.GetEffIndex()))
hook.Call(aurEff, victim, ref critChance);
loadedScript._FinishScriptCall();
}
}
public void CallScriptEffectAbsorbHandlers(AuraEffect aurEff, AuraApplication aurApp, DamageInfo dmgInfo, ref uint absorbAmount, ref bool defaultPrevented)
{
foreach (var auraScript in m_loadedScripts)
Source/Game/Spells/Auras/AuraEffect.cs
+3 -3
View File
@@ -4923,7 +4923,7 @@ namespace Game.Spells
}
}
bool crit = RandomHelper.randChance(isAreaAura ? caster.GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo.GetSchoolMask()) : m_critChance);
bool crit = RandomHelper.randChance(isAreaAura ? caster.GetUnitSpellCriticalChance(target, null, this, m_spellInfo.GetSchoolMask()) : m_critChance);
if (crit)
damage = caster.SpellCriticalDamageBonus(m_spellInfo, damage, target);
@@ -5010,7 +5010,7 @@ namespace Game.Spells
}
}
bool crit = RandomHelper.randChance(isAreaAura ? caster.GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo.GetSchoolMask()) : m_critChance);
bool crit = RandomHelper.randChance(isAreaAura ? caster.GetUnitSpellCriticalChance(target, null, this, m_spellInfo.GetSchoolMask()) : m_critChance);
if (crit)
damage = caster.SpellCriticalDamageBonus(m_spellInfo, damage, target);
@@ -5150,7 +5150,7 @@ namespace Game.Spells
damage = (int)target.SpellHealingBonusTaken(caster, GetSpellInfo(), (uint)damage, DamageEffectType.DOT, GetSpellEffectInfo(), GetBase().GetStackAmount());
}
bool crit = RandomHelper.randChance(isAreaAura ? caster.GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo.GetSchoolMask()) : m_critChance);
bool crit = RandomHelper.randChance(isAreaAura ? caster.GetUnitSpellCriticalChance(target, null, this, m_spellInfo.GetSchoolMask()) : m_critChance);
if (crit)
damage = caster.SpellCriticalHealingBonus(m_spellInfo, damage, target);
Source/Game/Spells/Spell.cs
+13 -1
View File
@@ -6814,7 +6814,7 @@ namespace Game.Spells
}
}
targetInfo.crit = m_caster.IsSpellCrit(unit, m_spellInfo, m_spellSchoolMask, m_attackType);
targetInfo.crit = m_caster.IsSpellCrit(unit, this, null, m_spellSchoolMask, m_attackType);
}
SpellCastResult CanOpenLock(uint effIndex, uint lockId, ref SkillType skillId, ref int reqSkillValue, ref int skillValue)
@@ -7092,6 +7092,18 @@ namespace Game.Spells
}
}
public void CallScriptCalcCritChanceHandlers(Unit victim, ref float critChance)
{
foreach (var loadedScript in m_loadedScripts)
{
loadedScript._PrepareScriptCall(SpellScriptHookType.CalcCritChance);
foreach (var hook in loadedScript.OnCalcCritChance)
hook.Call(victim, ref critChance);
loadedScript._FinishScriptCall();
}
}
void CallScriptObjectAreaTargetSelectHandlers(List<WorldObject> targets, uint effIndex, SpellImplicitTargetInfo targetType)
{
foreach (var script in m_loadedScripts)