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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
Scripts/Spells/Sixth/Dispel.cs
View file

@ -37,9 +37,8 @@ namespace Server.Spells.Sixth
protected override void OnTarget(Mobile from, object o)
{
if (o is Mobile)
if (o is Mobile m)
{
Mobile m = (Mobile)o;
BaseCreature bc = m as BaseCreature;
if (!from.CanSee(m))

4
Scripts/Spells/Sixth/EnergyBolt.cs
View file

@ -82,8 +82,8 @@ namespace Server.Spells.Sixth
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)

4
Scripts/Spells/Sixth/Explosion.cs
View file

@ -115,8 +115,8 @@ namespace Server.Spells.Sixth
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)

5
Scripts/Spells/Sixth/Invisibility.cs
View file

@ -47,7 +47,7 @@ namespace Server.Spells.Sixth
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (m is BaseVendor || m is PlayerVendor || m is PlayerBarkeeper || m.AccessLevel > Caster.AccessLevel)
else if (m is BaseVendor || m is PlayerVendor || m.AccessLevel > Caster.AccessLevel)
{
Caster.SendLocalizedMessage(501857); // This spell won't work on that!
}
@ -125,7 +125,8 @@ namespace Server.Spells.Sixth
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)

4
Scripts/Spells/Sixth/Mark.cs
View file

@ -74,8 +74,8 @@ namespace Server.Spells.Sixth
protected override void OnTarget(Mobile from, object o)
{
if (o is RecallRune)
m_Owner.Target((RecallRune)o);
if (o is RecallRune rune)
m_Owner.Target(rune);
else
from.Send(new MessageLocalized(from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 501797, from.Name,
"")); // I cannot mark that object.

4
Scripts/Spells/Sixth/MassCurse.cs
View file

@ -92,9 +92,7 @@ namespace Server.Spells.Sixth
protected override void OnTarget(Mobile from, object o)
{
IPoint3D p = o as IPoint3D;
if (p != null)
if (o is IPoint3D p)
m_Owner.Target(p);
}

4
Scripts/Spells/Sixth/ParalyzeField.cs
View file

@ -224,8 +224,8 @@ namespace Server.Spells.Sixth
protected override void OnTarget(Mobile from, object o)
{
if (o is IPoint3D)
m_Owner.Target((IPoint3D)o);
if (o is IPoint3D d)
m_Owner.Target(d);
}
protected override void OnTargetFinish(Mobile from)

4
Scripts/Spells/Sixth/Reveal.cs
View file

@ -107,9 +107,7 @@ namespace Server.Spells.Sixth
protected override void OnTarget(Mobile from, object o)
{
IPoint3D p = o as IPoint3D;
if (p != null)
if (o is IPoint3D p)
m_Owner.Target(p);
}