Legion Scripting

src/ClassicUO.Client/Configuration/Profile.cs

@@ -947,6 +947,9 @@ public List<Gump> ReadGumps(string path)
                                 case GumpType.DurabilityGump:
                                     gump = new DurabilitysGump();
                                     break;
+                                case GumpType.ScriptManager:
+                                    gump = new LegionScripting.ScriptManagerGump();
+                                    break;
                             }
 
                             if (gump == null)

src/ClassicUO.Client/Game/GameActions.cs

@@ -212,7 +212,7 @@ public static void OpenStatusBar()
         /// <returns>False if no status gump open</returns>
         public static bool CloseStatusBar()
         {
-            Gump g =             StatusGumpBase.GetStatusGump();
+            Gump g = StatusGumpBase.GetStatusGump();
             if (g != null)
             {
                 g.Dispose();
@@ -929,6 +929,23 @@ public static void CastSpell(int index)
             }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="name">Can be a partial match</param>
+        public static bool CastSpellByName(string name)
+        {
+            name = name.Trim();
+
+            if (!string.IsNullOrEmpty(name) && SpellDefinition.TryGetSpellFromName(name, out var spellDef))
+            {
+                CastSpell(spellDef.ID);
+                return true;
+            }
+
+            return false;
+        }
+
         public static void OpenGuildGump()
         {
             Socket.Send_GuildMenuRequest();
@@ -944,6 +961,20 @@ public static void Rename(uint serial, string name)
             Socket.Send_RenameRequest(serial, name);
         }
 
+        public static void Logout()
+        {
+            if ((World.ClientFeatures.Flags & CharacterListFlags.CLF_OWERWRITE_CONFIGURATION_BUTTON) != 0)
+            {
+                Client.Game.GetScene<GameScene>().DisconnectionRequested = true;
+                NetClient.Socket.Send_LogoutNotification();
+            }
+            else
+            {
+                NetClient.Socket.Disconnect();
+                Client.Game.SetScene(new LoginScene());
+            }
+        }
+
         public static void UseSkill(int index)
         {
             if (index >= 0)
@@ -1090,7 +1121,7 @@ public static void QuestArrow(bool rightClick)
             Socket.Send_ClickQuestArrow(rightClick);
         }
 
-        public static void GrabItem(uint serial, ushort amount, uint bag = 0)
+        public static void GrabItem(uint serial, ushort amount, uint bag = 0, bool stack = true)
         {
             //Socket.Send(new PPickUpRequest(serial, amount));
 
@@ -1115,14 +1146,24 @@ public static void GrabItem(uint serial, ushort amount, uint bag = 0)
 
             PickUp(serial, 0, 0, amount);
 
-            DropItem
-            (
-                serial,
-                0xFFFF,
-                0xFFFF,
-                0,
-                bag
-            );
+            if (stack)
+                DropItem
+                (
+                    serial,
+                    0xFFFF,
+                    0xFFFF,
+                    0,
+                    bag
+                );
+            else
+                DropItem
+                (
+                    serial,
+                    0,
+                    0,
+                    0,
+                    bag
+                );
         }
     }
 }

src/ClassicUO.Client/Game/GameObjects/PlayerMobile.cs

@@ -79,6 +79,9 @@ public PlayerMobile(uint serial) : base(serial)
         public ref Ability SecondaryAbility => ref Abilities[1];
         protected override bool IsWalking => LastStepTime > Time.Ticks - Constants.PLAYER_WALKING_DELAY;
 
+        public bool HasGump { get; set; }
+        public uint LastGumpID { get; set; }
+
         internal WalkerManager Walker { get; } = new WalkerManager();
         public Ability[] Abilities = new Ability[2]
         {

src/ClassicUO.Client/Game/Managers/CommandManager.cs

@@ -265,6 +265,19 @@ public static void Initialize()
             {
                 Task.Run(SpellDefinition.SaveAllSpellsToJson);
             });
+
+            Register("setinscreen", (s) =>
+            {
+                for (LinkedListNode<Gump> last = UIManager.Gumps.Last; last != null; last = last.Previous)
+                {
+                    Gump c = last.Value;
+
+                    if (!c.IsDisposed)
+                    {
+                        c.SetInScreen();   
+                    }
+                }
+            });
         }
 
 

src/ClassicUO.Client/Game/Managers/UIManager.cs

@@ -345,6 +345,21 @@ public static Gump GetGump(uint serial)
             return null;
         }
 
+        public static Gump GetGumpServer(uint serial)
+        {
+            for (LinkedListNode<Gump> last = Gumps.Last; last != null; last = last.Previous)
+            {
+                Control c = last.Value;
+
+                if (!c.IsDisposed && c.ServerSerial == serial)
+                {
+                    return c as Gump;
+                }
+            }
+
+            return null;
+        }
+
         public static TradingGump GetTradingGump(uint serial)
         {
             for (LinkedListNode<Gump> g = Gumps.Last; g != null; g = g.Previous)

src/ClassicUO.Client/Game/Scenes/GameScene.cs

@@ -220,6 +220,8 @@ public override void Load()
             {
                 XmlGumpHandler.TryAutoOpenByName(xml);
             }
+
+            LegionScripting.LegionScripting.Init();
         }
 
         private void ChatOnMessageReceived(object sender, MessageEventArgs e)
@@ -359,6 +361,8 @@ public override void Unload()
                 return;
             }
 
+            LegionScripting.LegionScripting.Unload();
+
             ProfileManager.CurrentProfile.GameWindowPosition = new Point(
                 Camera.Bounds.X,
                 Camera.Bounds.Y

src/ClassicUO.Client/Game/UI/Controls/Control.cs

@@ -481,9 +481,9 @@ public virtual Control SetInternalScale(double scale)
             return this;
         }
 
-        public void ForceSizeUpdate()
+        public void ForceSizeUpdate(bool onlyIfLarger = true)
         {
-            int h = Height, w = Width;
+            int h = onlyIfLarger ? Height : 0, w = onlyIfLarger ? Width : 0;
             for (int i = 0; i < Children.Count; i++)
             {
                 Control c = Children[i];

src/ClassicUO.Client/Game/UI/Controls/DataBox.cs

@@ -48,7 +48,7 @@ public DataBox(int x, int y, int w, int h)
 
         public bool ContainsByBounds { get; set; }
 
-        public void ReArrangeChildren()
+        public void ReArrangeChildren(int vspacing = 0)
         {
             for (int i = 0, height = 0; i < Children.Count; ++i)
             {
@@ -58,7 +58,7 @@ public void ReArrangeChildren()
                 {
                     c.Y = height;
 
-                    height += c.Height;
+                    height += c.Height + vspacing;
                 }
             }
 

src/ClassicUO.Client/Game/UI/Controls/ScrollArea.cs

@@ -116,6 +116,14 @@ public override void SlowUpdate()
             }
         }
 
+        public void UpdateScrollbarPosition()
+        {
+            if (_isNormalScroll)
+                _scrollBar.X = Width - 14;
+            else
+                _scrollBar.X = Width - 19;
+        }
+
         public int ScrollBarWidth()
         {
             if (_scrollBar == null)