diff --git a/Projects/Server/Targeting/Target.cs b/Projects/Server/Targeting/Target.cs index d0035ed3b..e60231322 100644 --- a/Projects/Server/Targeting/Target.cs +++ b/Projects/Server/Targeting/Target.cs @@ -164,36 +164,33 @@ namespace Server.Targeting { OnTargetOutOfRange(from, targeted); } - else + else if (!from.CanSee(targeted)) { - if (!from.CanSee(targeted)) - { - OnCantSeeTarget(from, targeted); - } - else if (CheckLOS && !from.InLOS(targeted)) - { - OnTargetOutOfLOS(from, targeted); - } - else if (item?.InSecureTrade == true) - { - OnTargetInSecureTrade(from, targeted); - } - else if (item?.IsAccessibleTo(from) == false) - { - OnTargetNotAccessible(from, targeted); - } - else if (item?.CheckTarget(from, this, targeted) == false) - { - OnTargetUntargetable(from, targeted); - } - else if (mobile?.CheckTarget(from, this, mobile) == false) - { - OnTargetUntargetable(from, mobile); - } - else if (from.Region.OnTarget(from, this, targeted)) - { - OnTarget(from, targeted); - } + OnCantSeeTarget(from, targeted); + } + else if (CheckLOS && !from.InLOS(targeted)) + { + OnTargetOutOfLOS(from, targeted); + } + else if (item?.InSecureTrade == true) + { + OnTargetInSecureTrade(from, targeted); + } + else if (item?.IsAccessibleTo(from) == false) + { + OnTargetNotAccessible(from, targeted); + } + else if (item?.CheckTarget(from, this, targeted) == false) + { + OnTargetUntargetable(from, targeted); + } + else if (mobile?.CheckTarget(from, this, mobile) == false) + { + OnTargetUntargetable(from, mobile); + } + else if (from.Region.OnTarget(from, this, targeted)) + { + OnTarget(from, targeted); } OnTargetFinish(from); diff --git a/Projects/UOContent/Commands/Handlers.cs b/Projects/UOContent/Commands/Handlers.cs index 867ed68d6..b289f9acd 100644 --- a/Projects/UOContent/Commands/Handlers.cs +++ b/Projects/UOContent/Commands/Handlers.cs @@ -7,11 +7,9 @@ using Server.Gumps; using Server.Items; using Server.Menus.ItemLists; using Server.Menus.Questions; -using Server.Misc; using Server.Mobiles; using Server.Multis; using Server.Network; -using Server.Saves; using Server.Spells; using Server.Targeting; using Server.Targets; diff --git a/Projects/UOContent/Compression/TarArchive.cs b/Projects/UOContent/Compression/TarArchive.cs index 69083e509..4905a3683 100755 --- a/Projects/UOContent/Compression/TarArchive.cs +++ b/Projects/UOContent/Compression/TarArchive.cs @@ -1,14 +1,9 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.IO.Compression; -using System.Net; using System.Net.Http; -using System.Text.Json; -using System.Threading; -using System.Threading.Tasks; using Server.Buffers; namespace Server.Compression diff --git a/Projects/UOContent/Compression/ZstdArchive.cs b/Projects/UOContent/Compression/ZstdArchive.cs index a1f1fee2c..35fd533d5 100755 --- a/Projects/UOContent/Compression/ZstdArchive.cs +++ b/Projects/UOContent/Compression/ZstdArchive.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; diff --git a/Projects/UOContent/Spells/Eighth/Resurrection.cs b/Projects/UOContent/Spells/Eighth/Resurrection.cs index 77fcc0afb..c485850fa 100644 --- a/Projects/UOContent/Spells/Eighth/Resurrection.cs +++ b/Projects/UOContent/Spells/Eighth/Resurrection.cs @@ -24,16 +24,7 @@ namespace Server.Spells.Eighth public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (m == Caster) + if (m == Caster) { Caster.SendLocalizedMessage(501039); // Thou can not resurrect thyself. } diff --git a/Projects/UOContent/Spells/Fifth/DispelField.cs b/Projects/UOContent/Spells/Fifth/DispelField.cs index e05b2718c..cd7c3240c 100644 --- a/Projects/UOContent/Spells/Fifth/DispelField.cs +++ b/Projects/UOContent/Spells/Fifth/DispelField.cs @@ -25,15 +25,7 @@ namespace Server.Spells.Fifth public void Target(Item item) { - if (item == null) - { - Caster.SendLocalizedMessage(1005049); // That cannot be dispelled. - } - else if (!Caster.CanSee(item)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (!item.GetType().IsDefined(typeof(DispellableFieldAttribute), false)) + if (!item.GetType().IsDefined(typeof(DispellableFieldAttribute), false)) { Caster.SendLocalizedMessage(1005049); // That cannot be dispelled. } diff --git a/Projects/UOContent/Spells/Fifth/MindBlast.cs b/Projects/UOContent/Spells/Fifth/MindBlast.cs index 7f1b6945d..a5e2644e0 100644 --- a/Projects/UOContent/Spells/Fifth/MindBlast.cs +++ b/Projects/UOContent/Spells/Fifth/MindBlast.cs @@ -30,16 +30,7 @@ namespace Server.Spells.Fifth public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (Core.AOS) + if (Core.AOS) { if (Caster.CanBeHarmful(m) && CheckSequence()) { diff --git a/Projects/UOContent/Spells/Fifth/Paralyze.cs b/Projects/UOContent/Spells/Fifth/Paralyze.cs index b7dc8c20d..fcc12f643 100644 --- a/Projects/UOContent/Spells/Fifth/Paralyze.cs +++ b/Projects/UOContent/Spells/Fifth/Paralyze.cs @@ -25,17 +25,7 @@ namespace Server.Spells.Fifth public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (Core.AOS && (m.Frozen || m.Paralyzed || - m.Spell?.IsCasting == true && !(m.Spell is PaladinSpell))) + if (Core.AOS && (m.Frozen || m.Paralyzed || m.Spell?.IsCasting == true && m.Spell is not PaladinSpell)) { Caster.SendLocalizedMessage(1061923); // The target is already frozen. } diff --git a/Projects/UOContent/Spells/Fifth/PoisonField.cs b/Projects/UOContent/Spells/Fifth/PoisonField.cs index f08d8ca42..1c7ceb92a 100644 --- a/Projects/UOContent/Spells/Fifth/PoisonField.cs +++ b/Projects/UOContent/Spells/Fifth/PoisonField.cs @@ -28,11 +28,7 @@ namespace Server.Spells.Fifth 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); diff --git a/Projects/UOContent/Spells/First/Clumsy.cs b/Projects/UOContent/Spells/First/Clumsy.cs index e47ddbe16..e777ea455 100644 --- a/Projects/UOContent/Spells/First/Clumsy.cs +++ b/Projects/UOContent/Spells/First/Clumsy.cs @@ -21,16 +21,7 @@ namespace Server.Spells.First 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/First/Feeblemind.cs b/Projects/UOContent/Spells/First/Feeblemind.cs index 22a06ef38..ac339bca6 100644 --- a/Projects/UOContent/Spells/First/Feeblemind.cs +++ b/Projects/UOContent/Spells/First/Feeblemind.cs @@ -21,16 +21,7 @@ namespace Server.Spells.First 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/First/Heal.cs b/Projects/UOContent/Spells/First/Heal.cs index efde53803..1379759c5 100644 --- a/Projects/UOContent/Spells/First/Heal.cs +++ b/Projects/UOContent/Spells/First/Heal.cs @@ -26,16 +26,7 @@ namespace Server.Spells.First public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (m.IsDeadBondedPet) + if (m.IsDeadBondedPet) { Caster.SendLocalizedMessage(1060177); // You cannot heal a creature that is already dead! } diff --git a/Projects/UOContent/Spells/First/MagicArrow.cs b/Projects/UOContent/Spells/First/MagicArrow.cs index e8922739d..02f4de6e7 100644 --- a/Projects/UOContent/Spells/First/MagicArrow.cs +++ b/Projects/UOContent/Spells/First/MagicArrow.cs @@ -24,16 +24,7 @@ namespace Server.Spells.First 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; diff --git a/Projects/UOContent/Spells/First/Weaken.cs b/Projects/UOContent/Spells/First/Weaken.cs index 3fcaf4bbe..cdac84af0 100644 --- a/Projects/UOContent/Spells/First/Weaken.cs +++ b/Projects/UOContent/Spells/First/Weaken.cs @@ -21,16 +21,7 @@ namespace Server.Spells.First 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Fourth/ArchCure.cs b/Projects/UOContent/Spells/Fourth/ArchCure.cs index f2b2bf95e..9b618138f 100644 --- a/Projects/UOContent/Spells/Fourth/ArchCure.cs +++ b/Projects/UOContent/Spells/Fourth/ArchCure.cs @@ -29,11 +29,7 @@ namespace Server.Spells.Fourth 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); diff --git a/Projects/UOContent/Spells/Fourth/ArchProtection.cs b/Projects/UOContent/Spells/Fourth/ArchProtection.cs index 916c9643e..a9ae7f7bb 100644 --- a/Projects/UOContent/Spells/Fourth/ArchProtection.cs +++ b/Projects/UOContent/Spells/Fourth/ArchProtection.cs @@ -30,11 +30,7 @@ namespace Server.Spells.Fourth 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); diff --git a/Projects/UOContent/Spells/Fourth/Curse.cs b/Projects/UOContent/Spells/Fourth/Curse.cs index a78c32e76..84a076e3d 100644 --- a/Projects/UOContent/Spells/Fourth/Curse.cs +++ b/Projects/UOContent/Spells/Fourth/Curse.cs @@ -25,16 +25,7 @@ namespace Server.Spells.Fourth 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)) { SpellHelper.Turn(Caster, m); @@ -46,8 +37,8 @@ namespace Server.Spells.Fourth SpellHelper.AddStatCurse(Caster, m, StatType.Int); SpellHelper.DisableSkillCheck = false; - if (Caster.Player && m.Player /*&& Caster != m */ && !UnderEffect(m) - ) // On OSI you CAN curse yourself and get this effect. + // On OSI you CAN curse yourself and get this effect. + if (Caster.Player && m.Player /*&& Caster != m */ && !UnderEffect(m)) { var duration = SpellHelper.GetDuration(Caster, m); m_UnderEffect.Add(m); diff --git a/Projects/UOContent/Spells/Fourth/FireField.cs b/Projects/UOContent/Spells/Fourth/FireField.cs index cd4934744..c06739a78 100644 --- a/Projects/UOContent/Spells/Fourth/FireField.cs +++ b/Projects/UOContent/Spells/Fourth/FireField.cs @@ -28,11 +28,7 @@ namespace Server.Spells.Fourth 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); diff --git a/Projects/UOContent/Spells/Fourth/GreaterHeal.cs b/Projects/UOContent/Spells/Fourth/GreaterHeal.cs index 36647df92..4c02942f4 100644 --- a/Projects/UOContent/Spells/Fourth/GreaterHeal.cs +++ b/Projects/UOContent/Spells/Fourth/GreaterHeal.cs @@ -27,16 +27,7 @@ namespace Server.Spells.Fourth 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 creature && creature.IsAnimatedDead) + if (m is BaseCreature creature && creature.IsAnimatedDead) { Caster.SendLocalizedMessage(1061654); // You cannot heal that which is not alive. } diff --git a/Projects/UOContent/Spells/Fourth/Lightning.cs b/Projects/UOContent/Spells/Fourth/Lightning.cs index badf7db64..63eb3455c 100644 --- a/Projects/UOContent/Spells/Fourth/Lightning.cs +++ b/Projects/UOContent/Spells/Fourth/Lightning.cs @@ -23,16 +23,7 @@ namespace Server.Spells.Fourth 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Fourth/ManaDrain.cs b/Projects/UOContent/Spells/Fourth/ManaDrain.cs index e06997783..52bd11a8e 100644 --- a/Projects/UOContent/Spells/Fourth/ManaDrain.cs +++ b/Projects/UOContent/Spells/Fourth/ManaDrain.cs @@ -26,16 +26,7 @@ namespace Server.Spells.Fourth 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Mysticism/SpellPlagueSpell.cs b/Projects/UOContent/Spells/Mysticism/SpellPlagueSpell.cs index a5f47d3c4..a02032856 100644 --- a/Projects/UOContent/Spells/Mysticism/SpellPlagueSpell.cs +++ b/Projects/UOContent/Spells/Mysticism/SpellPlagueSpell.cs @@ -41,11 +41,7 @@ namespace Server.Spells.Mysticism public void Target(Mobile targeted) { - if (!Caster.CanSee(targeted)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (CheckHSequence(targeted)) + if (CheckHSequence(targeted)) { SpellHelper.Turn(Caster, targeted); diff --git a/Projects/UOContent/Spells/Second/Agility.cs b/Projects/UOContent/Spells/Second/Agility.cs index fbe8fa473..c7843437f 100644 --- a/Projects/UOContent/Spells/Second/Agility.cs +++ b/Projects/UOContent/Spells/Second/Agility.cs @@ -22,16 +22,7 @@ namespace Server.Spells.Second public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (CheckBSequence(m)) + if (CheckBSequence(m)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Second/Cunning.cs b/Projects/UOContent/Spells/Second/Cunning.cs index ad966c643..353ff9715 100644 --- a/Projects/UOContent/Spells/Second/Cunning.cs +++ b/Projects/UOContent/Spells/Second/Cunning.cs @@ -22,16 +22,7 @@ namespace Server.Spells.Second public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (CheckBSequence(m)) + if (CheckBSequence(m)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Second/Cure.cs b/Projects/UOContent/Spells/Second/Cure.cs index 1b0bc413e..895f9eb89 100644 --- a/Projects/UOContent/Spells/Second/Cure.cs +++ b/Projects/UOContent/Spells/Second/Cure.cs @@ -22,16 +22,7 @@ namespace Server.Spells.Second public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (CheckBSequence(m)) + if (CheckBSequence(m)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Second/Harm.cs b/Projects/UOContent/Spells/Second/Harm.cs index fd1d58adc..25735664e 100644 --- a/Projects/UOContent/Spells/Second/Harm.cs +++ b/Projects/UOContent/Spells/Second/Harm.cs @@ -23,16 +23,7 @@ namespace Server.Spells.Second 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Second/MagicTrap.cs b/Projects/UOContent/Spells/Second/MagicTrap.cs index c8b2a37ec..259cfcad0 100644 --- a/Projects/UOContent/Spells/Second/MagicTrap.cs +++ b/Projects/UOContent/Spells/Second/MagicTrap.cs @@ -27,10 +27,6 @@ namespace Server.Spells.Second { Caster.SendLocalizedMessage(502942); // You can't trap this! } - else if (!Caster.CanSee(item)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } else if (cont.TrapType != TrapType.None && cont.TrapType != TrapType.MagicTrap) { DoFizzle(); diff --git a/Projects/UOContent/Spells/Second/RemoveTrap.cs b/Projects/UOContent/Spells/Second/RemoveTrap.cs index 7ff0c0005..c684e603c 100644 --- a/Projects/UOContent/Spells/Second/RemoveTrap.cs +++ b/Projects/UOContent/Spells/Second/RemoveTrap.cs @@ -22,13 +22,9 @@ namespace Server.Spells.Second public void Target(Item item) { - if (!(item is TrappableContainer cont)) + if (item is not TrappableContainer cont) { - Caster.SendMessage("You can't disarm that"); // TODO: Localization? - } - else if (!Caster.CanSee(item)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. + Caster.SendLocalizedMessage(502373); // That doesn't appear to be trapped } else if (cont.TrapType != TrapType.None && cont.TrapType != TrapType.MagicTrap) { diff --git a/Projects/UOContent/Spells/Second/Strength.cs b/Projects/UOContent/Spells/Second/Strength.cs index 536662cbd..0896c0402 100644 --- a/Projects/UOContent/Spells/Second/Strength.cs +++ b/Projects/UOContent/Spells/Second/Strength.cs @@ -22,16 +22,7 @@ namespace Server.Spells.Second public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (CheckBSequence(m)) + if (CheckBSequence(m)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Seventh/ChainLightning.cs b/Projects/UOContent/Spells/Seventh/ChainLightning.cs index f036fab6d..7251597aa 100644 --- a/Projects/UOContent/Spells/Seventh/ChainLightning.cs +++ b/Projects/UOContent/Spells/Seventh/ChainLightning.cs @@ -28,11 +28,7 @@ namespace Server.Spells.Seventh 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); diff --git a/Projects/UOContent/Spells/Seventh/EnergyField.cs b/Projects/UOContent/Spells/Seventh/EnergyField.cs index 5bee0d18c..8e6489779 100644 --- a/Projects/UOContent/Spells/Seventh/EnergyField.cs +++ b/Projects/UOContent/Spells/Seventh/EnergyField.cs @@ -28,11 +28,7 @@ namespace Server.Spells.Seventh 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); diff --git a/Projects/UOContent/Spells/Seventh/FlameStrike.cs b/Projects/UOContent/Spells/Seventh/FlameStrike.cs index e307f9be7..6a53b053a 100644 --- a/Projects/UOContent/Spells/Seventh/FlameStrike.cs +++ b/Projects/UOContent/Spells/Seventh/FlameStrike.cs @@ -23,16 +23,7 @@ namespace Server.Spells.Seventh 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Seventh/ManaVampire.cs b/Projects/UOContent/Spells/Seventh/ManaVampire.cs index 15d99f19d..02b07b385 100644 --- a/Projects/UOContent/Spells/Seventh/ManaVampire.cs +++ b/Projects/UOContent/Spells/Seventh/ManaVampire.cs @@ -24,16 +24,7 @@ namespace Server.Spells.Seventh 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Seventh/MassDispel.cs b/Projects/UOContent/Spells/Seventh/MassDispel.cs index 8ba30654d..fad116d3d 100644 --- a/Projects/UOContent/Spells/Seventh/MassDispel.cs +++ b/Projects/UOContent/Spells/Seventh/MassDispel.cs @@ -25,11 +25,7 @@ namespace Server.Spells.Seventh 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); diff --git a/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs b/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs index 594afccc7..10e3d5530 100644 --- a/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs +++ b/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs @@ -28,11 +28,7 @@ namespace Server.Spells.Seventh 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); diff --git a/Projects/UOContent/Spells/Sixth/Dispel.cs b/Projects/UOContent/Spells/Sixth/Dispel.cs index f4cfbd8fc..b1ab2dbf3 100644 --- a/Projects/UOContent/Spells/Sixth/Dispel.cs +++ b/Projects/UOContent/Spells/Sixth/Dispel.cs @@ -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. } diff --git a/Projects/UOContent/Spells/Sixth/EnergyBolt.cs b/Projects/UOContent/Spells/Sixth/EnergyBolt.cs index 9ebcb415b..d7723204b 100644 --- a/Projects/UOContent/Spells/Sixth/EnergyBolt.cs +++ b/Projects/UOContent/Spells/Sixth/EnergyBolt.cs @@ -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; diff --git a/Projects/UOContent/Spells/Sixth/Explosion.cs b/Projects/UOContent/Spells/Sixth/Explosion.cs index 88acce5b2..16b0f69b3 100644 --- a/Projects/UOContent/Spells/Sixth/Explosion.cs +++ b/Projects/UOContent/Spells/Sixth/Explosion.cs @@ -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; diff --git a/Projects/UOContent/Spells/Sixth/Invisibility.cs b/Projects/UOContent/Spells/Sixth/Invisibility.cs index aeb42f8d0..1fd01bfcd 100644 --- a/Projects/UOContent/Spells/Sixth/Invisibility.cs +++ b/Projects/UOContent/Spells/Sixth/Invisibility.cs @@ -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! } diff --git a/Projects/UOContent/Spells/Sixth/Mark.cs b/Projects/UOContent/Spells/Sixth/Mark.cs index b35a25784..7a4fb4e36 100644 --- a/Projects/UOContent/Spells/Sixth/Mark.cs +++ b/Projects/UOContent/Spells/Sixth/Mark.cs @@ -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()) { diff --git a/Projects/UOContent/Spells/Sixth/MassCurse.cs b/Projects/UOContent/Spells/Sixth/MassCurse.cs index 375789e41..ee2e8ba38 100644 --- a/Projects/UOContent/Spells/Sixth/MassCurse.cs +++ b/Projects/UOContent/Spells/Sixth/MassCurse.cs @@ -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); diff --git a/Projects/UOContent/Spells/Sixth/ParalyzeField.cs b/Projects/UOContent/Spells/Sixth/ParalyzeField.cs index cea6f4e50..0cff8699c 100644 --- a/Projects/UOContent/Spells/Sixth/ParalyzeField.cs +++ b/Projects/UOContent/Spells/Sixth/ParalyzeField.cs @@ -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); diff --git a/Projects/UOContent/Spells/Sixth/Reveal.cs b/Projects/UOContent/Spells/Sixth/Reveal.cs index a6793b1e5..c95539c77 100644 --- a/Projects/UOContent/Spells/Sixth/Reveal.cs +++ b/Projects/UOContent/Spells/Sixth/Reveal.cs @@ -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); diff --git a/Projects/UOContent/Spells/Spellweaving/GiftOfLife.cs b/Projects/UOContent/Spells/Spellweaving/GiftOfLife.cs index 9f0b2247b..55623c555 100644 --- a/Projects/UOContent/Spells/Spellweaving/GiftOfLife.cs +++ b/Projects/UOContent/Spells/Spellweaving/GiftOfLife.cs @@ -30,15 +30,7 @@ namespace Server.Spells.Spellweaving public void Target(Mobile m) { - if (m == null) - { - Caster.SendLocalizedMessage(1072077); // You may only cast this spell on yourself or a bonded pet. - } - else if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (m.IsDeadBondedPet || !m.Alive) + if (m.IsDeadBondedPet || !m.Alive) { // As per Osi: Nothing happens. } diff --git a/Projects/UOContent/Spells/Spellweaving/GiftOfRenewal.cs b/Projects/UOContent/Spells/Spellweaving/GiftOfRenewal.cs index 5bf8db8ac..e99471fcd 100644 --- a/Projects/UOContent/Spells/Spellweaving/GiftOfRenewal.cs +++ b/Projects/UOContent/Spells/Spellweaving/GiftOfRenewal.cs @@ -26,16 +26,7 @@ namespace Server.Spells.Spellweaving public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (m_Table.ContainsKey(m)) + if (m_Table.ContainsKey(m)) { Caster.SendLocalizedMessage(501775); // This spell is already in effect. } diff --git a/Projects/UOContent/Spells/Spellweaving/WordOfDeath.cs b/Projects/UOContent/Spells/Spellweaving/WordOfDeath.cs index 7cdd76846..572b68073 100644 --- a/Projects/UOContent/Spells/Spellweaving/WordOfDeath.cs +++ b/Projects/UOContent/Spells/Spellweaving/WordOfDeath.cs @@ -18,16 +18,7 @@ namespace Server.Spells.Spellweaving 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 loc = m.Location; loc.Z += 50; diff --git a/Projects/UOContent/Spells/Third/Bless.cs b/Projects/UOContent/Spells/Third/Bless.cs index 3c694cc69..8bf3803ed 100644 --- a/Projects/UOContent/Spells/Third/Bless.cs +++ b/Projects/UOContent/Spells/Third/Bless.cs @@ -22,16 +22,7 @@ namespace Server.Spells.Third public void Target(Mobile m) { - if (m == null) - { - return; - } - - if (!Caster.CanSee(m)) - { - Caster.SendLocalizedMessage(500237); // Target can not be seen. - } - else if (CheckBSequence(m)) + if (CheckBSequence(m)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Third/Fireball.cs b/Projects/UOContent/Spells/Third/Fireball.cs index 298dc2f0a..aa5ca6941 100644 --- a/Projects/UOContent/Spells/Third/Fireball.cs +++ b/Projects/UOContent/Spells/Third/Fireball.cs @@ -22,16 +22,7 @@ namespace Server.Spells.Third 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; diff --git a/Projects/UOContent/Spells/Third/Poison.cs b/Projects/UOContent/Spells/Third/Poison.cs index 71cd43495..584d3a20e 100644 --- a/Projects/UOContent/Spells/Third/Poison.cs +++ b/Projects/UOContent/Spells/Third/Poison.cs @@ -21,16 +21,7 @@ namespace Server.Spells.Third 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)) { SpellHelper.Turn(Caster, m); diff --git a/Projects/UOContent/Spells/Third/WallOfStone.cs b/Projects/UOContent/Spells/Third/WallOfStone.cs index f0f1ec926..271455d05 100644 --- a/Projects/UOContent/Spells/Third/WallOfStone.cs +++ b/Projects/UOContent/Spells/Third/WallOfStone.cs @@ -25,11 +25,7 @@ namespace Server.Spells.Third 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);