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

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

Browse source 
### 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
This commit is contained in:
Kamron Batman 2024-08-08 07:05:27 -07:00 • committed by GitHub
parent 91e37fb8d4
commit 9b7fea2c20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
85 changed files with 255 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Spells/Fifth/BladeSpirits.cs
View file

@ -3,7 +3,7 @@ using Server.Mobiles;
namespace Server.Spells.Fifth
{
public class BladeSpiritsSpell : MagerySpell, ISpellTargetingPoint3D
public class BladeSpiritsSpell : MagerySpell, ITargetingSpell<IPoint3D>
{
private static readonly SpellInfo _info = new(
"Blade Spirits",
@ -78,7 +78,7 @@ namespace Server.Spells.Fifth
public override void OnCast()
{
Caster.Target = new SpellTargetPoint3D(this, retryOnLOS: true);
Caster.Target = new SpellTarget<IPoint3D>(this, retryOnLos: true);
}
}
}

4
Projects/UOContent/Spells/Fifth/DispelField.cs
View file

@ -3,7 +3,7 @@ using Server.Misc;
namespace Server.Spells.Fifth
{
public class DispelFieldSpell : MagerySpell, ISpellTargetingItem
public class DispelFieldSpell : MagerySpell, ITargetingSpell<Item>
{
private static readonly SpellInfo _info = new(
"Dispel Field",
@ -51,7 +51,7 @@ namespace Server.Spells.Fifth
public override void OnCast()
{
Caster.Target = new SpellTargetItem(this, range: Core.ML ? 10 : 12);
Caster.Target = new SpellTarget<Item>(this);
}
}
}

4
Projects/UOContent/Spells/Fifth/MindBlast.cs
View file

@ -3,7 +3,7 @@ using Server.Targeting;
namespace Server.Spells.Fifth
{
public class MindBlastSpell : MagerySpell, ISpellTargetingMobile
public class MindBlastSpell : MagerySpell, ITargetingSpell<Mobile>
{
private static readonly SpellInfo _info = new(
"Mind Blast",
@ -110,7 +110,7 @@ namespace Server.Spells.Fifth
public override void OnCast()
{
Caster.Target = new SpellTargetMobile(this, TargetFlags.Harmful, Core.ML ? 10 : 12);
Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Harmful);
}
private void AosDelay_Callback(Mobile caster, Mobile target, Mobile defender, int damage)

4
Projects/UOContent/Spells/Fifth/Paralyze.cs
View file

@ -5,7 +5,7 @@ using Server.Targeting;
namespace Server.Spells.Fifth
{
public class ParalyzeSpell : MagerySpell, ISpellTargetingMobile
public class ParalyzeSpell : MagerySpell, ITargetingSpell<Mobile>
{
private static readonly SpellInfo _info = new(
"Paralyze",
@ -82,7 +82,7 @@ namespace Server.Spells.Fifth
public override void OnCast()
{
Caster.Target = new SpellTargetMobile(this, TargetFlags.Harmful, Core.ML ? 10 : 12);
Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Harmful);
}
}
}

4
Projects/UOContent/Spells/Fifth/PoisonField.cs
View file

@ -7,7 +7,7 @@ using Server.Mobiles;
namespace Server.Spells.Fifth;
public class PoisonFieldSpell : MagerySpell, ISpellTargetingPoint3D
public class PoisonFieldSpell : MagerySpell, ITargetingSpell<IPoint3D>
{
private static readonly SpellInfo _info = new(
"Poison Field",
@ -57,7 +57,7 @@ public class PoisonFieldSpell : MagerySpell, ISpellTargetingPoint3D
public override void OnCast()
{
Caster.Target = new SpellTargetPoint3D(this, range: Core.ML ? 10 : 12);
Caster.Target = new SpellTarget<IPoint3D>(this);
}
}