TrueUO · TrueUO · May 11, 2024 · Apr 16, 2024 · Apr 16, 2024 · Apr 16, 2024
diff --git a/Scripts/Items/Equipment/Instruments/BaseInstrument.cs b/Scripts/Items/Equipment/Instruments/BaseInstrument.cs
@@ -260,7 +260,7 @@ public static void PickInstrument(Mobile from, InstrumentPickedCallback callback
             else
             {
                 from.SendLocalizedMessage(500617); // What instrument shall you play?
-                from.BeginTarget(1, false, TargetFlags.None, new TargetStateCallback(OnPickedInstrument), callback);
+                Timer.DelayCall(() => from.BeginTarget(1, false, TargetFlags.None, new TargetStateCallback(OnPickedInstrument), callback));
             }
         }
 

diff --git a/Scripts/Items/Equipment/Spellbooks/Spellbook.cs b/Scripts/Items/Equipment/Spellbooks/Spellbook.cs
@@ -347,9 +347,8 @@ private static void Targeted_Spell(TargetedSpellEventArgs e)
                             }
                             else if (toI != null)
                             {
-                                spell.InstantTarget = toI as IDamageableItem;
+                                spell.InstantTarget = toI as IEntity;
                             }
-
                             spell.Cast();
                         }
                     }

diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs
@@ -833,26 +833,39 @@ private static void Targeted_Skill(TargetedSkillEventArgs e)
 
             from.TargetLocked = true;
 
-            if (e.SkillID == 35)
+            if (e.SkillID == (short)SkillName.Provocation)
             {
-                AnimalTaming.DisableMessage = true;
-                AnimalTaming.DeferredTarget = false;
+                Provocation.DeferredSecondaryTarget = true;
+                InvokeTarget(e, from, target);
+                Provocation.DeferredSecondaryTarget = false;
             }
 
-            if (from.UseSkill(e.SkillID))
-            {
-                from.Target?.Invoke(from, target);
-            }
-
-            if (e.SkillID == 35)
+            else if (e.SkillID == (short)SkillName.AnimalTaming)
             {
+                AnimalTaming.DisableMessage = true;
+                AnimalTaming.DeferredTarget = false;
+                InvokeTarget(e, from, target);
                 AnimalTaming.DeferredTarget = true;
                 AnimalTaming.DisableMessage = false;
+
             }
+            else
+            {
+                InvokeTarget(e, from, target);
+            }
+
 
             from.TargetLocked = false;
         }
 
+        private static void InvokeTarget(TargetedSkillEventArgs e, Mobile from, IEntity target)
+        {
+            if (from.UseSkill(e.SkillID))
+            {
+                from.Target?.Invoke(from, target);
+            }
+        }
+
         public static void EquipMacro(EquipMacroEventArgs e)
         {
             if (e.Mobile is PlayerMobile pm && pm.Backpack != null && pm.Alive && e.List != null && e.List.Count > 0 && !pm.HasTrade)

diff --git a/Scripts/Skills/Provocation.cs b/Scripts/Skills/Provocation.cs
@@ -10,6 +10,13 @@ namespace Server.SkillHandlers
 {
     public class Provocation
     {
+        public static bool DeferredSecondaryTarget { get; set; }
+
+        static Provocation()
+        {
+            DeferredSecondaryTarget = true;
+        }
+
         public static void Initialize()
         {
             SkillInfo.Table[(int)SkillName.Provocation].Callback = OnUse;
@@ -65,7 +72,14 @@ protected override void OnTarget(Mobile from, object targeted)
                         m_Instrument.PlayInstrumentWell(from);
                         from.SendLocalizedMessage(1008085);
                         // You play your music and your target becomes angered.  Whom do you wish them to attack?
-                        from.Target = new InternalSecondTarget(from, m_Instrument, creature);
+                        if (DeferredSecondaryTarget)
+                        {
+                            Timer.DelayCall(() => from.Target = new InternalSecondTarget(from, m_Instrument, creature));
+                        }
+                        else
+                        {
+                            from.Target = new InternalSecondTarget(from, m_Instrument, creature);
+                        }
                     }
                 }
                 else

diff --git a/Scripts/Spells/Base/Spell.cs b/Scripts/Spells/Base/Spell.cs
@@ -14,7 +14,9 @@
 using Server.Targeting;
 using System;
 using System.Collections.Generic;
-using System.Reflection;
+using Server.Spells.SkillMasteries;
+
+
 #endregion
 
 namespace Server.Spells
@@ -26,7 +28,6 @@ public abstract class Spell : ISpell
         private readonly SpellInfo m_Info;
         private SpellState m_State;
         private long m_CastTime;
-        private IDamageable m_InstantTarget;
 
         public int ID => SpellRegistry.GetRegistryNumber(this);
 
@@ -40,7 +41,7 @@ public abstract class Spell : ISpell
         public Item Scroll => m_Scroll;
         public long CastTime => m_CastTime;
 
-        public IDamageable InstantTarget { get => m_InstantTarget; set => m_InstantTarget = value; }
+        public IEntity InstantTarget { get; set; }
 
         public bool Disturbed { get; set; }
 
@@ -486,7 +487,7 @@ public virtual double GetSlayerDamageScalar(Mobile defender)
 
                     if (atkSlayer != null && atkSlayer == atkSlayer.Group.Super && atkSlayer.Group != SlayerGroup.Groups[6]) //Fey Slayers give 300% damage
                         isSuper = true;
-                    else if (atkSlayer2 != null && atkSlayer2 == atkSlayer2.Group.Super && atkSlayer2.Group != SlayerGroup.Groups[6]) 
+                    else if (atkSlayer2 != null && atkSlayer2 == atkSlayer2.Group.Super && atkSlayer2.Group != SlayerGroup.Groups[6])
                         isSuper = true;
 
                     scalar = isSuper ? 2.0 : 3.0;
@@ -785,10 +786,9 @@ private void SequenceSpell()
             m_Caster.Region?.OnSpellCast(m_Caster, this);
 
             m_Caster.NextSpellTime = Core.TickCount + (int)GetCastRecovery().TotalMilliseconds;
-
             Target originalTarget = m_Caster.Target;
 
-            if (InstantTarget == null || !OnCastInstantTarget())
+            if (InstantTarget == null || !OnInstantCast(InstantTarget))
             {
                 OnCast();
             }
@@ -800,50 +800,11 @@ private void SequenceSpell()
         }
 
         #region Enhanced Client
-        public bool OnCastInstantTarget()
+        public virtual bool OnInstantCast(IEntity target)
         {
-            if (InstantTarget == null)
-                return false;
-
-            Type spellType = GetType();
-
-            Type[] types = spellType.GetNestedTypes(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-
-            Type targetType = null;
-
-            for (var index = 0; index < types.Length; index++)
-            {
-                var t = types[index];
-
-                if (t.IsSubclassOf(typeof(Target)))
-                {
-                    targetType = t;
-                    break;
-                }
-            }
-
-            if (targetType != null)
-            {
-                Target t = null;
-
-                try
-                {
-                    t = Activator.CreateInstance(targetType, this) as Target;
-                }
-                catch
-                {
-                    LogBadConstructorForInstantTarget();
-                }
-
-                if (t != null)
-                {
-                    t.Invoke(Caster, InstantTarget);
-                    return true;
-                }
-            }
-
             return false;
         }
+
         #endregion
 
         public virtual void OnBeginCast()

diff --git a/Scripts/Spells/Chivalry/CleanseByFire.cs b/Scripts/Spells/Chivalry/CleanseByFire.cs
@@ -1,3 +1,4 @@
+using Server.Spells.Bushido;
 using Server.Targeting;
 using System;
 
@@ -25,6 +26,18 @@ public override void OnCast()
             Caster.Target = new InternalTarget(this);
         }
 
+        public override bool OnInstantCast(IEntity target)
+        {
+            Target t = new InternalTarget(this);
+            if (Caster.InRange(target, t.Range) && Caster.InLOS(target))
+            {
+                t.Invoke(Caster, target);
+                return true;
+            }
+            else
+                return false;
+        }
+
         public override bool CheckDisturb(DisturbType type, bool firstCircle, bool resistable)
         {
             return true;
@@ -92,6 +105,7 @@ public void Target(Mobile m)
             FinishSequence();
         }
 
+
         private class InternalTarget : Target
         {
             private readonly CleanseByFireSpell m_Owner;

diff --git a/Scripts/Spells/Chivalry/CloseWounds.cs b/Scripts/Spells/Chivalry/CloseWounds.cs
@@ -1,5 +1,6 @@
 using Server.Mobiles;
 using Server.Network;
+
 using Server.Targeting;
 using System;
 
@@ -32,6 +33,18 @@ public override void OnCast()
             Caster.Target = new InternalTarget(this);
         }
 
+        public override bool OnInstantCast(IEntity target)
+        {
+            Target t = new InternalTarget(this);
+            if (Caster.InRange(target, t.Range) && Caster.InLOS(target))
+            {
+                t.Invoke(Caster, target);
+                return true;
+            }
+            else
+                return false;
+        }
+
         public void Target(Mobile m)
         {
             if (!Caster.InRange(m, 2))

diff --git a/Scripts/Spells/Chivalry/RemoveCurse.cs b/Scripts/Spells/Chivalry/RemoveCurse.cs
@@ -1,4 +1,5 @@
 using Server.Items;
+
 using Server.Spells.First;
 using Server.Spells.Fourth;
 using Server.Spells.Mysticism;
@@ -39,6 +40,18 @@ public override void OnCast()
             Caster.Target = new InternalTarget(this);
         }
 
+        public override bool OnInstantCast(IEntity target)
+        {
+            Target t = new InternalTarget(this);
+            if (Caster.InRange(target, t.Range) && Caster.InLOS(target))
+            {
+                t.Invoke(Caster, target);
+                return true;
+            }
+            else
+                return false;
+        }
+
         public void Target(Mobile m)
         {
             if (CheckBSequence(m))

diff --git a/Scripts/Spells/Chivalry/SacredJourney.cs b/Scripts/Spells/Chivalry/SacredJourney.cs
@@ -6,6 +6,7 @@
 using System;
 using Server.Engines.NewMagincia;
 
+
 namespace Server.Spells.Chivalry
 {
     public class SacredJourneySpell : PaladinSpell
@@ -56,6 +57,18 @@ public override void OnCast()
             }
         }
 
+        public override bool OnInstantCast(IEntity target)
+        {
+            Target t = new InternalTarget(this);
+            if (Caster.InLOS(target))
+            {
+                t.Invoke(Caster, target);
+                return true;
+            }
+            else
+                return false;
+        }
+
         public override bool CheckCast()
         {
             if (!base.CheckCast())

diff --git a/Scripts/Spells/Eighth/EnergyVortex.cs b/Scripts/Spells/Eighth/EnergyVortex.cs
@@ -1,4 +1,5 @@
 using Server.Mobiles;
+
 using Server.Targeting;
 using System;
 
@@ -40,6 +41,18 @@ public override void OnCast()
             Caster.Target = new InternalTarget(this);
         }
 
+        public override bool OnInstantCast(IEntity target)
+        {
+            Target t = new InternalTarget(this);
+            if (Caster.InRange(target, t.Range) && Caster.InLOS(target))
+            {
+                t.Invoke(Caster, target);
+                return true;
+            }
+            else
+                return false;
+        }
+
         public void Target(IPoint3D p)
         {
             Map map = Caster.Map;

diff --git a/Scripts/Spells/Eighth/Resurrection.cs b/Scripts/Spells/Eighth/Resurrection.cs
@@ -1,4 +1,5 @@
 using Server.Gumps;
+
 using Server.Targeting;
 
 namespace Server.Spells.Eighth
@@ -24,6 +25,18 @@ public override void OnCast()
             Caster.Target = new InternalTarget(this);
         }
 
+        public override bool OnInstantCast(IEntity target)
+        {
+            Target t = new InternalTarget(this);
+            if (Caster.InRange(target, t.Range) && Caster.InLOS(target))
+            {
+                t.Invoke(Caster, target);
+                return true;
+            }
+            else
+                return false;
+        }
+
         public void Target(Mobile m)
         {
             if (!Caster.CanSee(m))

diff --git a/Scripts/Spells/Fifth/BladeSpirits.cs b/Scripts/Spells/Fifth/BladeSpirits.cs
@@ -1,4 +1,5 @@
 using Server.Mobiles;
+
 using Server.Targeting;
 using System;
 
@@ -44,6 +45,18 @@ public override void OnCast()
             Caster.Target = new InternalTarget(this);
         }
 
+        public override bool OnInstantCast(IEntity target)
+        {
+            Target t = new InternalTarget(this);
+            if (Caster.InRange(target, t.Range) && Caster.InLOS(target))
+            {
+                t.Invoke(Caster, target);
+                return true;
+            }
+            else
+                return false;
+        }
+
         public void Target(IPoint3D p)
         {
             Map map = Caster.Map;