Scripts/Spells: Added proc requirements to a few auras that have SPELL_ATTR3_CAN_PROC_FROM_PROCS attribute
Port From (https://github.com/TrinityCore/TrinityCore/commit/092119058ba11e6d9d0b929787693c70032aebe1)
This commit is contained in:
@@ -6,6 +6,7 @@ using Game.Entities;
|
||||
using Game.Networking.Packets;
|
||||
using Game.Scripting;
|
||||
using Game.Spells;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Scripts.Spells.Azerite
|
||||
@@ -426,7 +427,7 @@ namespace Scripts.Spells.Azerite
|
||||
{
|
||||
AuraEffect trait = GetCaster().GetAuraEffect(SpellIds.EchoingBladesTrait, 2);
|
||||
if (trait != null)
|
||||
SetHitDamage(trait.GetAmount() * 2);
|
||||
SetHitDamage(trait.GetAmount() * 2);
|
||||
}
|
||||
|
||||
void ForceCritical(Unit victim, ref float critChance)
|
||||
@@ -484,7 +485,40 @@ namespace Scripts.Spells.Azerite
|
||||
DoCheckEffectProc.Add(new CheckEffectProcHandler(CheckProc, 0, AuraType.ProcTriggerSpell));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[Script] // 305723 - Strife (Azerite Essence)
|
||||
class spell_item_conflict_rank3 : AuraScript
|
||||
{
|
||||
bool CheckProc(ProcEventInfo eventInfo)
|
||||
{
|
||||
if (eventInfo.GetHitMask().HasAnyFlag(ProcFlagsHit.Interrupt | ProcFlagsHit.Dispel))
|
||||
return true;
|
||||
|
||||
Spell procSpell = eventInfo.GetProcSpell();
|
||||
if (!procSpell)
|
||||
return false;
|
||||
|
||||
bool isCrowdControl = procSpell.GetSpellInfo().HasAura(AuraType.ModConfuse)
|
||||
|| procSpell.GetSpellInfo().HasAura(AuraType.ModFear)
|
||||
|| procSpell.GetSpellInfo().HasAura(AuraType.ModStun)
|
||||
|| procSpell.GetSpellInfo().HasAura(AuraType.ModPacify)
|
||||
|| procSpell.GetSpellInfo().HasAura(AuraType.ModRoot)
|
||||
|| procSpell.GetSpellInfo().HasAura(AuraType.ModSilence)
|
||||
|| procSpell.GetSpellInfo().HasAura(AuraType.ModPacifySilence)
|
||||
|| procSpell.GetSpellInfo().HasAura(AuraType.ModRoot2);
|
||||
|
||||
if (!isCrowdControl)
|
||||
return false;
|
||||
|
||||
return eventInfo.GetActionTarget().HasAura(aura => aura.GetCastId() == procSpell.m_castId);
|
||||
}
|
||||
|
||||
public override void Register()
|
||||
{
|
||||
DoCheckProc.Add(new CheckProcHandler(CheckProc));
|
||||
}
|
||||
}
|
||||
|
||||
[Script] // 277253 - Heart of Azeroth
|
||||
class spell_item_heart_of_azeroth : AuraScript
|
||||
{
|
||||
@@ -517,4 +551,25 @@ namespace Scripts.Spells.Azerite
|
||||
OnEffectRemove.Add(new EffectApplyHandler(ClearEquippedFlag, 0, AuraType.Dummy, AuraEffectHandleModes.Real));
|
||||
}
|
||||
}
|
||||
|
||||
[Script] // 315176 - Grasping Tendrils
|
||||
class spell_item_corruption_grasping_tendrils : AuraScript
|
||||
{
|
||||
public override bool Load()
|
||||
{
|
||||
return GetUnitOwner().IsPlayer();
|
||||
}
|
||||
|
||||
void CalcAmount(AuraEffect aurEff, ref int amount, ref bool canBeRecalculated)
|
||||
{
|
||||
Player player = GetUnitOwner().ToPlayer();
|
||||
amount = (int)Math.Clamp(10.0f + player.GetRatingBonusValue(CombatRating.Corruption) - player.GetRatingBonusValue(CombatRating.CorruptionResistance), 0.0f, 99.0f);
|
||||
canBeRecalculated = false;
|
||||
}
|
||||
|
||||
public override void Register()
|
||||
{
|
||||
DoEffectCalcAmount.Add(new EffectCalcAmountHandler(CalcAmount, 0, AuraType.ModDecreaseSpeed));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4237,4 +4237,74 @@ namespace Scripts.Spells.Items
|
||||
DoCheckEffectProc.Add(new CheckEffectProcHandler(CheckProc, 0, AuraType.ProcTriggerSpell));
|
||||
}
|
||||
}
|
||||
|
||||
// 303358 Venomous Bolt
|
||||
// 303361 Shivering Lance
|
||||
[Script("spell_item_shiver_venom_crossbow", 303559)]
|
||||
[Script("spell_item_shiver_venom_lance", 303562)]
|
||||
class spell_item_shiver_venom_weapon_proc : AuraScript
|
||||
{
|
||||
static uint SPELL_SHIVER_VENOM = 301624;
|
||||
|
||||
uint _additionalProcSpellId;
|
||||
|
||||
public spell_item_shiver_venom_weapon_proc(uint additionalProcSpellId)
|
||||
{
|
||||
_additionalProcSpellId = additionalProcSpellId;
|
||||
}
|
||||
|
||||
public override bool Validate(SpellInfo spellInfo)
|
||||
{
|
||||
return ValidateSpellInfo(SPELL_SHIVER_VENOM, _additionalProcSpellId);
|
||||
}
|
||||
|
||||
void HandleAdditionalProc(AuraEffect aurEff, ProcEventInfo procInfo)
|
||||
{
|
||||
if (procInfo.GetProcTarget().HasAura(SPELL_SHIVER_VENOM))
|
||||
procInfo.GetActor().CastSpell(procInfo.GetProcTarget(), _additionalProcSpellId, new CastSpellExtraArgs(aurEff)
|
||||
.AddSpellMod(SpellValueMod.BasePoint0, aurEff.GetAmount())
|
||||
.SetTriggeringSpell(procInfo.GetProcSpell()));
|
||||
}
|
||||
|
||||
public override void Register()
|
||||
{
|
||||
OnEffectProc.Add(new EffectProcHandler(HandleAdditionalProc, 1, AuraType.Dummy));
|
||||
}
|
||||
}
|
||||
|
||||
[Script] // 302774 - Arcane Tempest
|
||||
class spell_item_phial_of_the_arcane_tempest_damage : SpellScript
|
||||
{
|
||||
void ModifyStacks()
|
||||
{
|
||||
if (GetUnitTargetCountForEffect(0) != 1 || GetTriggeringSpell() == null)
|
||||
return;
|
||||
|
||||
AuraEffect aurEff = GetCaster().GetAuraEffect(GetTriggeringSpell().Id, 0);
|
||||
if (aurEff != null)
|
||||
{
|
||||
aurEff.GetBase().ModStackAmount(1, AuraRemoveMode.None, false);
|
||||
aurEff.CalculatePeriodic(GetCaster(), false);
|
||||
}
|
||||
}
|
||||
|
||||
public override void Register()
|
||||
{
|
||||
AfterCast.Add(new CastHandler(ModifyStacks));
|
||||
}
|
||||
}
|
||||
|
||||
[Script] // 302769 - Arcane Tempest
|
||||
class spell_item_phial_of_the_arcane_tempest_periodic : AuraScript
|
||||
{
|
||||
void CalculatePeriod(AuraEffect aurEff, ref bool isPeriodic, ref int period)
|
||||
{
|
||||
period -= (GetStackAmount() - 1) * 300;
|
||||
}
|
||||
|
||||
public override void Register()
|
||||
{
|
||||
DoEffectCalcPeriodic.Add(new EffectCalcPeriodicHandler(CalculatePeriod, 0, AuraType.PeriodicTriggerSpell));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user