Fixed razor "lost/blocked target cursor" bug with script targeting

FastColoredTextBox/SyntaxHighlighter.cs

@@ -360,17 +360,17 @@ protected void InitRazorRegex()
 
             RazorCommandRegex =
                 new Regex(
-                    @"\b(attack|cast|dress|undress|dressconfig|target|targettype|targetloc|targetrelloc|dress|drop|waitfortarget|wft|dclick|dclicktype|dclickvar|usetype|useobject|droprelloc|lift|lifttype|waitforgump|gumpresponse|gumpclose|menu|menuresponse|waitformenu|promptresponse|waitforprompt|hotkey|say|msg|overhead|sysmsg|wait|pause|waitforstat|setability|setlasttarget|lasttarget|setvar|skill|useskill|walk|script|useonce|organizer|organize|org|restock|scav|scavenger|potion|clearsysmsg|clearjournal|whisper|yell|guild|alliance|emote|waitforsysmsg|wfsysmsg|clearall|virtue)\b",
+                    @"\b(attack|cast|dress|undress|dressconfig|target|targettype|targetloc|targetrelloc|dress|drop|waitfortarget|wft|dclick|dclicktype|dclickvar|usetype|useobject|droprelloc|lift|lifttype|waitforgump|gumpresponse|gumpclose|menu|menuresponse|waitformenu|promptresponse|waitforprompt|hotkey|say|msg|overhead|sysmsg|wait|pause|waitforstat|setability|setlasttarget|lasttarget|setvar|skill|useskill|walk|script|useonce|organizer|organize|org|restock|scav|scavenger|potion|clearsysmsg|clearjournal|whisper|yell|guild|alliance|emote|waitforsysmsg|wfsysmsg|clearall|virtue|rename|setskill|ignore|clearignore|poplist|pushlist|removelist|createlist|clearlist|settimer|removetimer|createtimer|settimer|removetimer|getlabel|unsetvar)\b",
                     RegexCompiledOption);
 
-            RazorLayerRegex =
+             RazorLayerRegex =
                 new Regex(
                     @"\b(RightHand|LeftHand|Shoes|Pants|Shirt|Head|Gloves|Ring|Talisman|Neck|Hair|Waist|InnerTorso|Bracelet|FacialHair|MiddleTorso|Earrings|Arms|Cloak|Backpack|OuterTorso|OuterLegs|InnerLegs|backpack|true|false|criminal|enemy|friend|friendly|grey|gray|innocent|murderer|red|blue|nonfriendly|cancel|clear)\b",
                     RegexCompiledOption);
 
             RazorExpressionRegex =
                 new Regex(
-                    @"\b(queued|position|insysmsg|insysmessage|findtype|findbuff|finddebuff|stam|maxstam|hp|maxhp|maxhits|hits|mana|maxmana|str|dex|int|poisoned|hidden|mounted|rhandempty|lhandempty|skill|count|counter|weight|dead|closest|close|rand|random|next|prev|previous|human|humanoid|monster)\b",
+                    @"\b(queued|position|insysmsg|insysmessage|findtype|findbuff|finddebuff|stam|maxstam|hp|maxhp|maxhits|hits|mana|maxmana|str|dex|int|poisoned|hidden|mounted|rhandempty|lhandempty|skill|count|counter|weight|dead|closest|close|rand|random|next|prev|previous|human|humanoid|monster|findlayer|dead|find|counttype|listexists|list|inlist|timer|timerexists|followers|hue|name|maxweight|diffweight|diffhits|diffstam|diffmana|paralyzed|invul|noto|dead|gumpexists|ingump|targetexists|counttype)\b",
                     RegexCompiledOption);
         }
 

Razor/Agents/BuyAgent.cs

@@ -29,6 +29,9 @@ namespace Assistant.Agents
 {
     public class BuyAgent : Agent
     {
+        // For Outlands user don not have to have money in backpack
+        private static bool EnableGoldCheck = false;
+
         public class BuyEntry
         {
             public BuyEntry(ushort id, ushort amount)
@@ -136,14 +139,11 @@ private static void DisplayBuy(PacketReader p, PacketHandlerEventArgs args)
             {
                 return;
             }
-
-            pack.Contains.Sort(ItemXYComparer.Instance);
-
+
             int total = 0;
             int cost = 0;
             List<VendorBuyItem> buyList = new List<VendorBuyItem>();
             Dictionary<ushort, int> found = new Dictionary<ushort, int>();
-            bool lowGoldWarn = false;
             for (int i = 0; i < pack.Contains.Count; i++)
             {
                 Item item = (Item) pack.Contains[i];
@@ -221,9 +221,8 @@ private static void DisplayBuy(PacketReader p, PacketHandlerEventArgs args)
                 }
             }
 
-            if (cost > World.Player.Gold && cost < 2000 && buyList.Count > 0)
+            if (cost > World.Player.Gold && cost > 2000 && buyList.Count > 0 && !EnableGoldCheck)
             {
-                lowGoldWarn = true;
                 do
                 {
                     VendorBuyItem vbi = (VendorBuyItem) buyList[0];
@@ -250,18 +249,14 @@ private static void DisplayBuy(PacketReader p, PacketHandlerEventArgs args)
                 } while (cost > World.Player.Gold && buyList.Count > 0);
             }
 
-            if (buyList.Count > 0)
-            {
-                args.Block = true;
-                BuyLists[serial] = buyList;
-                Client.Instance.SendToServer(new VendorBuyResponse(serial, buyList));
-                World.Player.SendMessage(MsgLevel.Force, LocString.BuyTotals, total, cost);
-            }
+            if (buyList.Count <= 0)
+                return;
+
+            args.Block = true;
+            BuyLists[serial] = buyList;
+            Client.Instance.SendToServer(new VendorBuyResponse(serial, buyList));
+            World.Player.SendMessage(MsgLevel.Force, LocString.BuyTotals, total, cost);
 
-            if (lowGoldWarn)
-            {
-                World.Player.SendMessage(MsgLevel.Force, LocString.BuyLowGold);
-            }
         }
 
         private static readonly Dictionary<uint, List<VendorBuyItem>> BuyLists = new Dictionary<uint, List<VendorBuyItem>>();
@@ -281,7 +276,6 @@ private static void ExtBuyInfo(PacketReader p, PacketHandlerEventArgs args)
                     "Buy Agent Warning: Contains Count {0} does not match ExtInfo {1}.", pack.Contains.Count, count);
             }
 
-            pack.Contains.Sort(ItemXYComparer.Instance);
 
             for (int i = count - 1; i >= 0; i--)
             {
@@ -471,7 +465,7 @@ public void Add(BuyEntry entry)
         {
             m_Items?.Add(entry);
 
-            m_SubList?.Items.Add(entry);
+           Engine.MainWindow.SafeAction(_ => m_SubList?.Items.Add(entry));
 
             World.Player?.SendMessage(MsgLevel.Force, LocString.ItemAdded);
         }

Razor/Agents/IgnoreAgent.cs

@@ -22,6 +22,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using System.Xml;
+using Assistant.Core;
 using Assistant.UI;
 
 namespace Assistant.Agents
@@ -33,6 +34,21 @@ public class IgnoreAgent : Agent
         public static void Initialize()
         {
             Agent.Add(Instance = new IgnoreAgent());
+
+            MessageManager.OnMobileMessage += HandleMobileMessage;
+        }
+
+        public static void HandleMobileMessage(Packet p, PacketHandlerEventArgs args, Serial source, ushort graphic,
+                                 MessageType type, ushort hue, ushort font, string lang, string sourceName,
+                                 string text)
+        {
+            if (Instance == null)
+                return;
+
+            if (Instance.IsSerialIgnored(source))
+            {
+                args.Block = true;
+            }
         }
 
         public static bool IsIgnored(Serial ser)
@@ -55,8 +71,6 @@ public IgnoreAgent()
 
             HotKey.Add(HKCategory.Targets, LocString.AddToIgnore, new HotKeyCallback(AddToIgnoreList));
             HotKey.Add(HKCategory.Targets, LocString.RemoveFromIgnore, new HotKeyCallback(RemoveFromIgnoreList));
-
-            Agent.OnMobileCreated += new MobileCreatedEventHandler(OPLCheckIgnore);
         }
 
         public override void Clear()
@@ -167,18 +181,6 @@ public override void OnButtonPress(int num)
                     if (MessageBox.Show(Language.GetString(LocString.Confirm), Language.GetString(LocString.ClearList),
                             MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                     {
-                        foreach (Serial s in m_Chars)
-                        {
-                            Mobile m = World.FindMobile(s);
-                            if (m != null)
-                            {
-                                if (m.ObjPropList.Remove(Language.GetString(LocString.RazorIgnored)))
-                                {
-                                    m.OPLChanged();
-                                }
-                            }
-                        }
-
                         m_Chars.Clear();
                         m_SubList.Items.Clear();
                     }
@@ -195,14 +197,6 @@ public override void OnButtonPress(int num)
             }
         }
 
-        private void OPLCheckIgnore(Mobile m)
-        {
-            if (IsIgnored(m.Serial))
-            {
-                m.ObjPropList.Add(Language.GetString(LocString.RazorIgnored));
-            }
-        }
-
         private void OnAddTarget(bool location, Serial serial, Point3D loc, ushort gfx)
         {
             Engine.MainWindow.SafeAction(s => s.ShowMe());
@@ -215,13 +209,6 @@ private void OnAddTarget(bool location, Serial serial, Point3D loc, ushort gfx)
                     m_Chars.Add(serial);
 
                     Add2List(serial);
-
-                    Mobile m = World.FindMobile(serial);
-                    if (m != null)
-                    {
-                        m.ObjPropList.Add(Language.GetString(LocString.RazorIgnored));
-                        m.OPLChanged();
-                    }
                 }
             }
         }
@@ -273,15 +260,6 @@ private void OnRemoveTarget(bool location, Serial serial, Point3D loc, ushort gf
                 }
 
                 m_SubList.EndUpdate();
-
-                Mobile m = World.FindMobile(serial);
-                if (m != null)
-                {
-                    if (m.ObjPropList.Remove(Language.GetString(LocString.RazorIgnored)))
-                    {
-                        m.OPLChanged();
-                    }
-                }
             }
         }
 

Razor/Agents/OrganizerAgent.cs

@@ -65,16 +65,6 @@ public OrganizerAgent(int num)
                 $"{Language.GetString(LocString.SetOrganizerHB)}-{Number:D2}",
                 new HotKeyCallback(SetHotBag));
             PacketHandler.RegisterClientToServerViewer(0x09, new PacketViewerCallback(OnSingleClick));
-
-            Agent.OnItemCreated += new ItemCreatedEventHandler(CheckContOPL);
-        }
-
-        public void CheckContOPL(Item item)
-        {
-            if (item.Serial == m_Cont)
-            {
-                item.ObjPropList.Add(Language.Format(LocString.OrganizerHBA1, Number));
-            }
         }
 
         private void OnSingleClick(PacketReader pvSrc, PacketHandlerEventArgs args)
@@ -170,13 +160,6 @@ public override void OnButtonPress(int num)
                     if (MessageBox.Show(Language.GetString(LocString.Confirm), Language.GetString(LocString.ClearList),
                             MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                     {
-                        Item bag = World.FindItem(m_Cont);
-                        if (bag != null)
-                        {
-                            bag.ObjPropList.Remove(Language.Format(LocString.OrganizerHBA1, Number));
-                            bag.OPLChanged();
-                        }
-
                         m_SubList.Items.Clear();
                         m_Items.Clear();
                         m_Cont = 0;
@@ -305,13 +288,6 @@ private void OnTargetBag(bool location, Serial serial, Point3D loc, ushort gfx)
 
             if (!location && serial > 0 && serial <= 0x7FFFFF00)
             {
-                Item bag = World.FindItem(m_Cont);
-                if (bag != null && bag.ObjPropList != null)
-                {
-                    bag.ObjPropList.Remove(Language.Format(LocString.OrganizerHBA1, Number));
-                    bag.OPLChanged();
-                }
-
                 m_Cont = serial;
                 if (m_BagBTN != null)
                 {
@@ -322,13 +298,6 @@ private void OnTargetBag(bool location, Serial serial, Point3D loc, ushort gfx)
                 {
                     World.Player.SendMessage(MsgLevel.Force, LocString.ContSet);
                 }
-
-                bag = World.FindItem(m_Cont);
-                if (bag != null && bag.ObjPropList != null)
-                {
-                    bag.ObjPropList.Add(Language.Format(LocString.OrganizerHBA1, Number));
-                    bag.OPLChanged();
-                }
             }
         }
 

Razor/Agents/RestockAgent.cs

@@ -65,16 +65,6 @@ public RestockAgent(int num)
                 $"{Language.GetString(LocString.SetRestockHB)}-{Number:D2}",
                 new HotKeyCallback(SetHB));
             PacketHandler.RegisterClientToServerViewer(0x09, new PacketViewerCallback(OnSingleClick));
-
-            Agent.OnItemCreated += new ItemCreatedEventHandler(CheckHBOPL);
-        }
-
-        public void CheckHBOPL(Item item)
-        {
-            if (item.Serial == m_HotBag)
-            {
-                item.ObjPropList.Add(Language.Format(LocString.RestockHBA1, Number));
-            }
         }
 
         private void OnSingleClick(PacketReader pvSrc, PacketHandlerEventArgs args)
@@ -247,15 +237,6 @@ private void OnHBTarget(bool location, Serial serial, Point3D loc, ushort gfx)
         {
             Engine.MainWindow.SafeAction(s => s.ShowMe());
 
-            Item hb = World.FindItem(m_HotBag);
-            if (hb != null)
-            {
-                if (hb.ObjPropList.Remove(Language.Format(LocString.RestockHBA1, Number)))
-                {
-                    hb.OPLChanged();
-                }
-            }
-
             if (!location && serial.IsItem)
             {
                 m_HotBag = serial;
@@ -265,13 +246,6 @@ private void OnHBTarget(bool location, Serial serial, Point3D loc, ushort gfx)
                 m_HotBag = Serial.Zero;
             }
 
-            hb = World.FindItem(m_HotBag);
-            if (hb != null)
-            {
-                hb.ObjPropList.Add(Language.Format(LocString.RestockHBA1, Number));
-                hb.OPLChanged();
-            }
-
             SetHBText();
         }
 
@@ -416,7 +390,7 @@ private void OnItemTarget(bool location, Serial serial, Point3D loc, ushort gfx)
                 gfx = item.ItemID;
             }
 
-            if (gfx == 0 || gfx >= 0x4000)
+            if (gfx == 0)
             {
                 return;
             }
@@ -446,7 +420,7 @@ public void Add(RestockItem item)
             }
 
             m_Items.Add(item);
-            m_SubList.Items.Add(item);
+            Engine.MainWindow.SafeAction(m => m_SubList.Items.Add(item));
 
             World.Player?.SendMessage(MsgLevel.Force, LocString.ItemAdded);
         }

Razor/Agents/ScavengerAgent.cs

@@ -63,8 +63,6 @@ public ScavengerAgent()
             HotKey.Add(HKCategory.Agents, LocString.ScavengerAddTarget, new HotKeyCallback(OnAddToHotBag));
 
             PacketHandler.RegisterClientToServerViewer(0x09, new PacketViewerCallback(OnSingleClick));
-
-            Agent.OnItemCreated += new ItemCreatedEventHandler(CheckBagOPL);
         }
 
         public void ToggleEnabled()
@@ -113,14 +111,6 @@ public void OnSetHotBag()
             Targeting.OneTimeTarget(new Targeting.TargetResponseCallback(OnTargetBag));
         }
 
-        private void CheckBagOPL(Item item)
-        {
-            if (item.Serial == m_Bag)
-            {
-                item.ObjPropList.Add(Language.GetString(LocString.ScavengerHB));
-            }
-        }
-
         private void OnSingleClick(PacketReader pvSrc, PacketHandlerEventArgs args)
         {
             Serial serial = pvSrc.ReadUInt32();
@@ -288,20 +278,8 @@ private void OnTargetBag(bool location, Serial serial, Point3D loc, ushort gfx)
                 m_BagRef = World.FindItem(m_Bag);
             }
 
-            if (m_BagRef != null)
-            {
-                m_BagRef.ObjPropList.Remove(Language.GetString(LocString.ScavengerHB));
-                m_BagRef.OPLChanged();
-            }
-
             DebugLog("Set bag to {0}", serial);
             m_Bag = serial;
-            m_BagRef = World.FindItem(m_Bag);
-            if (m_BagRef != null)
-            {
-                m_BagRef.ObjPropList.Add(Language.GetString(LocString.ScavengerHB));
-                m_BagRef.OPLChanged();
-            }
 
             World.Player.SendMessage(MsgLevel.Force, LocString.ContSet, m_Bag);
         }