UI

Content.Client/_CP14/Fishing/CP14FishingSystem.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using System.Numerics;
 using Content.Client.Resources;
 using Content.Shared._CP14.Fishing;
@@ -53,6 +52,7 @@ public sealed class CP14FishingSystem : CP14SharedFishingSystem
         var progressbar = minigameStyle.Progressbar;
         var fishIcon = minigameStyle.FishIcon;
 
+        // Generating popup
         var fishingPopup = new Popup
         {
             CloseOnClick = false,
@@ -62,8 +62,9 @@ public sealed class CP14FishingSystem : CP14SharedFishingSystem
         };
         _userInterfaceManager.ModalRoot.AddChild(fishingPopup);
 
+        // Generating layers
         var backgroundTexture = _resourceCache.GetTexture(background.Texture);
-        var panel = new PanelContainer
+        var firstLayer = new PanelContainer
         {
             PanelOverride = new StyleBoxTexture
             {
@@ -72,8 +73,64 @@ public sealed class CP14FishingSystem : CP14SharedFishingSystem
             MinSize = new Vector2(background.Size.X, background.Size.Y),
             MaxSize = new Vector2(background.Size.X, background.Size.Y),
         };
-        fishingPopup.AddChild(panel);
+        fishingPopup.AddChild(firstLayer);
 
-        fishingPopup.Open(UIBox2.FromDimensions(new Vector2(0, 0), background.Size));
+        var secondLayer = new PanelContainer
+        {
+            MinSize = new Vector2(background.Size.X, background.Size.Y),
+            MaxSize = new Vector2(background.Size.X, background.Size.Y),
+        };
+        fishingPopup.AddChild(secondLayer);
+
+        // Filling first layer
+        var progressbarTexture = _resourceCache.GetTexture(progressbar.Texture);
+        var progressbarContainer = new PanelContainer
+        {
+            PanelOverride = new StyleBoxTexture
+            {
+                Texture = progressbarTexture,
+            },
+            MinSize = new Vector2(progressbar.Size.X, 0),
+            SetSize = new Vector2(progressbar.Size.X, 0),
+            MaxSize = new Vector2(progressbar.Size.X, progressbar.Size.Y),
+            Margin = new Thickness(progressbar.Offset.X, 0, 0, progressbar.Offset.Y),
+            HorizontalAlignment = Control.HAlignment.Left,
+            VerticalAlignment = Control.VAlignment.Bottom
+        };
+        firstLayer.AddChild(progressbarContainer);
+
+        var floatTexture = _resourceCache.GetTexture(floatUI.Texture);
+        var floatContainer = new PanelContainer
+        {
+            PanelOverride = new StyleBoxTexture
+            {
+                Texture = floatTexture,
+            },
+            MinSize = new Vector2(floatUI.Size.X, floatUI.Size.Y),
+            MaxSize = new Vector2(floatUI.Size.X, floatUI.Size.Y),
+            Margin = new Thickness(floatUI.Offset.X, 0, 0, floatUI.Offset.Y),
+            HorizontalAlignment = Control.HAlignment.Left,
+            VerticalAlignment = Control.VAlignment.Bottom
+        };
+        firstLayer.AddChild(floatContainer);
+
+        // Filling second layer
+        var fishTexture = _resourceCache.GetTexture(fishIcon.Texture);
+        var fishIconContainer = new PanelContainer
+        {
+            PanelOverride = new StyleBoxTexture
+            {
+                Texture = fishTexture,
+            },
+            MinSize = new Vector2(fishIcon.Size.X, fishIcon.Size.Y),
+            MaxSize = new Vector2(fishIcon.Size.X, fishIcon.Size.Y),
+            Margin = new Thickness(fishIcon.Offset.X, 0, 0, fishIcon.Offset.Y),
+            HorizontalAlignment = Control.HAlignment.Left,
+            VerticalAlignment = Control.VAlignment.Bottom
+        };
+        secondLayer.AddChild(fishIconContainer);
+
+        var screenCenter = _userInterfaceManager.ModalRoot.Size / 2;
+        fishingPopup.Open(UIBox2.FromDimensions(new Vector2(screenCenter.X * 0.85f, screenCenter.Y * 0.65f), background.Size));
     }
 }

Content.Shared/_CP14/Fishing/CP14FishingMinigamePrototype.cs

@@ -39,7 +39,7 @@ public sealed partial class CP14FishingMinigamePrototype : IPrototype
         [DataField(required: true)] public Vector2 Size;
 
         /// <summary>
-        /// Offset from top left corner. Starter position in the bottom.
+        /// Offset from bottom left corner. Starter position in the bottom.
         /// </summary>
         [DataField(required: true)] public Vector2 Offset;
     }

Resources/Prototypes/_CP14/FishingStyles/default.yml

@@ -1,18 +1,18 @@
 - type: CP14FishingMinigameStyle
   id: Default
   background:
-    texture: Textures/Interface/Paper/paper_background_default.svg.96dpi.png
-    size: 39, 149
+    texture: /Textures/_CP14/Interface/Fishing/Default/background.png
+    size: 78, 298
     offset: 0, 0
   fishIcon:
-    texture: Textures/_CP14/Interface/Fishing/Default/fish_icon.png
-    size: 11, 9
-    offset: 3, 3
+    texture: /Textures/_CP14/Interface/Fishing/Default/fish_icon.png
+    size: 22, 18
+    offset: 26, 12
   progressbar:
-    texture: Textures/_CP14/Interface/Fishing/Default/progressbar.png
-    size: 2, 142
-    offset: 13, 134
+    texture: /Textures/_CP14/Interface/Fishing/Default/progressbar.png
+    size: 4, 284
+    offset: 6, 8
   float:
-    texture: Textures/_CP14/Interface/Fishing/Default/float.png
-    size: 11, 38
-    offset: 13, 105
+    texture: /Textures/_CP14/Interface/Fishing/Default/float.png
+    size: 22, 76
+    offset: 26, 12