fix: Magic NPCs now use spell range (#1870)

### Summary
- Drastically streamlines the spell targeting by collapsing the target classes into a single `SpellTarget<T>` class.
- Moves TargetRange to the spell itself so it can be used by MageAI.
- Changes range check in MageAI to use TargetRange. This should fix target acquisition bugs

Projects/UOContent/Spells/Second/Agility.cs

@@ -3,7 +3,7 @@ using Server.Targeting;
 
 namespace Server.Spells.Second
 {
-    public class AgilitySpell : MagerySpell, ISpellTargetingMobile
+    public class AgilitySpell : MagerySpell, ITargetingSpell<Mobile>
     {
         private static readonly SpellInfo _info = new(
             "Agility",
@@ -51,7 +51,7 @@ namespace Server.Spells.Second
 
         public override void OnCast()
         {
-            Caster.Target = new SpellTargetMobile(this, TargetFlags.Beneficial, Core.ML ? 10 : 12);
+            Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Beneficial);
         }
     }
 }

Projects/UOContent/Spells/Second/Cunning.cs

@@ -3,7 +3,7 @@ using Server.Targeting;
 
 namespace Server.Spells.Second
 {
-    public class CunningSpell : MagerySpell, ISpellTargetingMobile
+    public class CunningSpell : MagerySpell, ITargetingSpell<Mobile>
     {
         private static readonly SpellInfo _info = new(
             "Cunning",
@@ -51,7 +51,7 @@ namespace Server.Spells.Second
 
         public override void OnCast()
         {
-            Caster.Target = new SpellTargetMobile(this, TargetFlags.Beneficial, Core.ML ? 10 : 12);
+            Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Beneficial);
         }
     }
 }

Projects/UOContent/Spells/Second/Cure.cs

@@ -3,7 +3,7 @@ using Server.Targeting;
 
 namespace Server.Spells.Second
 {
-    public class CureSpell : MagerySpell, ISpellTargetingMobile
+    public class CureSpell : MagerySpell, ITargetingSpell<Mobile>
     {
         private static readonly SpellInfo _info = new(
             "Cure",
@@ -70,7 +70,7 @@ namespace Server.Spells.Second
 
         public override void OnCast()
         {
-            Caster.Target = new SpellTargetMobile(this, TargetFlags.Beneficial, Core.ML ? 10 : 12);
+            Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Beneficial);
         }
     }
 }

Projects/UOContent/Spells/Second/Harm.cs

@@ -2,7 +2,7 @@ using Server.Targeting;
 
 namespace Server.Spells.Second
 {
-    public class HarmSpell : MagerySpell, ISpellTargetingMobile
+    public class HarmSpell : MagerySpell, ITargetingSpell<Mobile>
     {
         private static readonly SpellInfo _info = new(
             "Harm",
@@ -75,7 +75,7 @@ namespace Server.Spells.Second
 
         public override void OnCast()
         {
-            Caster.Target = new SpellTargetMobile(this, TargetFlags.Harmful, Core.ML ? 10 : 12);
+            Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Harmful);
         }
 
         public override double GetSlayerDamageScalar(Mobile target) => 1.0;

Projects/UOContent/Spells/Second/MagicTrap.cs

@@ -2,7 +2,7 @@ using Server.Items;
 
 namespace Server.Spells.Second
 {
-    public class MagicTrapSpell : MagerySpell, ISpellTargetingItem
+    public class MagicTrapSpell : MagerySpell, ITargetingSpell<Item>
     {
         private static readonly SpellInfo _info = new(
             "Magic Trap",
@@ -82,7 +82,7 @@ namespace Server.Spells.Second
 
         public override void OnCast()
         {
-            Caster.Target = new SpellTargetItem(this, range: Core.ML ? 10 : 12);
+            Caster.Target = new SpellTarget<Item>(this);
         }
     }
 }

Projects/UOContent/Spells/Second/RemoveTrap.cs

@@ -2,7 +2,7 @@ using Server.Items;
 
 namespace Server.Spells.Second
 {
-    public class RemoveTrapSpell : MagerySpell, ISpellTargetingItem
+    public class RemoveTrapSpell : MagerySpell, ITargetingSpell<Item>
     {
         private static readonly SpellInfo _info = new(
             "Remove Trap",
@@ -52,7 +52,7 @@ namespace Server.Spells.Second
 
         public override void OnCast()
         {
-            Caster.Target = new SpellTargetItem(this, range: Core.ML ? 10 : 12);
+            Caster.Target = new SpellTarget<Item>(this);
             Caster.SendLocalizedMessage(502368);
         }
     }

Projects/UOContent/Spells/Second/Strength.cs

@@ -3,7 +3,7 @@ using Server.Targeting;
 
 namespace Server.Spells.Second
 {
-    public class StrengthSpell : MagerySpell, ISpellTargetingMobile
+    public class StrengthSpell : MagerySpell, ITargetingSpell<Mobile>
     {
         private static readonly SpellInfo _info = new(
             "Strength",
@@ -51,7 +51,7 @@ namespace Server.Spells.Second
 
         public override void OnCast()
         {
-            Caster.Target = new SpellTargetMobile(this, TargetFlags.Beneficial, Core.ML ? 10 : 12);
+            Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Beneficial);
         }
     }
 }