Fixes chaos damage bug with the spell system. Fixes various small other bugs. Fixes more merge cast type checks and uses default values.

This commit is contained in:
Kamron Batman 2018-09-16 21:04:36 -07:00
parent 9542c79ea4
commit c155c82325
115 changed files with 644 additions and 1041 deletions

View file

@ -71,7 +71,8 @@ namespace Server.Spells.Second
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile) m_Owner.Target((Mobile)o);
if (o is Mobile mobile)
m_Owner.Target(mobile);
}
protected override void OnTargetFinish(Mobile from)

View file

@ -71,7 +71,8 @@ namespace Server.Spells.Second
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile) m_Owner.Target((Mobile)o);
if (o is Mobile mobile)
m_Owner.Target(mobile);
}
protected override void OnTargetFinish(Mobile from)

View file

@ -87,7 +87,8 @@ namespace Server.Spells.Second
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile) m_Owner.Target((Mobile)o);
if (o is Mobile mobile)
m_Owner.Target(mobile);
}
protected override void OnTargetFinish(Mobile from)

View file

@ -25,13 +25,11 @@ namespace Server.Spells.Second
Caster.Target = new InternalTarget(this);
}
public override double GetSlayerDamageScalar(Mobile target)
{
return 1.0; //This spell isn't affected by slayer spellbooks
}
public void Target(Mobile m)
{
if (!Caster.CanSee(m))
@ -97,7 +95,8 @@ namespace Server.Spells.Second
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile) m_Owner.Target((Mobile)o);
if (o is Mobile mobile)
m_Owner.Target(mobile);
}
protected override void OnTargetFinish(Mobile from)

View file

@ -78,8 +78,8 @@ namespace Server.Spells.Second
protected override void OnTarget(Mobile from, object o)
{
if (o is TrappableContainer)
m_Owner.Target((TrappableContainer)o);
if (o is TrappableContainer container)
m_Owner.Target(container);
else
from.SendMessage("You can't trap that");
}

View file

@ -64,8 +64,8 @@ namespace Server.Spells.Second
protected override void OnTarget(Mobile from, object o)
{
if (o is TrappableContainer)
m_Owner.Target((TrappableContainer)o);
if (o is TrappableContainer container)
m_Owner.Target(container);
else
from.SendMessage("You can't disarm that");
}

View file

@ -71,7 +71,8 @@ namespace Server.Spells.Second
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile) m_Owner.Target((Mobile)o);
if (o is Mobile mobile)
m_Owner.Target(mobile);
}
protected override void OnTargetFinish(Mobile from)