Enemy viewer revamp, loading screen improvement

2025-12-05 16:30:13 -08:00
parent f39bd8ecdb
commit 678916be89
61 changed files with 1109 additions and 657 deletions
--- a/Zennysoft.Game.Ma/src/ui/game_over/GameOverMenu.cs
+++ b/Zennysoft.Game.Ma/src/ui/game_over/GameOverMenu.cs
@@ -2,24 +2,26 @@ using Chickensoft.AutoInject;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.Introspection;
 using Godot;
+using System;

 namespace Zennysoft.Game.Ma;

-public interface IDeathMenu : IControl
+public interface IGameOverMenu : IControl
 {
  void FadeIn();
  void FadeOut();
+
+  public event Action NewGame;
+  public event Action QuitGame;
 }

 [Meta(typeof(IAutoNode))]
-public partial class DeathMenu : Control, IDeathMenu
+public partial class GameOverMenu : Control, IGameOverMenu
 {
  public override void _Notification(int what) => this.Notify(what);

-  [Signal]
-  public delegate void NewGameEventHandler();
-  [Signal]
-  public delegate void QuitGameEventHandler();
+  public event Action NewGame;
+  public event Action QuitGame;

  [Dependency] Game Game => this.DependOn<Game>();

@@ -31,28 +33,28 @@ public partial class DeathMenu : Control, IDeathMenu

  public void OnReady()
  {
-	Continue.Pressed += Continue_Pressed;
-	Exit.Pressed += Exit_Pressed;
-	VisibilityChanged += DeathMenu_VisibilityChanged;
+    Continue.Pressed += Continue_Pressed;
+    Exit.Pressed += Exit_Pressed;
+    VisibilityChanged += DeathMenu_VisibilityChanged;
  }

  private void DeathMenu_VisibilityChanged()
  {
-	if (Visible)
-	  Continue.CallDeferred(MethodName.GrabFocus, []);
-	else
-	  ReleaseFocus();
+    if (Visible)
+      Continue.CallDeferred(MethodName.GrabFocus, []);
+    else
+      ReleaseFocus();
  }

  private void Exit_Pressed()
  {
-	EmitSignal(SignalName.QuitGame);
+    QuitGame?.Invoke();
  }

  private void Continue_Pressed()
  {
-	FadeOut();
-	EmitSignal(SignalName.NewGame);
+    FadeOut();
+    NewGame?.Invoke();
  }

  public void FadeIn() => AnimationPlayer.Play("fade_in");
--- a/Zennysoft.Game.Ma/src/ui/game_over/GameOverMenu.cs.uid
+++ b/Zennysoft.Game.Ma/src/ui/game_over/GameOverMenu.cs.uid
--- a/Zennysoft.Game.Ma/src/ui/game_over/GameOverMenu.tscn
+++ b/Zennysoft.Game.Ma/src/ui/game_over/GameOverMenu.tscn
@@ -1,7 +1,10 @@
-[gd_scene load_steps=7 format=3 uid="uid://dbtfgrtgpr4qg"]
+[gd_scene load_steps=10 format=3 uid="uid://dbtfgrtgpr4qg"]

-[ext_resource type="Script" uid="uid://caqsfstq2l0lq" path="res://src/ui/death_menu/DeathMenu.cs" id="1_megey"]
-[ext_resource type="FontFile" uid="uid://cm8j5vcdop5x0" path="res://src/ui/fonts/Mrs-Eaves-OT-Roman_31443.ttf" id="2_ip5p6"]
+[ext_resource type="Script" uid="uid://caqsfstq2l0lq" path="res://src/ui/game_over/GameOverMenu.cs" id="1_megey"]
+[ext_resource type="Texture2D" uid="uid://dif6p5hc6b5mq" path="res://src/ui/rendered_assets/SCREEN_RENDERS_Gameover_720_16_9.png" id="2_yb3dv"]
+[ext_resource type="FontFile" uid="uid://beh6d5lo5ihq0" path="res://src/ui/fonts/georgiai.ttf" id="3_n738q"]
+[ext_resource type="StyleBox" uid="uid://bxuy4tnftibfq" path="res://src/options/SelectedOptionsBox.tres" id="3_yb3dv"]
+[ext_resource type="StyleBox" uid="uid://bl15q835s4ene" path="res://src/options/UnselectedOptionsBox.tres" id="4_byrtd"]

 [sub_resource type="Animation" id="Animation_qmlrq"]
 length = 0.001
@@ -93,7 +96,7 @@ _data = {
 &"fade_out": SubResource("Animation_6ji3u")
 }

-[node name="DeathMenu" type="Control"]
+[node name="GameOver" type="Control"]
 process_mode = 3
 layout_mode = 3
 anchors_preset = 15
@@ -103,14 +106,15 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_megey")

-[node name="ColorRect" type="ColorRect" parent="."]
+[node name="BG" type="TextureRect" parent="."]
+texture_filter = 2
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-color = Color(0.137255, 0.121569, 0.12549, 1)
+texture = ExtResource("2_yb3dv")

 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 unique_name_in_owner = true
@@ -118,26 +122,15 @@ libraries = {
 &"": SubResource("AnimationLibrary_ek7oy")
 }

-[node name="CenterContainer" type="CenterContainer" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 2
+offset_left = 232.0
+offset_top = 735.905
+offset_right = 386.0
+offset_bottom = 837.905
+theme_override_constants/separation = 10

-[node name="GameOverPlaceholder" type="Label" parent="CenterContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_colors/font_color = Color(0.545098, 0, 0, 1)
-theme_override_constants/outline_size = 12
-theme_override_fonts/font = ExtResource("2_ip5p6")
-theme_override_font_sizes/font_size = 72
-text = "Game Over"
-
-[node name="Continue" type="Button" parent="CenterContainer/VBoxContainer"]
+[node name="Continue" type="Button" parent="VBoxContainer"]
 unique_name_in_owner = true
 process_mode = 3
 layout_mode = 2
@@ -145,14 +138,41 @@ focus_neighbor_top = NodePath(".")
 focus_neighbor_bottom = NodePath("../Exit")
 focus_next = NodePath("../Exit")
 focus_previous = NodePath(".")
+theme_override_fonts/font = ExtResource("3_n738q")
+theme_override_font_sizes/font_size = 38
+theme_override_styles/focus = ExtResource("3_yb3dv")
+theme_override_styles/disabled_mirrored = ExtResource("4_byrtd")
+theme_override_styles/disabled = ExtResource("4_byrtd")
+theme_override_styles/hover_pressed_mirrored = ExtResource("4_byrtd")
+theme_override_styles/hover_pressed = ExtResource("4_byrtd")
+theme_override_styles/hover_mirrored = ExtResource("4_byrtd")
+theme_override_styles/hover = ExtResource("4_byrtd")
+theme_override_styles/pressed_mirrored = ExtResource("4_byrtd")
+theme_override_styles/pressed = ExtResource("4_byrtd")
+theme_override_styles/normal_mirrored = ExtResource("4_byrtd")
+theme_override_styles/normal = ExtResource("4_byrtd")
 text = "Continue"

-[node name="Exit" type="Button" parent="CenterContainer/VBoxContainer"]
+[node name="Exit" type="Button" parent="VBoxContainer"]
 unique_name_in_owner = true
 process_mode = 3
 layout_mode = 2
+size_flags_horizontal = 4
 focus_neighbor_top = NodePath("../Continue")
 focus_neighbor_bottom = NodePath(".")
 focus_next = NodePath(".")
 focus_previous = NodePath("../Continue")
+theme_override_fonts/font = ExtResource("3_n738q")
+theme_override_font_sizes/font_size = 38
+theme_override_styles/focus = ExtResource("3_yb3dv")
+theme_override_styles/disabled_mirrored = ExtResource("4_byrtd")
+theme_override_styles/disabled = ExtResource("4_byrtd")
+theme_override_styles/hover_pressed_mirrored = ExtResource("4_byrtd")
+theme_override_styles/hover_pressed = ExtResource("4_byrtd")
+theme_override_styles/hover_mirrored = ExtResource("4_byrtd")
+theme_override_styles/hover = ExtResource("4_byrtd")
+theme_override_styles/pressed_mirrored = ExtResource("4_byrtd")
+theme_override_styles/pressed = ExtResource("4_byrtd")
+theme_override_styles/normal_mirrored = ExtResource("4_byrtd")
+theme_override_styles/normal = ExtResource("4_byrtd")
 text = "Exit"
--- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn
+++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn
@@ -57,17 +57,8 @@ layout_mode = 2

 [node name="CenterContainer" type="CenterContainer" parent="HBoxContainer/SubViewportContainer/SubViewport"]
 custom_minimum_size = Vector2(1440, 1080)
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="InventoryMenu" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("3_4vcdl")]
-unique_name_in_owner = true
-process_mode = 3
-visible = false
-layout_mode = 2
+offset_right = 1440.0
+offset_bottom = 1080.0

 [node name="UseTeleportPrompt" parent="HBoxContainer/SubViewportContainer/SubViewport/CenterContainer" instance=ExtResource("5_h1hgq")]
 unique_name_in_owner = true
@@ -151,3 +142,8 @@ offset_top = 813.0
 offset_right = 267.0
 offset_bottom = 1004.0
 size_flags_vertical = 3
+
+[node name="InventoryMenu" parent="." instance=ExtResource("3_4vcdl")]
+unique_name_in_owner = true
+process_mode = 3
+layout_mode = 1
--- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs
+++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs
@@ -28,9 +28,6 @@ public partial class InventoryMenu : Control, IInventoryMenu
  [Node] public Label UseItemPrompt { get; set; }
  [Node] public Label ItemEffectLabel { get; set; }

-  [Node] public Label BackArrow { get; set; } = default!;
-  [Node] public Label ForwardArrow { get; set; } = default!;
-
  [Node] public ItemSlot ItemSlot1 { get; set; }
  [Node] public ItemSlot ItemSlot2 { get; set; }
  [Node] public ItemSlot ItemSlot3 { get; set; }
@@ -41,6 +38,16 @@ public partial class InventoryMenu : Control, IInventoryMenu
  [Node] public ItemSlot ItemSlot8 { get; set; }
  [Node] public ItemSlot ItemSlot9 { get; set; }
  [Node] public ItemSlot ItemSlot10 { get; set; }
+  [Node] public ItemSlot ItemSlot11 { get; set; }
+  [Node] public ItemSlot ItemSlot12 { get; set; }
+  [Node] public ItemSlot ItemSlot13 { get; set; }
+  [Node] public ItemSlot ItemSlot14 { get; set; }
+  [Node] public ItemSlot ItemSlot15 { get; set; }
+  [Node] public ItemSlot ItemSlot16 { get; set; }
+  [Node] public ItemSlot ItemSlot17 { get; set; }
+  [Node] public ItemSlot ItemSlot18 { get; set; }
+  [Node] public ItemSlot ItemSlot19 { get; set; }
+  [Node] public ItemSlot ItemSlot20 { get; set; }

  [Dependency] private IPlayer _player => this.DependOn<IPlayer>();
  [Dependency] private IGame _game => this.DependOn<IGame>();
@@ -48,13 +55,10 @@ public partial class InventoryMenu : Control, IInventoryMenu

  private List<IItemSlot> ItemSlots;

-  private InventoryPageNumber _currentPageNumber = InventoryPageNumber.FirstPage;
-
  private string ITEM_SLOT_SCENE = "res://src/ui/inventory_menu/ItemSlot.tscn";

-  private const int _itemsPerPage = 10;
-
  private IItemSlot _currentlySelectedItem = null;
+  private bool _enableMenuSound = false;

  public override void _EnterTree()
  {
@@ -63,7 +67,7 @@ public partial class InventoryMenu : Control, IInventoryMenu

  public void OnResolved()
  {
-    ItemSlots = [ItemSlot1, ItemSlot2, ItemSlot3, ItemSlot4, ItemSlot5, ItemSlot6, ItemSlot7, ItemSlot8, ItemSlot9, ItemSlot10];
+    ItemSlots = [ItemSlot1, ItemSlot2, ItemSlot3, ItemSlot4, ItemSlot5, ItemSlot6, ItemSlot7, ItemSlot8, ItemSlot9, ItemSlot10, ItemSlot11, ItemSlot12, ItemSlot13, ItemSlot14, ItemSlot15, ItemSlot16, ItemSlot17, ItemSlot18, ItemSlot19, ItemSlot20];
    _currentlySelectedItem = ItemSlot1;
    foreach (var item in ItemSlots)
    {
@@ -83,9 +87,19 @@ public partial class InventoryMenu : Control, IInventoryMenu
    ThrowButton.Pressed += ThrowButtonPressed;
    DropButton.Pressed += DropButtonPressed;

+    UseButton.FocusEntered += ActionButtonFocusChanged;
+    ThrowButton.FocusEntered += ActionButtonFocusChanged;
+    DropButton.FocusEntered += ActionButtonFocusChanged;
+
    VisibilityChanged += InventoryMenu_VisibilityChanged;
  }

+  private void ActionButtonFocusChanged()
+  {
+    if (!_enableMenuSound)
+      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
+  }
+
  public override void _Input(InputEvent @event)
  {
    if (!Visible)
@@ -94,18 +108,6 @@ public partial class InventoryMenu : Control, IInventoryMenu
    if ((!Input.IsActionJustPressed(GameInputs.UiUp) && Input.IsActionPressed(GameInputs.UiUp)) || (!Input.IsActionJustPressed(GameInputs.UiDown) && Input.IsActionPressed(GameInputs.UiDown)))
      AcceptEvent();

-    if (Input.IsActionJustPressed(GameInputs.UiUp) && _currentlySelectedItem.GetIndex() != ItemSlots.First().GetIndex() && !(UseButton.HasFocus() || DropButton.HasFocus() || ThrowButton.HasFocus()))
-      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
-    if (Input.IsActionJustPressed(GameInputs.UiDown) && _currentlySelectedItem.GetIndex() != ItemSlots.Last(x => x.Visible).GetIndex() && !(UseButton.HasFocus() || DropButton.HasFocus() || ThrowButton.HasFocus()))
-      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
-
-    if (Input.IsActionJustPressed(GameInputs.UiUp) && (DropButton.HasFocus() || ThrowButton.HasFocus()))
-      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
-    if (Input.IsActionJustPressed(GameInputs.UiDown) && (UseButton.HasFocus() || ThrowButton.HasFocus()))
-      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
-
-
-
    if (Input.IsActionJustPressed(GameInputs.Inventory) && !(UseButton.HasFocus() || DropButton.HasFocus() || ThrowButton.HasFocus()))
    {
      SfxDatabase.Instance.Play(SoundEffect.CancelUI);
@@ -124,22 +126,6 @@ public partial class InventoryMenu : Control, IInventoryMenu
      AcceptEvent();
      _gameRepo.CloseInventory();
    }
-    if (_currentPageNumber == InventoryPageNumber.FirstPage && _player.Inventory.Items.Count > 10 && Input.IsActionJustPressed(GameInputs.MoveRight))
-    {
-      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
-      _currentPageNumber = InventoryPageNumber.SecondPage;
-      Inventory_InventoryChanged();
-      _currentlySelectedItem = ItemSlot1;
-      ItemSlot1.GrabFocus();
-    }
-    else if (_currentPageNumber == InventoryPageNumber.SecondPage && Input.IsActionJustPressed(GameInputs.MoveLeft))
-    {
-      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
-      _currentPageNumber = InventoryPageNumber.FirstPage;
-      Inventory_InventoryChanged();
-      _currentlySelectedItem = ItemSlot1;
-      ItemSlot1.GrabFocus();
-    }

    if (Input.IsActionJustPressed(GameInputs.InventorySort))
    {
@@ -163,6 +149,11 @@ public partial class InventoryMenu : Control, IInventoryMenu
    {
      SfxDatabase.Instance.Play(SoundEffect.OpenInventory);
      _currentlySelectedItem.GrabFocus();
+      _enableMenuSound = true;
+    }
+    else
+    {
+      _enableMenuSound = false;
    }
  }

@@ -179,6 +170,9 @@ public partial class InventoryMenu : Control, IInventoryMenu
    if (itemSlot.Item.Value == null)
      return;

+    if (_enableMenuSound)
+      SfxDatabase.Instance.Play(SoundEffect.MoveUI);
+
    ItemDescriptionTitle.Text = $"{itemSlot.Item.Value.ItemName}";
    ItemEffectLabel.Text = $"{itemSlot.Item.Value.Description}";
    _currentlySelectedItem = itemSlot;
@@ -197,28 +191,13 @@ public partial class InventoryMenu : Control, IInventoryMenu
      slot.SetItemStyle();
    }

-    if (_currentPageNumber == InventoryPageNumber.SecondPage && _player.Inventory.Items.Count <= 10)
-    {
-      _currentPageNumber = InventoryPageNumber.FirstPage;
-      var elementToSelect = _player.Inventory.Items.IndexOf(_player.Inventory.Items.Last());
-      _currentlySelectedItem = ItemSlots.ElementAt(elementToSelect);
-      _currentlySelectedItem.GrabFocus();
-    }
-
-    var itemsToDisplay = new List<InventoryItem>();
-    if (_currentPageNumber == InventoryPageNumber.FirstPage)
-      itemsToDisplay = [.. _player.Inventory.Items.Take(_itemsPerPage)];
-    else
-      itemsToDisplay = [.. _player.Inventory.Items.TakeLast(_player.Inventory.Items.Count - _itemsPerPage)];
-
+    var itemsToDisplay = _player.Inventory.Items;
    for (var i = 0; i < itemsToDisplay.Count; i++)
    {
      ItemSlots[i].Item.OnNext(itemsToDisplay[i]);
      ItemSlots[i].Visible = true;
    }

-    SetPageIndicators();
-
    if (!_player.Inventory.Items.Contains(_currentlySelectedItem.Item.Value))
    {
      _currentlySelectedItem.Item.OnNext(null);
@@ -228,20 +207,6 @@ public partial class InventoryMenu : Control, IInventoryMenu
    }
  }

-  private void SetPageIndicators()
-  {
-    if (_player.Inventory.Items.Count > 10 && _currentPageNumber == InventoryPageNumber.FirstPage)
-    {
-      ForwardArrow.Text = "►";
-      BackArrow.Text = "";
-    }
-    else if (_player.Inventory.Items.Count > 10 && _currentPageNumber == InventoryPageNumber.SecondPage)
-    {
-      ForwardArrow.Text = "";
-      BackArrow.Text = "◄";
-    }
-  }
-
  private void Attack_Sync(int obj) => ATKValue.Text = $"{_player.AttackComponent.CurrentAttack.Value}/{_player.AttackComponent.MaximumAttack.Value}";
  private void Defense_Sync(int obj) => DEFValue.Text = $"{_player.DefenseComponent.CurrentDefense.Value}/{_player.DefenseComponent.MaximumDefense.Value}";

@@ -308,7 +273,8 @@ public partial class InventoryMenu : Control, IInventoryMenu
      UseButton.Text = "Use";
    }

-    UseButton.CallDeferred(MethodName.GrabFocus);
+    UseButton.GrabFocus();
+    _enableMenuSound = false;
  }

  private void HideUserActionPrompt()
@@ -321,6 +287,7 @@ public partial class InventoryMenu : Control, IInventoryMenu
    ThrowButton.ReleaseFocus();
    DropButton.ReleaseFocus();
    _currentlySelectedItem.GrabFocus();
+    _enableMenuSound = true;
  }

  private async Task EquipOrUnequipItem(EquipableItem equipable)
--- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn
+++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn
@@ -1,7 +1,6 @@
 [gd_scene load_steps=21 format=3 uid="uid://dlj8qdg1c5048"]

 [ext_resource type="Script" uid="uid://bi1xopts68paw" path="res://src/ui/inventory_menu/InventoryMenu.cs" id="1_b6rkr"]
-[ext_resource type="Shader" uid="uid://cnphwvmr05hp1" path="res://src/ui/inventory_menu/InventoryMenu.gdshader" id="2_0fvsh"]
 [ext_resource type="PackedScene" uid="uid://c005nd0m2eim" path="res://src/ui/inventory_menu/ItemSlot.tscn" id="4_aiji3"]
 [ext_resource type="LabelSettings" uid="uid://wc363u5t1yi2" path="res://src/ui/label_settings/HeadingFont.tres" id="4_l0byb"]
 [ext_resource type="LabelSettings" uid="uid://cuuo43x72xcsc" path="res://src/ui/label_settings/MainTextBold.tres" id="7_vyrxm"]
@@ -9,22 +8,8 @@
 [ext_resource type="Theme" uid="uid://daxuhpmyxwxck" path="res://src/ui/inventory_menu/InventoryDialogueSelectionStyle.tres" id="8_khyvo"]
 [ext_resource type="LabelSettings" uid="uid://bgnwcs434ppkf" path="res://src/ui/label_settings/EbrimaText.tres" id="8_ldqki"]

-[sub_resource type="ShaderMaterial" id="ShaderMaterial_i55tv"]
-shader = ExtResource("2_0fvsh")
-shader_parameter/color1 = Vector3(-1.635, -0.665, 0.005)
-shader_parameter/color2 = Vector3(-0.275, 0.91, 1.005)
-shader_parameter/color3 = Vector3(1, 1, 1)
-shader_parameter/color4 = Vector3(0, 0.1, 0.2)
-shader_parameter/grandient = 0.01
-shader_parameter/zoom = 2.0
-shader_parameter/disp = Vector2(0, 0)
-shader_parameter/rot_angle = Vector2(1, 1)
-shader_parameter/wiggle = 0.35
-shader_parameter/speed1 = 0.1
-shader_parameter/speed2 = 0.1
-shader_parameter/speed3 = 0.1
-
-[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_3ynpe"]
+[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_unikd"]
+blend_mode = 4

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0kb6l"]

@@ -46,19 +31,27 @@ shader_parameter/speed3 = 0.1

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ct6ql"]

+[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_7co7g"]
+blend_mode = 4
+light_mode = 2
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_unikd"]
+
 [node name="InventoryMenu" type="Control"]
-custom_minimum_size = Vector2(1440, 1080)
+visible = false
 layout_mode = 3
-anchors_preset = 0
-offset_right = 1440.0
-offset_bottom = 1080.0
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 mouse_filter = 2
 script = ExtResource("1_b6rkr")

-[node name="BG" type="TextureRect" parent="."]
-material = SubResource("ShaderMaterial_i55tv")
+[node name="BG" type="ColorRect" parent="."]
+material = SubResource("CanvasItemMaterial_unikd")
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -66,14 +59,14 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
-texture = SubResource("PlaceholderTexture2D_3ynpe")
-expand_mode = 2
+color = Color(0.215686, 0.215686, 0.215686, 0.431373)

 [node name="InventoryInfo" type="MarginContainer" parent="."]
-custom_minimum_size = Vector2(1440, 1080)
 layout_mode = 0
-offset_right = 1359.0
-offset_bottom = 958.0
+offset_left = -157.0
+offset_top = -67.0
+offset_right = 1028.0
+offset_bottom = 1013.0
 theme_override_constants/margin_top = 100

 [node name="HBoxContainer" type="HBoxContainer" parent="InventoryInfo"]
@@ -92,12 +85,6 @@ size_flags_horizontal = 4
 [node name="HBoxContainer" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer"]
 layout_mode = 2

-[node name="BackArrow" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer/HBoxContainer"]
-unique_name_in_owner = true
-layout_mode = 2
-text = "◄"
-label_settings = ExtResource("8_ldqki")
-
 [node name="ItemsTitle" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer/HBoxContainer"]
 custom_minimum_size = Vector2(300, 0)
 layout_mode = 2
@@ -107,76 +94,6 @@ text = "  ITEMS"
 label_settings = ExtResource("4_l0byb")
 vertical_alignment = 1

-[node name="ForwardArrow" type="Label" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemTitleContainer/HBoxContainer"]
-unique_name_in_owner = true
-layout_mode = 2
-size_flags_horizontal = 3
-size_flags_vertical = 1
-text = "►"
-label_settings = ExtResource("8_ldqki")
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="ItemsPage" type="VBoxContainer" parent="InventoryInfo/HBoxContainer/ItemInfo"]
-unique_name_in_owner = true
-layout_mode = 2
-theme_override_constants/separation = 15
-alignment = 1
-
-[node name="ReferenceRect3" type="ReferenceRect" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage"]
-custom_minimum_size = Vector2(0, 14)
-layout_mode = 2
-
-[node name="ItemSlot1" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot2" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot3" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot4" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot5" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot6" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot7" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot8" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot9" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
-[node name="ItemSlot10" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-
 [node name="PlayerInfo" type="VBoxContainer" parent="InventoryInfo/HBoxContainer"]
 layout_mode = 2
 mouse_filter = 2
@@ -364,3 +281,129 @@ theme_override_styles/normal = SubResource("StyleBoxEmpty_ct6ql")
 button_mask = 0
 text = "Drop"
 alignment = 0
+
+[node name="Panel" type="Panel" parent="."]
+material = SubResource("CanvasItemMaterial_7co7g")
+layout_mode = 0
+offset_left = 1069.0
+offset_top = 23.0
+offset_right = 1885.0
+offset_bottom = 1015.0
+
+[node name="ScrollContainer" type="ScrollContainer" parent="Panel"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/panel = SubResource("StyleBoxEmpty_unikd")
+follow_focus = true
+draw_focus_border = true
+
+[node name="ItemsPage" type="VBoxContainer" parent="Panel/ScrollContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 2
+alignment = 1
+
+[node name="ItemSlot1" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot2" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot3" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot4" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot5" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot6" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot7" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot8" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot9" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot10" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot11" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot12" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot13" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot14" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot15" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot16" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot17" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot18" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot19" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot20" parent="Panel/ScrollContainer/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
--- a/Zennysoft.Game.Ma/src/ui/load_next_level/LoadNextLevel.tscn
+++ b/Zennysoft.Game.Ma/src/ui/load_next_level/LoadNextLevel.tscn
@@ -8,10 +8,10 @@

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_1tca4"]

-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_1pd8j"]
-
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_crnka"]

+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_1pd8j"]
+
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_yoep7"]

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_svmjr"]
@@ -149,10 +149,13 @@ theme_override_colors/font_focus_color = Color(1, 0.94902, 0, 1)
 theme_override_fonts/font = ExtResource("3_n7di7")
 theme_override_font_sizes/font_size = 50
 theme_override_styles/focus = SubResource("StyleBoxEmpty_1tca4")
+theme_override_styles/disabled = SubResource("StyleBoxEmpty_crnka")
+theme_override_styles/hover = SubResource("StyleBoxEmpty_crnka")
 theme_override_styles/pressed = SubResource("StyleBoxEmpty_1pd8j")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_crnka")
 button_mask = 0
 text = "CONTINUE"
+flat = true

 [node name="ExitButton" type="Button" parent="MarginContainer/VBoxContainer"]
 unique_name_in_owner = true
@@ -166,10 +169,19 @@ theme_override_colors/font_focus_color = Color(1, 0.94902, 0, 1)
 theme_override_fonts/font = ExtResource("3_n7di7")
 theme_override_font_sizes/font_size = 50
 theme_override_styles/focus = SubResource("StyleBoxEmpty_yoep7")
+theme_override_styles/disabled_mirrored = SubResource("StyleBoxEmpty_yoep7")
+theme_override_styles/disabled = SubResource("StyleBoxEmpty_yoep7")
+theme_override_styles/hover_pressed_mirrored = SubResource("StyleBoxEmpty_yoep7")
+theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_yoep7")
+theme_override_styles/hover_mirrored = SubResource("StyleBoxEmpty_yoep7")
+theme_override_styles/hover = SubResource("StyleBoxEmpty_svmjr")
+theme_override_styles/pressed_mirrored = SubResource("StyleBoxEmpty_yoep7")
 theme_override_styles/pressed = SubResource("StyleBoxEmpty_svmjr")
+theme_override_styles/normal_mirrored = SubResource("StyleBoxEmpty_yoep7")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_cmr8o")
 button_mask = 0
 text = "EXIT TOWER"
+flat = true

 [node name="PlayerStats" type="VBoxContainer" parent="MarginContainer/VBoxContainer"]
 layout_mode = 2
--- a/Zennysoft.Game.Ma/src/ui/teleport_prompt/UseTeleportPrompt.tscn
+++ b/Zennysoft.Game.Ma/src/ui/teleport_prompt/UseTeleportPrompt.tscn
@@ -1,29 +1,21 @@
-[gd_scene load_steps=16 format=3 uid="uid://bea2waybmgd6u"]
+[gd_scene load_steps=13 format=3 uid="uid://bea2waybmgd6u"]

 [ext_resource type="Script" uid="uid://dvn7g207w5jaj" path="res://src/ui/in_game_ui/UseTeleportPrompt.cs" id="1_x3wkp"]
 [ext_resource type="FontFile" uid="uid://cm8j5vcdop5x0" path="res://src/ui/fonts/Mrs-Eaves-OT-Roman_31443.ttf" id="2_i6kb2"]
 [ext_resource type="FontFile" uid="uid://duu4matpexcq4" path="res://src/ui/fonts/LSANS.TTF" id="3_tygw6"]
+[ext_resource type="StyleBox" uid="uid://bxuy4tnftibfq" path="res://src/options/SelectedOptionsBox.tres" id="4_43cjp"]
+[ext_resource type="StyleBox" uid="uid://bl15q835s4ene" path="res://src/options/UnselectedOptionsBox.tres" id="5_sytxg"]

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ahhj2"]

 [sub_resource type="LabelSettings" id="LabelSettings_3g0y1"]
 font = ExtResource("3_tygw6")
-font_size = 60
+font_size = 48
 outline_size = 2
 outline_color = Color(0, 0, 0, 1)

-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_1tca4"]
-
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_1pd8j"]

-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_crnka"]
-
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_yoep7"]
-
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_svmjr"]
-
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cmr8o"]
-
 [sub_resource type="Animation" id="Animation_xrfau"]
 length = 0.001
 tracks/0/type = "value"
@@ -147,8 +139,9 @@ label_settings = SubResource("LabelSettings_3g0y1")

 [node name="YesButton" type="Button" parent="CenterContainer/VBoxContainer"]
 unique_name_in_owner = true
-custom_minimum_size = Vector2(100, 0)
 layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
 focus_neighbor_left = NodePath(".")
 focus_neighbor_top = NodePath(".")
 focus_neighbor_right = NodePath(".")
@@ -157,15 +150,25 @@ theme_override_colors/font_color = Color(0.737255, 0.705882, 0.690196, 1)
 theme_override_colors/font_focus_color = Color(1, 0.94902, 0, 1)
 theme_override_fonts/font = ExtResource("3_tygw6")
 theme_override_font_sizes/font_size = 50
-theme_override_styles/focus = SubResource("StyleBoxEmpty_1tca4")
-theme_override_styles/pressed = SubResource("StyleBoxEmpty_1pd8j")
-theme_override_styles/normal = SubResource("StyleBoxEmpty_crnka")
+theme_override_styles/focus = ExtResource("4_43cjp")
+theme_override_styles/disabled_mirrored = ExtResource("5_sytxg")
+theme_override_styles/disabled = SubResource("StyleBoxEmpty_1pd8j")
+theme_override_styles/hover_pressed_mirrored = ExtResource("5_sytxg")
+theme_override_styles/hover_pressed = SubResource("StyleBoxEmpty_1pd8j")
+theme_override_styles/hover_mirrored = ExtResource("5_sytxg")
+theme_override_styles/hover = SubResource("StyleBoxEmpty_1pd8j")
+theme_override_styles/pressed_mirrored = ExtResource("5_sytxg")
+theme_override_styles/pressed = ExtResource("5_sytxg")
+theme_override_styles/normal_mirrored = ExtResource("5_sytxg")
+theme_override_styles/normal = ExtResource("5_sytxg")
 button_mask = 0
 text = "Yes"

 [node name="NoButton" type="Button" parent="CenterContainer/VBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
 focus_neighbor_left = NodePath(".")
 focus_neighbor_top = NodePath("../YesButton")
 focus_neighbor_right = NodePath(".")
@@ -174,9 +177,14 @@ theme_override_colors/font_color = Color(0.737255, 0.705882, 0.690196, 1)
 theme_override_colors/font_focus_color = Color(1, 0.94902, 0, 1)
 theme_override_fonts/font = ExtResource("3_tygw6")
 theme_override_font_sizes/font_size = 50
-theme_override_styles/focus = SubResource("StyleBoxEmpty_yoep7")
-theme_override_styles/pressed = SubResource("StyleBoxEmpty_svmjr")
-theme_override_styles/normal = SubResource("StyleBoxEmpty_cmr8o")
+theme_override_styles/focus = ExtResource("4_43cjp")
+theme_override_styles/disabled_mirrored = ExtResource("5_sytxg")
+theme_override_styles/hover_pressed_mirrored = ExtResource("5_sytxg")
+theme_override_styles/hover_mirrored = ExtResource("5_sytxg")
+theme_override_styles/pressed_mirrored = ExtResource("5_sytxg")
+theme_override_styles/pressed = ExtResource("5_sytxg")
+theme_override_styles/normal_mirrored = ExtResource("5_sytxg")
+theme_override_styles/normal = ExtResource("5_sytxg")
 button_mask = 0
 text = "No"