Unstable 0.1500.0.0

2021-08-26 21:08:21 +09:00
parent 265a2e7ab3
commit 501e02c026
245 changed files with 9775 additions and 2034 deletions
@@ -163,6 +163,7 @@ namespace Barotrauma
        public static ScalableFont SubHeadingFont => Style?.SubHeadingFont;
        public static ScalableFont DigitalFont => Style?.DigitalFont;
        public static ScalableFont HotkeyFont => Style?.HotkeyFont;
+        public static ScalableFont MonospacedFont => Style?.MonospacedFont;

        public static ScalableFont CJKFont { get; private set; }

@@ -306,7 +307,7 @@ namespace Barotrauma
            });
            
            SubmarineIcon = new Sprite("Content/UI/MainIconsAtlas.png", new Rectangle(452, 385, 182, 81), new Vector2(0.5f, 0.5f));
-            arrow = new Sprite("Content/UI/MainIconsAtlas.png", new Rectangle(392, 393, 49, 45), new Vector2(0.5f, 0.5f));
+            arrow = new Sprite("Content/UI/MainIconsAtlas.png", new Rectangle(393, 393, 49, 45), new Vector2(0.5f, 0.5f));
            SpeechBubbleIcon = new Sprite("Content/UI/MainIconsAtlas.png", new Rectangle(385, 449, 66, 60), new Vector2(0.5f, 0.5f));
            BrokenIcon = new Sprite("Content/UI/MainIconsAtlas.png", new Rectangle(898, 386, 123, 123), new Vector2(0.5f, 0.5f));
        }
@@ -672,6 +673,12 @@ namespace Barotrauma
                    spriteBatch.End();
                    spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: SamplerStateClamp, rasterizerState: GameMain.ScissorTestEnable);

+                    if (GameMain.GameSession?.CrewManager is { DraggedOrder: { SymbolSprite: { } orderSprite, Color: var color }, DragOrder: true })
+                    {
+                        float spriteSize = Math.Max(orderSprite.size.X, orderSprite.size.Y);
+                        orderSprite.Draw(spriteBatch, PlayerInput.LatestMousePosition, color, orderSprite.size / 2f, scale: 32f / spriteSize * Scale);
+                    }
+
                    var sprite = MouseCursorSprites[(int)MouseCursor] ?? MouseCursorSprites[(int)CursorState.Default];
                    sprite.Draw(spriteBatch, PlayerInput.LatestMousePosition, Color.White, sprite.Origin, 0f, Scale / 1.5f);

@@ -927,13 +934,14 @@ namespace Barotrauma
                GUIComponent prevMouseOn = MouseOn;
                MouseOn = null;
                int inventoryIndex = -1;
-            
-                if (Inventory.IsMouseOnInventory())
+
+                Inventory.RefreshMouseOnInventory();
+                if (Inventory.IsMouseOnInventory)
                {
                    inventoryIndex = updateList.IndexOf(CharacterHUD.HUDFrame);
                }

-                if (!PlayerInput.PrimaryMouseButtonHeld() && !PlayerInput.PrimaryMouseButtonClicked())
+                if ((!PlayerInput.PrimaryMouseButtonHeld() && !PlayerInput.PrimaryMouseButtonClicked()) || prevMouseOn == null)
                {
                    for (var i = updateList.Count - 1; i > inventoryIndex; i--)
                    {
@@ -941,10 +949,9 @@ namespace Barotrauma
                        if (!c.CanBeFocused) { continue; }
                        if (c.MouseRect.Contains(PlayerInput.MousePosition))
                        {
-                            if ((!PlayerInput.PrimaryMouseButtonHeld() && !PlayerInput.PrimaryMouseButtonClicked()) || c == prevMouseOn)
+                            if ((!PlayerInput.PrimaryMouseButtonHeld() && !PlayerInput.PrimaryMouseButtonClicked()) || c == prevMouseOn || prevMouseOn == null)
                            {
                                MouseOn = c;
-                                var sakdjfnsjkd = c.MouseRect;
                            }
                            break;
                        }
@@ -958,7 +965,6 @@ namespace Barotrauma
                MouseCursor = UpdateMouseCursorState(MouseOn);
                return MouseOn;
            }
-            
        }
        
        private static CursorState UpdateMouseCursorState(GUIComponent c)
@@ -1050,7 +1056,7 @@ namespace Barotrauma
                    {
                        if (listBox.DraggedElement != null) { return CursorState.Dragging; }
                        if (listBox.CanDragElements) { return CursorState.Move; }
-                    
+
                        var hoverParent = c;
                        while (true)
                        {
@@ -1059,14 +1065,14 @@ namespace Barotrauma
                            hoverParent = hoverParent.Parent;
                        }
                    }
-                
+
                    if (parent != null && parent.CanBeFocused)
                    {
                        if (!parent.Rect.Equals(monitorRect)) { return parent.HoverCursor; }
                    }
                }
-            
-                if (Inventory.IsMouseOnInventory()) { return Inventory.GetInventoryMouseCursor(); }
+
+                if (Inventory.IsMouseOnInventory) { return Inventory.GetInventoryMouseCursor(); }

                var character = Character.Controlled;
                // ReSharper disable once InvertIf
@@ -1343,7 +1349,7 @@ namespace Barotrauma

        /// <param name="createOffset">Should the indicator move based on the camera position?</param>
        /// <param name="overrideAlpha">Override the distance-based alpha value with the specified alpha value</param>
-        public static void DrawIndicator(SpriteBatch spriteBatch, in Vector2 worldPosition, Camera cam, in Vector2 visibleRange, Sprite sprite, in Color color,
+        public static void DrawIndicator(SpriteBatch spriteBatch, in Vector2 worldPosition, Camera cam, in Range<float> visibleRange, Sprite sprite, in Color color,
            bool createOffset = true, float scaleMultiplier = 1.0f, float? overrideAlpha = null)
        {
            Vector2 diff = worldPosition - cam.WorldViewCenter;
@@ -1351,9 +1357,9 @@ namespace Barotrauma

            float symbolScale = Math.Min(64.0f / sprite.size.X, 1.0f) * scaleMultiplier * Scale;

-            if (overrideAlpha.HasValue || (dist > visibleRange.X && dist < visibleRange.Y))
+            if (overrideAlpha.HasValue || (dist > visibleRange.Start && dist < visibleRange.End))
            {
-                float alpha = overrideAlpha ?? MathUtils.Min((dist - visibleRange.X) / 100.0f, 1.0f - ((dist - visibleRange.Y + 100f) / 100.0f), 1.0f);
+                float alpha = overrideAlpha ?? MathUtils.Min((dist - visibleRange.Start) / 100.0f, 1.0f - ((dist - visibleRange.End + 100f) / 100.0f), 1.0f);
                Vector2 targetScreenPos = cam.WorldToScreen(worldPosition);

                if (!createOffset)
@@ -1417,7 +1423,7 @@ namespace Barotrauma
        public static void DrawIndicator(SpriteBatch spriteBatch, Vector2 worldPosition, Camera cam, float hideDist, Sprite sprite, Color color,
            bool createOffset = true, float scaleMultiplier = 1.0f, float? overrideAlpha = null)
        {
-            DrawIndicator(spriteBatch, worldPosition, cam, new Vector2(hideDist, float.PositiveInfinity), sprite, color, createOffset, scaleMultiplier, overrideAlpha);
+            DrawIndicator(spriteBatch, worldPosition, cam, new Range<float>(hideDist, float.PositiveInfinity), sprite, color, createOffset, scaleMultiplier, overrideAlpha);
        }

        public static void DrawLine(SpriteBatch sb, Vector2 start, Vector2 end, Color clr, float depth = 0.0f, float width = 1)
@@ -1520,6 +1526,11 @@ namespace Barotrauma
            }
        }

+        public static void DrawFilledRectangle(SpriteBatch sb, RectangleF rect, Color clr, float depth = 0.0f)
+        {
+            DrawFilledRectangle(sb, rect.Location, rect.Size, clr, depth);
+        }
+
        public static void DrawFilledRectangle(SpriteBatch sb, Vector2 start, Vector2 size, Color clr, float depth = 0.0f)
        {
            if (size.X < 0)
@@ -52,13 +52,13 @@ namespace Barotrauma

        public GUIComponent GetChild(int index)
        {
-            if (index < 0 || index >= CountChildren) return null;
+            if (index < 0 || index >= CountChildren) { return null; }
            return RectTransform.GetChild(index).GUIComponent;
        }

        public int GetChildIndex(GUIComponent child)
        {
-            if (child == null) return -1;
+            if (child == null) { return -1; }
            return RectTransform.GetChildIndex(child.RectTransform);
        }

@@ -66,7 +66,7 @@ namespace Barotrauma
        {
            foreach (GUIComponent child in Children)
            {
-                if (child.UserData == obj || (child.userData != null && child.userData.Equals(obj))) return child;
+                if (child.UserData == obj || (child.userData != null && child.userData.Equals(obj))) { return child; }
            }
            return null;
        }
@@ -175,6 +175,8 @@ namespace Barotrauma

        public bool GlowOnSelect { get; set; }

+        public Vector2 UVOffset { get; set; }
+
        private CoroutineHandle pulsateCoroutine;

        protected Color flashColor;
@@ -256,9 +258,9 @@ namespace Barotrauma

        protected Rectangle ClampRect(Rectangle r)
        {
-            if (Parent == null || !ClampMouseRectToParent) return r;
+            if (Parent == null || !ClampMouseRectToParent) { return r; }
            Rectangle parentRect = Parent.ClampRect(Parent.Rect);
-            if (parentRect.Width <= 0 || parentRect.Height <= 0) return Rectangle.Empty;
+            if (parentRect.Width <= 0 || parentRect.Height <= 0) { return Rectangle.Empty; }
            if (parentRect.X > r.X)
            {
                int diff = parentRect.X - r.X;
@@ -281,7 +283,7 @@ namespace Barotrauma
                int diff = (r.Y + r.Height) - (parentRect.Y + parentRect.Height);
                r.Height -= diff;
            }
-            if (r.Width <= 0 || r.Height <= 0) return Rectangle.Empty;
+            if (r.Width <= 0 || r.Height <= 0) { return Rectangle.Empty; }
            return r;
        }

@@ -295,7 +297,7 @@ namespace Barotrauma
        {
            get
            {
-                if (!CanBeFocused) return Rectangle.Empty;
+                if (!CanBeFocused) { return Rectangle.Empty; }
                return ClampMouseRectToParent ? ClampRect(Rect) : Rect;
            }
        }
@@ -431,7 +433,7 @@ namespace Barotrauma
        #region Updating
        public virtual void AddToGUIUpdateList(bool ignoreChildren = false, int order = 0)
        {
-            if (!Visible) return;
+            if (!Visible) { return; }

            UpdateOrder = order;
            GUI.AddToUpdateList(this);
@@ -463,7 +465,7 @@ namespace Barotrauma
        /// </summary>
        public void UpdateManually(float deltaTime, bool alsoChildren = false, bool recursive = true)
        {
-            if (!Visible) return;
+            if (!Visible) { return; }

            AutoUpdate = false;
            Update(deltaTime);
@@ -475,7 +477,7 @@ namespace Barotrauma

        protected virtual void Update(float deltaTime)
        {
-            if (!Visible) return;
+            if (!Visible) { return; }
            
            if (CanBeFocused && OnSecondaryClicked != null)
            {
@@ -555,7 +557,7 @@ namespace Barotrauma
        /// </summary>
        public virtual void DrawManually(SpriteBatch spriteBatch, bool alsoChildren = false, bool recursive = true)
        {
-            if (!Visible) return;
+            if (!Visible) { return; }

            AutoDraw = false;
            Draw(spriteBatch);
@@ -598,7 +600,7 @@ namespace Barotrauma

        protected virtual void Draw(SpriteBatch spriteBatch)
        {
-            if (!Visible) return;
+            if (!Visible) { return; }
            var rect = Rect;

            GetBlendedColor(GetColor(State), ref _currentColor);
@@ -653,7 +655,7 @@ namespace Barotrauma
                                ? MathUtils.InverseLerp(0, SpriteCrossFadeTime, ToolBox.GetEasing(uiSprite.TransitionMode, spriteFadeTimer)) : 0;
                            if (alphaMultiplier > 0)
                            {
-                                uiSprite.Draw(spriteBatch, rect, previousColor * alphaMultiplier, SpriteEffects);
+                                uiSprite.Draw(spriteBatch, rect, previousColor * alphaMultiplier, SpriteEffects, uvOffset: UVOffset);
                            }
                        }
                    }
@@ -667,7 +669,11 @@ namespace Barotrauma
                            ? MathUtils.InverseLerp(SpriteCrossFadeTime, 0, ToolBox.GetEasing(uiSprite.TransitionMode, spriteFadeTimer)) : (_currentColor.A / 255.0f);
                        if (alphaMultiplier > 0)
                        {
-                            uiSprite.Draw(spriteBatch, rect, _currentColor * alphaMultiplier, SpriteEffects);
+                            //  * (rect.Location.Y - PlayerInput.MousePosition.Y) / rect.Height
+                            Vector2 offset = new Vector2(
+                                MathUtils.PositiveModulo((int)-UVOffset.X, uiSprite.Sprite.SourceRect.Width),
+                                MathUtils.PositiveModulo((int)-UVOffset.Y, uiSprite.Sprite.SourceRect.Height));
+                            uiSprite.Draw(spriteBatch, rect, _currentColor * alphaMultiplier, SpriteEffects, uvOffset: offset);
                        }
                    }
                }
@@ -708,7 +714,7 @@ namespace Barotrauma
        /// </summary>
        public void DrawToolTip(SpriteBatch spriteBatch)
        {
-            if (!Visible) return;
+            if (!Visible) { return; }
            DrawToolTip(spriteBatch, ToolTip, GUI.MouseOn.Rect, TooltipRichTextData);
        }
        
@@ -1048,7 +1054,7 @@ namespace Barotrauma
                {
                    case "language":
                        string[] languages = element.GetAttributeStringArray(attribute.Name.ToString(), new string[0]);
-                        if (!languages.Any(l => GameMain.Config.Language.ToLower() == l.ToLower())) { return false; }
+                        if (!languages.Any(l => GameMain.Config.Language.Equals(l, StringComparison.OrdinalIgnoreCase))) { return false; }
                        break;
                    case "gameversion":
                        var version = new Version(attribute.Value);
@@ -1213,8 +1219,7 @@ namespace Barotrauma

        private static GUIImage LoadGUIImage(XElement element, RectTransform parent)
        {
-            Sprite sprite = null;
-
+            Sprite sprite;
            string url = element.GetAttributeString("url", "");
            if (!string.IsNullOrEmpty(url))
            {
@@ -28,7 +28,7 @@ namespace Barotrauma

            if (OutlineColor != Color.Transparent)
            {
-                GUI.DrawRectangle(spriteBatch, Rect, OutlineColor * (OutlineColor.A/255.0f), false, thickness: OutlineThickness);
+                GUI.DrawRectangle(spriteBatch, Rect, OutlineColor, false, thickness: OutlineThickness);
            }
        }
    }
@@ -33,7 +33,7 @@ namespace Barotrauma
        public GUIFrame Content { get; private set; }
        public GUIScrollBar ScrollBar { get; private set; }

-        private Dictionary<GUIComponent, bool> childVisible = new Dictionary<GUIComponent, bool>();
+        private readonly Dictionary<GUIComponent, bool> childVisible = new Dictionary<GUIComponent, bool>();
  
        private int totalSize;
        private bool childrenNeedsRecalculation;
@@ -224,7 +224,7 @@ namespace Barotrauma
            {
                if (value == false && canDragElements && draggedElement != null)
                {
-                    draggedElement = null;
+                    DraggedElement = null;
                }
                canDragElements = value;
            }
@@ -233,8 +233,21 @@ namespace Barotrauma
        private GUIComponent draggedElement;
        private Rectangle draggedReferenceRectangle;
        private Point draggedReferenceOffset;
+        public bool HasDraggedElementIndexChanged { get; private set; }

-        public GUIComponent DraggedElement => draggedElement;
+        public GUIComponent DraggedElement
+        {
+            get
+            {
+                return draggedElement;
+            }
+            set
+            {
+                if (value == draggedElement) { return; }
+                draggedElement = value;
+                HasDraggedElementIndexChanged = false;
+            }
+        }
        
        private readonly bool isHorizontal;

@@ -472,7 +485,7 @@ namespace Barotrauma
                if (!PlayerInput.PrimaryMouseButtonHeld())
                {
                    OnRearranged?.Invoke(this, draggedElement.UserData);
-                    draggedElement = null;
+                    DraggedElement = null;
                    RepositionChildren();
                }
                else
@@ -518,6 +531,7 @@ namespace Barotrauma
                    if (currIndex != index)
                    {
                        draggedElement.RectTransform.RepositionChildInHierarchy(currIndex);
+                        HasDraggedElementIndexChanged = true;
                    }

                    return;
@@ -577,7 +591,7 @@ namespace Barotrauma

                    if (CanDragElements && PlayerInput.PrimaryMouseButtonDown() && GUI.MouseOn == child)
                    {
-                        draggedElement = child;
+                        DraggedElement = child;
                        draggedReferenceRectangle = child.Rect;
                        draggedReferenceOffset = child.RectTransform.AbsoluteOffset;
                    }
@@ -750,7 +764,7 @@ namespace Barotrauma
                } 
            }
            
-            if ((GUI.IsMouseOn(this) || GUI.IsMouseOn(ScrollBar)) && AllowMouseWheelScroll && PlayerInput.ScrollWheelSpeed != 0)
+            if (PlayerInput.ScrollWheelSpeed != 0 && AllowMouseWheelScroll && (FindScrollableParentListBox(GUI.MouseOn) == this || GUI.IsMouseOn(ScrollBar)))
            {
                if (SmoothScroll)
                {
@@ -773,7 +787,6 @@ namespace Barotrauma
                    ScrollBar.BarScroll -= (PlayerInput.ScrollWheelSpeed / 500.0f) * BarSize;
                }
            }
-            

            ScrollBar.Enabled = ScrollBarEnabled && BarSize < 1.0f;
            if (AutoHideScrollBar)
@@ -785,6 +798,13 @@ namespace Barotrauma
                UpdateDimensions();
            }
        }
+        
+        private static GUIListBox FindScrollableParentListBox(GUIComponent target)
+        {
+            if (target is GUIListBox listBox && listBox.ScrollBarEnabled && listBox.BarSize < 1.0f) { return listBox; }
+            if (target?.Parent == null) { return null; }
+            return FindScrollableParentListBox(target.Parent);
+        }

        public void SelectNext(bool force = false, bool autoScroll = true, bool takeKeyBoardFocus = false)
        {
@@ -982,7 +1002,7 @@ namespace Barotrauma
            if (child == null) { return; }
            child.RectTransform.Parent = null;
            if (selected.Contains(child)) { selected.Remove(child); }
-            if (draggedElement == child) { draggedElement = null; }
+            if (draggedElement == child) { DraggedElement = null; }
            UpdateScrollBarSize();
        }

@@ -0,0 +1,87 @@
+using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace Barotrauma
+{
+    public class GUIScissorComponent: GUIComponent
+    {
+        public GUIComponent Content;
+
+        public GUIScissorComponent(RectTransform rectT) : base(null, rectT)
+        {
+            Content = new GUIFrame(new RectTransform(Vector2.One, rectT), style: null)
+            {
+                CanBeFocused = false
+            };
+        }
+
+        protected override void Update(float deltaTime)
+        {
+            base.Update(deltaTime);
+
+            foreach (GUIComponent child in Children)
+            {
+                if (child == Content) { continue; }
+                throw new InvalidOperationException($"Children were found in {nameof(GUIScissorComponent)}, Add them to {nameof(GUIScissorComponent)}.{nameof(Content)} instead.");
+            }
+
+            ClampChildMouseRects(Content);
+        }
+
+        protected override void Draw(SpriteBatch spriteBatch)
+        {
+            if (!Visible) { return; }
+
+            Rectangle prevScissorRect = spriteBatch.GraphicsDevice.ScissorRectangle;
+            RasterizerState prevRasterizerState = spriteBatch.GraphicsDevice.RasterizerState;
+
+            spriteBatch.End();
+            spriteBatch.GraphicsDevice.ScissorRectangle = Rectangle.Intersect(prevScissorRect, Rect);
+            spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
+
+            foreach (GUIComponent child in Content.Children)
+            {
+                if (!child.Visible) { continue; }
+                child.DrawManually(spriteBatch, alsoChildren: true, recursive: true);
+            }
+
+            spriteBatch.End();
+            spriteBatch.GraphicsDevice.ScissorRectangle = prevScissorRect;
+            spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: prevRasterizerState);
+        }
+
+        private void ClampChildMouseRects(GUIComponent child)
+        {
+            child.ClampMouseRectToParent = true;
+
+            if (child is GUIListBox) { return; }
+
+            foreach (GUIComponent grandChild in child.Children)
+            {
+                ClampChildMouseRects(grandChild);
+            }
+        }
+
+        public override void AddToGUIUpdateList(bool ignoreChildren = false, int order = 0)
+        {
+            if (!Visible) { return; }
+
+            UpdateOrder = order;
+            GUI.AddToUpdateList(this);
+
+            if (ignoreChildren)
+            {
+                OnAddedToGUIUpdateList?.Invoke(this);
+                return;
+            }
+
+            foreach (GUIComponent child in Content.Children)
+            {
+                if (!child.Visible) { continue; }
+                child.AddToGUIUpdateList(false, order);
+            }
+            OnAddedToGUIUpdateList?.Invoke(this);
+        }
+    }
+}
@@ -25,6 +25,7 @@ namespace Barotrauma
        public ScalableFont SubHeadingFont { get; private set; }
        public ScalableFont DigitalFont { get; private set; }
        public ScalableFont HotkeyFont { get; private set; }
+        public ScalableFont MonospacedFont { get; private set; }

        public Dictionary<ScalableFont, bool> ForceFontUpperCase
        {
@@ -40,11 +41,16 @@ namespace Barotrauma
        public SpriteSheet SavingIndicator { get; private set; }

        public UISprite UIGlow { get; private set; }
+
+        public UISprite PingCircle { get; private set; }
+
        public UISprite UIGlowCircular { get; private set; }

        public UISprite ButtonPulse { get; private set; }

        public SpriteSheet FocusIndicator { get; private set; }
+        
+        public UISprite IconOverflowIndicator { get; private set; }

        /// <summary>
        /// General green color used for elements whose colors are set from code
@@ -235,6 +241,9 @@ namespace Barotrauma
                    case "uiglow":
                        UIGlow = new UISprite(subElement);
                        break;
+                    case "pingcircle":
+                        PingCircle = new UISprite(subElement);
+                        break;
                    case "radiation":
                        RadiationSprite = new UISprite(subElement);
                        break;
@@ -247,6 +256,9 @@ namespace Barotrauma
                    case "endroundbuttonpulse":
                        ButtonPulse = new UISprite(subElement);
                        break;
+                    case "iconoverflowindicator":
+                        IconOverflowIndicator = new UISprite(subElement);
+                        break;
                    case "focusindicator":
                        FocusIndicator = new SpriteSheet(subElement);
                        break;
@@ -277,6 +289,10 @@ namespace Barotrauma
                        DigitalFont = LoadFont(subElement, graphicsDevice);
                        ForceFontUpperCase[DigitalFont] = subElement.GetAttributeBool("forceuppercase", false);
                        break;
+                    case "monospacedfont":
+                        MonospacedFont = LoadFont(subElement, graphicsDevice);
+                        ForceFontUpperCase[MonospacedFont] = subElement.GetAttributeBool("forceuppercase", false);
+                        break;
                    case "hotkeyfont":
                        HotkeyFont = LoadFont(subElement, graphicsDevice);
                        ForceFontUpperCase[HotkeyFont] = subElement.GetAttributeBool("forceuppercase", false);
@@ -185,7 +185,7 @@ namespace Barotrauma
            if (GUI.MouseOn != null) { return false; }

            //don't close when hovering over an inventory element
-            if (Inventory.IsMouseOnInventory()) { return false; }
+            if (Inventory.IsMouseOnInventory) { return false; }
            
            bool input = PlayerInput.PrimaryMouseButtonDown() || PlayerInput.SecondaryMouseButtonClicked();
            return input && !rect.Contains(PlayerInput.MousePosition);
@@ -193,7 +193,7 @@ namespace Barotrauma
                    if (LoadState == 100.0f)
                    {
 #if DEBUG
-                        if (GameMain.Config.AutomaticQuickStartEnabled || GameMain.Config.AutomaticCampaignLoadEnabled && GameMain.FirstLoad)
+                        if (GameMain.Config.AutomaticQuickStartEnabled || GameMain.Config.AutomaticCampaignLoadEnabled || GameMain.Config.TestScreenEnabled && GameMain.FirstLoad)
                        {
                            loadText = "QUICKSTARTING ...";
                        }
@@ -55,14 +55,47 @@ namespace Barotrauma
            var texture = GetTexture(spriteBatch);

            for (var i = 0; i < points.Count - 1; i++)
-                DrawPolygonEdge(spriteBatch, texture, points[i] + offset, points[i + 1] + offset, color, thickness);
+                DrawPolygonEdge(spriteBatch, points[i] + offset, points[i + 1] + offset, color, thickness);

-            DrawPolygonEdge(spriteBatch, texture, points[points.Count - 1] + offset, points[0] + offset, color,
+            DrawPolygonEdge(spriteBatch, points[points.Count - 1] + offset, points[0] + offset, color,
                thickness);
        }
+        
+        /// <summary>
+        ///     Draws a closed polygon from an array of points
+        /// </summary>
+        public static void DrawPolygonInner(this SpriteBatch spriteBatch, Vector2 offset, IReadOnlyList<Vector2> points, Color color, float thickness = 1f)
+        {
+            if (points.Count == 0) { return; }

-        private static void DrawPolygonEdge(SpriteBatch spriteBatch, Texture2D texture, Vector2 point1, Vector2 point2,
-            Color color, float thickness)
+            if (points.Count == 1)
+            {
+                DrawPoint(spriteBatch, points[0], color, (int)thickness);
+                return;
+            }
+
+            for (var i = 0; i < points.Count - 1; i++)
+            {
+                Vector2 point1 = points[i] + offset, 
+                        point2 = points[i + 1] + offset;
+
+                DrawPolygonEdgeInner(spriteBatch, point1, point2, color, thickness);
+            }
+
+            DrawPolygonEdgeInner(spriteBatch, points[^1] + offset, points[0] + offset, color, thickness);
+        }
+
+        private static void DrawPolygonEdgeInner(SpriteBatch spriteBatch, Vector2 point1, Vector2 point2, Color color, float thickness)
+        {
+            var length = Vector2.Distance(point1, point2) + thickness;
+            var angle = (float)Math.Atan2(point2.Y - point1.Y, point2.X - point1.X);
+            var scale = new Vector2(length, thickness);
+            Vector2 middle = new Vector2((point1.X + point2.X) / 2f, (point1.Y + point2.Y) / 2f);
+            Texture2D tex = GetTexture(spriteBatch);
+            spriteBatch.Draw(GetTexture(spriteBatch), middle, null, color, angle, new Vector2(tex.Width / 2f, tex.Height / 2f), scale, SpriteEffects.None, 0);
+        }
+
+        private static void DrawPolygonEdge(SpriteBatch spriteBatch, Vector2 point1, Vector2 point2, Color color, float thickness)
        {
            var length = Vector2.Distance(point1, point2);
            var angle = (float)Math.Atan2(point2.Y - point1.Y, point2.X - point1.X);
@@ -37,7 +37,7 @@ namespace Barotrauma
        private Color storeSpecialColor;

        private GUIListBox shoppingCrateBuyList, shoppingCrateSellList, shoppingCrateSellFromSubList;
-        private GUITextBlock shoppingCrateTotal;
+        private GUITextBlock relevantBalanceName, shoppingCrateTotal;
        private GUIButton clearAllButton, confirmButton;

        private bool needsRefresh, needsBuyingRefresh, needsSellingRefresh, needsItemsToSellRefresh, needsSellingFromSubRefresh, needsItemsToSellFromSubRefresh;
@@ -58,7 +58,6 @@ namespace Barotrauma
            StoreTab.SellFromSub => false,
            _ => throw new NotImplementedException()
        };
-        private bool IsSelling => !IsBuying;
        private GUIListBox ActiveShoppingCrateList => activeTab switch
        {
            StoreTab.Buy => shoppingCrateBuyList,
@@ -222,16 +221,8 @@ namespace Barotrauma
                TextScale = 1.1f,
                TextGetter = () =>
                {
-                    if (CurrentLocation != null)
-                    {
-                        merchantBalanceBlock.TextColor = CurrentLocation.BalanceColor;
-                        return GetCurrencyFormatted(CurrentLocation.StoreCurrentBalance);
-                    }
-                    else
-                    {
-                        merchantBalanceBlock.TextColor = Color.Red;
-                        return GetCurrencyFormatted(0);
-                    }
+                    merchantBalanceBlock.TextColor = CurrentLocation?.BalanceColor ?? Color.Red;
+                    return GetMerchantBalanceText();
                } 
            };

@@ -375,28 +366,37 @@ namespace Barotrauma
            //don't show categories with no buyable items
            itemCategories.RemoveAll(c => !ItemPrefab.Prefabs.Any(ep => ep.Category.HasFlag(c) && ep.CanBeBought));
            itemCategoryButtons.Clear();
+            var categoryButton = new GUIButton(new RectTransform(new Point(categoryButtonContainer.Rect.Width, categoryButtonContainer.Rect.Width), categoryButtonContainer.RectTransform), style: "CategoryButton.All")
+            {
+                ToolTip = TextManager.Get("MapEntityCategory.All"),
+                OnClicked = OnClickedCategoryButton
+            };
+            itemCategoryButtons.Add(categoryButton);
            foreach (MapEntityCategory category in itemCategories)
            {
-                var categoryButton = new GUIButton(new RectTransform(new Point(categoryButtonContainer.Rect.Width, categoryButtonContainer.Rect.Width), categoryButtonContainer.RectTransform),
+                categoryButton = new GUIButton(new RectTransform(new Point(categoryButtonContainer.Rect.Width, categoryButtonContainer.Rect.Width), categoryButtonContainer.RectTransform),
                    style: "CategoryButton." + category)
                {
                    ToolTip = TextManager.Get("MapEntityCategory." + category),
                    UserData = category,
-                    OnClicked = (btn, userdata) =>
-                    {
-                        MapEntityCategory? newCategory = !btn.Selected ? (MapEntityCategory?)userdata : null;
-                        if (newCategory.HasValue) { searchBox.Text = ""; }
-                        if (newCategory != selectedItemCategory) { tabLists[activeTab].ScrollBar.BarScroll = 0f; }
-                        FilterStoreItems(newCategory, searchBox.Text);
-                        return true;
-                    }
+                    OnClicked = OnClickedCategoryButton
                };
                itemCategoryButtons.Add(categoryButton);
-                categoryButton.RectTransform.SizeChanged += () =>
+            }
+            bool OnClickedCategoryButton(GUIButton button, object userData)
+            {
+                MapEntityCategory? newCategory = !button.Selected ? (MapEntityCategory?)userData : null;
+                if (newCategory.HasValue) { searchBox.Text = ""; }
+                if (newCategory != selectedItemCategory) { tabLists[activeTab].ScrollBar.BarScroll = 0f; }
+                FilterStoreItems(newCategory, searchBox.Text);
+                return true;
+            }
+            foreach (var btn in itemCategoryButtons)
+            {
+                btn.RectTransform.SizeChanged += () =>
                {
-                    var sprite = categoryButton.Frame.sprites[GUIComponent.ComponentState.None].First();
-                    categoryButton.RectTransform.NonScaledSize =
-                        new Point(categoryButton.Rect.Width, (int)(categoryButton.Rect.Width * ((float)sprite.Sprite.SourceRect.Height / sprite.Sprite.SourceRect.Width)));
+                    var sprite = btn.Frame.sprites[GUIComponent.ComponentState.None].First();
+                    btn.RectTransform.NonScaledSize = new Point(btn.Rect.Width, (int)(btn.Rect.Width * ((float)sprite.Sprite.SourceRect.Height / sprite.Sprite.SourceRect.Width)));
                };
            }

@@ -503,11 +503,11 @@ namespace Barotrauma
                ForceUpperCase = true
            };
            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), playerBalanceContainer.RectTransform),
-                "", font: GUI.SubHeadingFont, textAlignment: Alignment.TopRight)
+                "", textColor: Color.White, font: GUI.SubHeadingFont, textAlignment: Alignment.TopRight)
            {
                AutoScaleVertical = true,
                TextScale = 1.1f,
-                TextGetter = () => GetCurrencyFormatted(PlayerMoney)
+                TextGetter = GetPlayerBalanceText
            };

            // Divider ------------------------------------------------
@@ -523,7 +523,7 @@ namespace Barotrauma
                RelativeSpacing = 0.015f,
                Stretch = true
            };
-            var shoppingCrateListContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.85f), shoppingCrateInventoryContainer.RectTransform), style: null);
+            var shoppingCrateListContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.8f), shoppingCrateInventoryContainer.RectTransform), style: null);
            shoppingCrateBuyList = new GUIListBox(new RectTransform(Vector2.One, shoppingCrateListContainer.RectTransform)) { Visible = false };
            shoppingCrateSellList = new GUIListBox(new RectTransform(Vector2.One, shoppingCrateListContainer.RectTransform)) { Visible = false };
            if (GameMain.IsSingleplayer)
@@ -531,6 +531,21 @@ namespace Barotrauma
                shoppingCrateSellFromSubList = new GUIListBox(new RectTransform(Vector2.One, shoppingCrateListContainer.RectTransform)) { Visible = false };
            }

+            var relevantBalanceContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.05f), shoppingCrateInventoryContainer.RectTransform), isHorizontal: true)
+            {
+                Stretch = true
+            };
+            relevantBalanceName = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), relevantBalanceContainer.RectTransform), "", font: GUI.Font)
+            {
+                CanBeFocused = false
+            };
+            new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), relevantBalanceContainer.RectTransform), "", textColor: Color.White, font: GUI.SubHeadingFont, textAlignment: Alignment.Right)
+            {
+                CanBeFocused = false,
+                TextScale = 1.1f,
+                TextGetter = () => IsBuying ? GetPlayerBalanceText() : GetMerchantBalanceText()
+            };
+
            var totalContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.05f), shoppingCrateInventoryContainer.RectTransform), isHorizontal: true)
            {
                Stretch = true
@@ -576,6 +591,10 @@ namespace Barotrauma
            resolutionWhenCreated = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
        }

+        private string GetMerchantBalanceText() => GetCurrencyFormatted(CurrentLocation?.StoreCurrentBalance ?? 0);
+
+        private string GetPlayerBalanceText() => GetCurrencyFormatted(PlayerMoney);
+
        private GUILayoutGroup CreateDealsGroup(GUIListBox parentList)
        {
            var elementHeight = (int)(GUI.yScale * 80);
@@ -604,17 +623,14 @@ namespace Barotrauma
            {
                prevLocation.Reputation.OnReputationValueChanged = null;
            }
-
-            foreach (ItemPrefab itemPrefab in ItemPrefab.Prefabs)
+            if (ItemPrefab.Prefabs.Any(p => p.CanBeBoughtAtLocation(CurrentLocation, out PriceInfo _)))
            {
-                if (itemPrefab.CanBeBoughtAtLocation(CurrentLocation, out PriceInfo _))
+                selectedItemCategory = null;
+                searchBox.Text = "";
+                ChangeStoreTab(StoreTab.Buy);
+                if (newLocation?.Reputation != null)
                {
-                    ChangeStoreTab(StoreTab.Buy);
-                    if (newLocation?.Reputation != null)
-                    {
-                        newLocation.Reputation.OnReputationValueChanged += () => { needsRefresh = true; };
-                    }
-                    return;
+                    newLocation.Reputation.OnReputationValueChanged += () => { needsRefresh = true; };
                }
            }
        }
@@ -628,6 +644,7 @@ namespace Barotrauma
                tabButton.Selected = (StoreTab)tabButton.UserData == activeTab;
            }
            sortingDropDown.SelectItem(tabSortingMethods[tab]);
+            relevantBalanceName.Text = IsBuying ? TextManager.Get("campaignstore.balance") : TextManager.Get("campaignstore.storebalance");
            SetShoppingCrateTotalText();
            SetClearAllButtonStatus();
            SetConfirmButtonBehavior();
@@ -697,7 +714,7 @@ namespace Barotrauma
            }
            foreach (GUIButton btn in itemCategoryButtons)
            {
-                btn.Selected = category.HasValue && (MapEntityCategory)btn.UserData == selectedItemCategory;
+                btn.Selected = (MapEntityCategory?)btn.UserData == selectedItemCategory;
            }
            list.UpdateScrollBarSize();
        }
@@ -18,7 +18,7 @@ namespace Barotrauma
        private static UISprite spectateIcon, disconnectedIcon;
        private static Sprite ownerIcon, moderatorIcon;

-        private enum InfoFrameTab { Crew, Mission, Reputation, MyCharacter, Traitor, Submarine };
+        private enum InfoFrameTab { Crew, Mission, Reputation, MyCharacter, Traitor, Submarine, Talents };
        private static InfoFrameTab selectedTab;
        private GUIFrame infoFrame, contentFrame;

@@ -258,6 +258,8 @@ namespace Barotrauma
            {
                var myCharacterButton = createTabButton(InfoFrameTab.MyCharacter, "tabmenu.character");
            }
+
+            var talentsButton = createTabButton(InfoFrameTab.Talents, "tabmenu.talents");
        }

        private bool SelectInfoFrameTab(GUIButton button, object userData)
@@ -296,6 +298,9 @@ namespace Barotrauma
                case InfoFrameTab.Submarine:
                    CreateSubmarineInfo(infoFrameHolder, Submarine.MainSub);
                    break;
+                case InfoFrameTab.Talents:
+                    CreateTalentInfo(infoFrameHolder);
+                    break;
            }

            return true;
@@ -1159,5 +1164,319 @@ namespace Barotrauma
                sub.Info.CreateSpecsWindow(specsListBox, GUI.Font, includeTitle: false, includeClass: false, includeDescription: true);
            }
        }
+        private Color unselectedColor = new Color(240, 255, 255, 225);
+        private Color selectedColor = new Color(220, 255, 220, 225);
+        private Color ownedColor = new Color(140, 180, 140, 225);
+        private Color unselectableColor = new Color(100, 100, 100, 225);
+        private Color pressedColor = new Color(60, 60, 60, 225);
+
+        private readonly List<(GUIButton button, GUIImage background, GUIImage icon)> talentButtons = new List<(GUIButton button, GUIImage background, GUIImage icon)>();
+        private List<string> selectedTalents = new List<string>();
+        private GUITextBlock talentTitleText;
+        private GUITextBlock talentDescriptionText;
+        private GUITextBlock talentPointsText;
+
+        private GUITextBlock experienceText;
+        private Color experienceBackgroundColor = new Color(255, 255, 255, 155);
+
+        private GUIProgressBar experienceBar;
+
+        private void CreateTalentInfo(GUIFrame infoFrame)
+        {
+            infoFrame.ClearChildren();
+            talentButtons.Clear();
+
+            GUIFrame talentFrameBackground = new GUIFrame(new RectTransform(Vector2.One, infoFrame.RectTransform, Anchor.TopCenter), style: "GUIFrameListBox");
+            int padding = GUI.IntScale(15);
+            GUIFrame talentFrameContent = new GUIFrame(new RectTransform(new Point(talentFrameBackground.Rect.Width - padding, talentFrameBackground.Rect.Height - padding), infoFrame.RectTransform, Anchor.Center), style: null);
+
+            Character controlledCharacter = Character.Controlled;
+
+            if (controlledCharacter.Info == null)
+            {
+                DebugConsole.ThrowError("No character info found for talent UI");
+                return;
+            }
+
+            selectedTalents = controlledCharacter.Info.UnlockedTalents.ToList();
+
+            GUILayoutGroup talentFrameLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), talentFrameContent.RectTransform, anchor: Anchor.Center), childAnchor: Anchor.TopCenter)
+            {
+                AbsoluteSpacing = GUI.IntScale(5)
+            };
+
+            GUILayoutGroup talentInfoLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.325f), talentFrameLayoutGroup.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter);
+
+            GUIFrame talentTitleFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.25f), talentInfoLayoutGroup.RectTransform, Anchor.TopCenter), style: null);
+
+            talentTitleText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), talentTitleFrame.RectTransform, Anchor.TopLeft), "", font: GUI.LargeFont);
+            talentPointsText = new GUITextBlock(new RectTransform(new Vector2(0.25f, 1.0f), talentTitleFrame.RectTransform, Anchor.TopRight), "", font: GUI.Font, textAlignment: Alignment.Center);
+
+            GUIFrame talentDescriptionFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.4f), talentInfoLayoutGroup.RectTransform, Anchor.TopCenter), style: null);
+
+            talentDescriptionText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), talentDescriptionFrame.RectTransform, Anchor.TopLeft), "", font: GUI.Font, textAlignment: Alignment.TopLeft, wrap: true);
+
+            GUIFrame characterInfoFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.3f), talentInfoLayoutGroup.RectTransform, Anchor.TopLeft), style: null);
+            GUILayoutGroup characterInfoColumn = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), characterInfoFrame.RectTransform, anchor: Anchor.TopLeft), childAnchor: Anchor.TopLeft, isHorizontal: true);
+
+            CreateCharacterSheet(characterInfoColumn);
+
+            if (!TalentTree.JobTalentTrees.TryGetValue(controlledCharacter.Info.Job.Prefab.Identifier, out TalentTree talentTree)) { return; }
+
+            GUIListBox talentTreeListBox = new GUIListBox(new RectTransform(new Vector2(1f, 0.6f), talentFrameLayoutGroup.RectTransform, Anchor.TopCenter), isHorizontal: true, style: null);
+
+            int spacing = GUI.IntScale(5);
+
+            foreach (var subTree in talentTree.TalentSubTrees)
+            {
+                GUIFrame subTreeFrame = new GUIFrame(new RectTransform(new Vector2(0.333f, 1f), talentTreeListBox.Content.RectTransform, anchor: Anchor.TopLeft), style: null);
+                GUILayoutGroup subTreeLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1f, 1f), subTreeFrame.RectTransform, Anchor.Center), false, childAnchor: Anchor.TopCenter);
+
+                GUIFrame subtreeTitleFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.111f), subTreeLayoutGroup.RectTransform, anchor: Anchor.TopCenter), style: "SubtreeHeader");
+
+                new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), subtreeTitleFrame.RectTransform, anchor: Anchor.TopCenter), subTree.Identifier, font: GUI.LargeFont, textAlignment: Alignment.Center);
+
+                for (int i = 0; i < 4; i++)
+                {
+                    GUIFrame talentOptionFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.222f), subTreeLayoutGroup.RectTransform, anchor: Anchor.TopCenter), style: "TalentOptionFrame");
+                    GUIImage talentBackground = new GUIImage(new RectTransform(Vector2.One, talentOptionFrame.RectTransform, anchor: Anchor.Center), style: "TalentBackground")
+                    {
+                        CanBeFocused = false,
+                        Color = unselectableColor,
+                    };
+
+                    if (subTree.TalentOptionStages.Count > i)
+                    {
+                        TalentOption talentOption = subTree.TalentOptionStages[i];
+
+                        GUILayoutGroup talentOptionLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1f, 1f), talentOptionFrame.RectTransform, Anchor.CenterLeft), isHorizontal: true, childAnchor: Anchor.CenterLeft)
+                        {
+                            Stretch = true,
+                        };
+
+                        foreach (Talent talent in talentOption.Talents)
+                        {
+                            int optionPadding = GUI.IntScale(10);
+                            GUIFrame talentFrame = new GUIFrame(new RectTransform(new Point(talentOptionFrame.Rect.Width, talentOptionFrame.Rect.Height - optionPadding), talentOptionLayoutGroup.RectTransform), style: null)
+                            {
+                                CanBeFocused = false,
+                            };
+                            new GUIImage(new RectTransform(Vector2.One, talentFrame.RectTransform, anchor: Anchor.Center), style: "TalentFrameBackground")
+                            {
+                                CanBeFocused = false,
+                            };
+                            GUIImage iconImage = null;
+
+                            GUIButton talentButton = new GUIButton(new RectTransform(Vector2.One, talentFrame.RectTransform, anchor: Anchor.Center), style: "TalentFrame")
+                            {
+                                ToolTip = $"{TextManager.Get("talentname." + talent.Identifier, returnNull: true) ?? talent.Identifier} \n\n{TextManager.Get("talentdescription." + talent.Identifier, returnNull: true) ?? string.Empty}",
+                                UserData = talent.Identifier,
+                                PressedColor = pressedColor,
+                                OnClicked = (button, userData) =>
+                                {
+                                    talentTitleText.Text = TextManager.Get("talentname." + talent.Identifier, returnNull: true) ?? string.Empty;
+                                    talentDescriptionText.Text = TextManager.Get("talentdescription." + talent.Identifier, returnNull: true) ?? string.Empty;
+
+                                    // deselect other buttons in tier by removing their selected talents from pool
+                                    foreach (GUIButton guiButton in talentOptionLayoutGroup.GetAllChildren<GUIButton>())
+                                    {
+                                        if (guiButton.UserData is string otherTalentIdentifier && guiButton != button)
+                                        {
+                                            if (!controlledCharacter.HasTalent(otherTalentIdentifier))
+                                            {
+                                                selectedTalents.Remove(otherTalentIdentifier);
+                                            }
+                                        }
+                                    }
+                                    string talentIdentifier = userData as string;
+
+                                    if (TalentTree.IsViableTalentForCharacter(controlledCharacter, talentIdentifier, selectedTalents))
+                                    {
+                                        if (!selectedTalents.Contains(talentIdentifier))
+                                        {
+                                            selectedTalents.Add(talentIdentifier);
+                                        }
+                                    }
+                                    else if (!controlledCharacter.HasTalent(talentIdentifier))
+                                    {
+                                        selectedTalents.Remove(talentIdentifier);
+                                    }
+
+                                    UpdateTalentButtons();
+                                    return true;
+                                },
+                            };
+
+
+                            int iconPadding = GUI.IntScale(15);
+                            iconImage = new GUIImage(new RectTransform(new Point(talentFrame.Rect.Width - iconPadding, talentFrame.Rect.Height - iconPadding), talentFrame.RectTransform, anchor: Anchor.Center), sprite: talent.Icon, scaleToFit: true)
+                            {
+                                PressedColor = unselectableColor,
+                                CanBeFocused = false,
+                            };
+
+                            talentButtons.Add((talentButton, talentBackground, iconImage));
+                        }
+                    }
+                }
+            }
+
+            GUIFrame talentBottomFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.07f), talentFrameLayoutGroup.RectTransform, Anchor.TopCenter), style: null);
+
+            GUIFrame experienceBarFrame = new GUIFrame(new RectTransform(new Vector2(0.775f, 0.75f), talentBottomFrame.RectTransform, Anchor.TopCenter), style: null);
+
+            experienceBar = new GUIProgressBar(new RectTransform(new Vector2(1f, 1f), experienceBarFrame.RectTransform, Anchor.CenterLeft),
+                barSize: controlledCharacter.Info.GetProgressTowardsNextLevel(), color: Color.White, style: "ExperienceBar")
+            {
+                IsHorizontal = true
+            };
+
+            GUIImage experienceTextBackground = new GUIImage(new RectTransform(new Vector2(0.2f, 0.475f), experienceBarFrame.RectTransform, anchor: Anchor.Center), style: "ExperienceTextBackground");
+
+            experienceText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), experienceTextBackground.RectTransform, anchor: Anchor.Center), "", font: GUI.Font, textColor: Color.White, textAlignment: Alignment.Center);
+
+            new GUIButton(new RectTransform(new Vector2(0.1f, 0.3f), talentBottomFrame.RectTransform, anchor: Anchor.TopRight), text: TextManager.Get("applysettingsbutton"))
+            {
+                OnClicked = ApplyTalentSelection,
+            };
+
+            new GUIButton(new RectTransform(new Vector2(0.1f, 0.3f), talentBottomFrame.RectTransform, anchor: Anchor.TopLeft), text: TextManager.Get("reset"))
+            {
+                OnClicked = ResetTalentSelection,
+            };
+
+            UpdateTalentButtons();
+        }
+
+        private void UpdateTalentButtons()
+        {
+            Character controlledCharacter = Character.Controlled;
+
+            talentPointsText.Text = $"{TextManager.Get("talentpointsleft")}{controlledCharacter.Info.GetAvailableTalentPoints()}";
+            experienceText.Text = $"{controlledCharacter.Info.ExperiencePoints - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()} / {controlledCharacter.Info.GetExperienceRequiredToLevelUp() - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()}";
+            experienceBar.BarSize = controlledCharacter.Info.GetProgressTowardsNextLevel();
+            //experienceBar.ToolTip = $"{controlledCharacter.Info.ExperiencePoints - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()} / {controlledCharacter.Info.GetExperienceRequiredToLevelUp() - controlledCharacter.Info.GetExperienceRequiredForCurrentLevel()}";
+
+            selectedTalents = TalentTree.CheckTalentSelection(controlledCharacter, selectedTalents);
+
+            foreach (var talentButton in talentButtons)
+            {
+                talentButton.background.Color = unselectableColor;
+            }
+
+            foreach (var talentButton in talentButtons)
+            {
+                string talentIdentifier = talentButton.button.UserData as string;
+                bool unselectable = !TalentTree.IsViableTalentForCharacter(controlledCharacter, talentIdentifier, selectedTalents) || controlledCharacter.HasTalent(talentIdentifier);
+                Color newTalentColor = unselectable ? unselectableColor : unselectedColor;
+
+                if (controlledCharacter.HasTalent(talentIdentifier))
+                {
+                    newTalentColor = ownedColor;
+                }
+                else if (selectedTalents.Contains(talentIdentifier))
+                {
+                    newTalentColor = selectedColor;
+                }
+
+                talentButton.button.Color = newTalentColor;
+                talentButton.button.SelectedColor = newTalentColor;
+                talentButton.button.HoverColor = newTalentColor;
+                talentButton.button.DisabledColor = newTalentColor;
+
+                talentButton.icon.Color = newTalentColor;
+
+                // update background color as well, if not defined yet
+                if (talentButton.background.Color == unselectableColor)
+                {
+                    talentButton.background.Color = newTalentColor;
+                }
+            }
+        }
+
+
+        private void ApplyTalents(Character controlledCharacter)
+        {
+            selectedTalents = TalentTree.CheckTalentSelection(controlledCharacter, selectedTalents);
+            foreach (string talent in selectedTalents)
+            {
+                controlledCharacter.GiveTalent(talent);
+                if (GameMain.Client != null)
+                {
+                    GameMain.Client.CreateEntityEvent(controlledCharacter, new object[] { NetEntityEvent.Type.UpdateTalents });
+                }
+            }
+            UpdateTalentButtons();
+        }
+
+        private bool ApplyTalentSelection(GUIButton guiButton, object userData)
+        {
+            Character controlledCharacter = Character.Controlled;
+            ApplyTalents(controlledCharacter);
+            return true;
+        }
+
+        private bool ResetTalentSelection(GUIButton guiButton, object userData)
+        {
+            Character controlledCharacter = Character.Controlled;
+            selectedTalents = controlledCharacter.Info.UnlockedTalents.ToList();
+            UpdateTalentButtons();
+            return true;
+        }
+
+        public void OnExperienceChanged(Character character)
+        {
+            if (character != Character.Controlled) { return; }
+            UpdateTalentButtons();
+        }
+
+        private readonly StatTypes[] basicStats = new StatTypes[]
+        {
+            StatTypes.MaximumHealthMultiplier,
+            StatTypes.MovementSpeed,
+            StatTypes.SwimmingSpeed,
+            StatTypes.RepairSpeed,
+        };
+
+        private readonly StatTypes[] combatStats = new StatTypes[]
+        {
+            StatTypes.MaximumHealthMultiplier,
+            StatTypes.MovementSpeed,
+            StatTypes.SwimmingSpeed,
+            StatTypes.RepairSpeed,
+        };
+
+        private readonly StatTypes[] miscStats = new StatTypes[]
+        {
+            StatTypes.ReputationGainMultiplier,
+            StatTypes.MissionMoneyGainMultiplier,
+            StatTypes.ExperienceGainMultiplier,
+            StatTypes.MissionExperienceGainMultiplier,
+        };
+
+        private void CreateCharacterSheet(GUILayoutGroup characterInfoColumn)
+        {
+            Character controlledCharacter = Character.Controlled;
+
+            CreateRow(basicStats);
+            CreateRow(combatStats);
+            CreateRow(miscStats);
+
+            void CreateRow(StatTypes[] statTypes)
+            {
+                GUILayoutGroup characterInfoRow = new GUILayoutGroup(new RectTransform(new Vector2(0.33f, 1.0f), characterInfoColumn.RectTransform, anchor: Anchor.TopLeft), childAnchor: Anchor.TopCenter);
+                foreach (StatTypes statType in statTypes)
+                {
+                    ShowStat(statType, characterInfoRow);
+                }
+            }
+
+            void ShowStat(StatTypes statType, GUILayoutGroup characterInfoRow)
+            {
+                GUIFrame textInfoFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.33f), characterInfoRow.RectTransform, Anchor.TopCenter), style: null);
+                new GUITextBlock(new RectTransform(new Vector2(1f, 1f), textInfoFrame.RectTransform, Anchor.TopLeft), statType.ToString(), font: GUI.SmallFont, textAlignment: Alignment.TopLeft);
+                new GUITextBlock(new RectTransform(new Vector2(1f, 1f), textInfoFrame.RectTransform, Anchor.TopLeft), (int)(100f * (1 + controlledCharacter.GetStatValue(statType))) + "%", font: GUI.Font, textAlignment: Alignment.TopRight);
+            }
+        }
    }
 }
@@ -115,8 +115,9 @@ namespace Barotrauma
            return MathHelper.Clamp(Math.Min(Math.Min(scale.X, scale.Y), GUI.SlicedSpriteScale), minBorderScale, maxBorderScale);
        }

-        public void Draw(SpriteBatch spriteBatch, Rectangle rect, Color color, SpriteEffects spriteEffects = SpriteEffects.None)
+        public void Draw(SpriteBatch spriteBatch, Rectangle rect, Color color, SpriteEffects spriteEffects = SpriteEffects.None, Vector2? uvOffset = null)
        {
+            uvOffset ??= Vector2.Zero;
            if (Sprite.Texture == null)
            {
                GUI.DrawRectangle(spriteBatch, rect, Color.Magenta);
@@ -157,7 +158,7 @@ namespace Barotrauma
            else if (Tile)
            {
                Vector2 startPos = new Vector2(rect.X, rect.Y);
-                Sprite.DrawTiled(spriteBatch, startPos, new Vector2(rect.Width, rect.Height), color);
+                Sprite.DrawTiled(spriteBatch, startPos, new Vector2(rect.Width, rect.Height), color, startOffset: uvOffset);
            }
            else
            {