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

fix: Removes duplicative spell checks (#849)

Browse source
This commit is contained in:
Kamron Batman 2021-11-14 18:45:16 -08:00 • committed by GitHub
parent e5f55a424a
commit 5df7bf6a75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 78 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Projects/UOContent/Spells/Sixth/Dispel.cs
View file

@ -24,16 +24,7 @@ namespace Server.Spells.Sixth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (!(m is BaseCreature bc && bc.IsDispellable))
if (m is not BaseCreature { IsDispellable: true } bc)
{
Caster.SendLocalizedMessage(1005049); // That cannot be dispelled.
}

11
Projects/UOContent/Spells/Sixth/EnergyBolt.cs
View file

@ -23,16 +23,7 @@ namespace Server.Spells.Sixth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckHSequence(m))
if (CheckHSequence(m))
{
var source = Caster;

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

@ -26,16 +26,7 @@ namespace Server.Spells.Sixth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (Caster.CanBeHarmful(m) && CheckSequence())
if (Caster.CanBeHarmful(m) && CheckSequence())
{
Mobile attacker = Caster, defender = m;

11
Projects/UOContent/Spells/Sixth/Invisibility.cs
View file

@ -28,16 +28,7 @@ namespace Server.Spells.Sixth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (m is BaseVendor || m is PlayerVendor || m.AccessLevel > Caster.AccessLevel)
if (m is BaseVendor or PlayerVendor || m.AccessLevel > Caster.AccessLevel)
{
Caster.SendLocalizedMessage(501857); // This spell won't work on that!
}

17
Projects/UOContent/Spells/Sixth/Mark.cs
View file

@ -24,7 +24,7 @@ namespace Server.Spells.Sixth
public void Target(Item item)
{
if (!(item is RecallRune rune))
if (item is not RecallRune rune)
{
Caster.NetState.SendMessageLocalized(
Caster.Serial,
@ -32,13 +32,9 @@ namespace Server.Spells.Sixth
MessageType.Regular,
0x3B2,
3,
501797,
501797, // I cannot mark that object.
Caster.Name
); // I cannot mark that object.
}
else if (!Caster.CanSee(rune))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
);
}
else if (!SpellHelper.CheckTravel(Caster, TravelCheckType.Mark))
{
@ -49,11 +45,8 @@ namespace Server.Spells.Sixth
}
else if (!rune.IsChildOf(Caster.Backpack))
{
Caster.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1062422
); // You must have this rune in your backpack in order to mark it.
// You must have this rune in your backpack in order to mark it.
Caster.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1062422);
}
else if (CheckSequence())
{

6
Projects/UOContent/Spells/Sixth/MassCurse.cs
View file

@ -24,11 +24,7 @@ namespace Server.Spells.Sixth
public void Target(IPoint3D p)
{
if (!Caster.CanSee(p))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
{
SpellHelper.Turn(Caster, p);

6
Projects/UOContent/Spells/Sixth/ParalyzeField.cs
View file

@ -27,11 +27,7 @@ namespace Server.Spells.Sixth
public void Target(IPoint3D p)
{
if (!Caster.CanSee(p))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
{
SpellHelper.Turn(Caster, p);

6
Projects/UOContent/Spells/Sixth/Reveal.cs
View file

@ -22,11 +22,7 @@ namespace Server.Spells.Sixth
public void Target(IPoint3D p)
{
if (!Caster.CanSee(p))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckSequence())
if (CheckSequence())
{
SpellHelper.Turn(Caster, p);
SpellHelper.GetSurfaceTop(ref p);