warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes skill requirements and cleans up magery spells (#870)

Browse source 
* Preps damage stacking for mysticism, necromancy fixes, and spellweaving
* Removes extra LINQ allocations
* Fixes skill requirements for magery spells.
This commit is contained in:
Kamron Batman 2021-12-05 09:40:57 -08:00 • committed by GitHub
parent 1cf7b6c056
commit 4f9714818d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 311 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Projects/UOContent/Spells/Sixth/Explosion.cs
View file

@ -20,22 +20,26 @@ namespace Server.Spells.Sixth
public override SpellCircle Circle => SpellCircle.Sixth;
public override bool DelayedDamageStacking => !Core.AOS;
public override Type[] DelayedDamageSpellFamilyStacking => AOSNoDelayedDamageStackingSelf;
public override bool DelayedDamage => false;
public void Target(Mobile m)
{
if (Core.SA && HasDelayedDamageContext(m))
{
DoHurtFizzle();
return;
}
if (Caster.CanBeHarmful(m) && CheckSequence())
{
Mobile attacker = Caster, defender = m;
Mobile defender = m;
SpellHelper.Turn(Caster, m);
SpellHelper.CheckReflect((int)Circle, Caster, ref m);
var t = new InternalTimer(this, attacker, defender, m);
t.Start();
var t = new InternalTimer(this, Caster, defender, m).Start();
}
FinishSequence();
@ -48,52 +52,52 @@ namespace Server.Spells.Sixth
private class InternalTimer : Timer
{
private readonly Mobile m_Attacker;
private readonly Mobile m_Defender;
private readonly MagerySpell m_Spell;
private readonly Mobile m_Target;
private readonly Mobile _attacker;
private readonly Mobile _defender;
private readonly MagerySpell _spell;
private readonly Mobile _target;
public InternalTimer(MagerySpell spell, Mobile attacker, Mobile defender, Mobile target)
: base(TimeSpan.FromSeconds(Core.AOS ? 3.0 : 2.5))
{
m_Spell = spell;
m_Attacker = attacker;
m_Defender = defender;
m_Target = target;
_spell = spell;
_attacker = attacker;
_defender = defender;
_target = target;
m_Spell?.StartDelayedDamageContext(attacker, this);
_spell?.StartDelayedDamageContext(_attacker, this);
}
protected override void OnTick()
{
if (m_Attacker.HarmfulCheck(m_Defender))
if (_attacker.HarmfulCheck(_defender))
{
double damage;
if (Core.AOS)
{
damage = m_Spell.GetNewAosDamage(40, 1, 5, m_Defender);
damage = _spell.GetNewAosDamage(40, 1, 5, _defender);
}
else
{
damage = Utility.Random(23, 22);
if (m_Spell.CheckResisted(m_Target))
if (_spell.CheckResisted(_target))
{
damage *= 0.75;
m_Target.SendLocalizedMessage(501783); // You feel yourself resisting magical energy.
_target.SendLocalizedMessage(501783); // You feel yourself resisting magical energy.
}
damage *= m_Spell.GetDamageScalar(m_Target);
damage *= _spell.GetDamageScalar(_target);
}
m_Target.FixedParticles(0x36BD, 20, 10, 5044, EffectLayer.Head);
m_Target.PlaySound(0x307);
_target.FixedParticles(0x36BD, 20, 10, 5044, EffectLayer.Head);
_target.PlaySound(0x307);
SpellHelper.Damage(m_Spell, m_Target, damage, 0, 100, 0, 0, 0);
SpellHelper.Damage(_spell, _target, damage, 0, 100, 0, 0, 0);
m_Spell?.RemoveDelayedDamageContext(m_Attacker);
_spell?.RemoveDelayedDamageContext(_attacker);
}
}
}