Merge pull request #152 from Project-Funk-Engine/NewUITesting

Update UI

Author: LifeHckr

Classes/Relics/Assets/Relic_Breakfast.png

@@ -24,5 +24,6 @@ Music:
 
 Images:
 - Input Buttons: [inputKeys - Nicolae (Xelu) Berbece](https://thoseawesomeguys.com/prompts/)
+- Light map texture: [Godot Engine docs - Godot Foundation](https://docs.godotengine.org/en/stable/tutorials/2d/2d_lights_and_shadows.html)
 - Title Screen Font: [04B-30 - Yuji Oshimoto](http://04.jp.org/)
-- Light map texture: [Godot Engine docs - Godot Foundation](https://docs.godotengine.org/en/stable/tutorials/2d/2d_lights_and_shadows.html)
+- Main System Font: [Fibberish  - nathan scott](https://caffinate.itch.io/fibberish/)

README.md

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://b0mrgr7h0ty1y"]
+[gd_scene load_steps=11 format=3 uid="uid://b0mrgr7h0ty1y"]
 
 [ext_resource type="Script" uid="uid://bttu0wmy2fp64" path="res://Scenes/BattleDirector/Scripts/BattleDirector.cs" id="1_jmdo1"]
 [ext_resource type="Script" uid="uid://pl57giqyhckb" path="res://Scenes/UI/Scripts/MenuModule.cs" id="2_ka0ws"]
@@ -7,6 +7,7 @@
 [ext_resource type="PackedScene" uid="uid://dfevfib11kou1" path="res://Scenes/ChartViewport/ChartViewport.tscn" id="5_r2xh0"]
 [ext_resource type="Texture2D" uid="uid://qhwve7fik4do" path="res://SharedAssets/BackGround_Full.png" id="6_0jtpx"]
 [ext_resource type="Texture2D" uid="uid://dbjotl0v1ymia" path="res://SharedAssets/BattleFrame1.png" id="7_klvil"]
+[ext_resource type="Theme" uid="uid://d37e3tpsbxwak" path="res://Scenes/UI/Assets/GeneralTheme.tres" id="8_62qim"]
 
 [sub_resource type="Gradient" id="Gradient_8uy3a"]
 offsets = PackedFloat32Array(0, 0.766234, 1)
@@ -81,9 +82,9 @@ offset_bottom = 360.0
 texture = ExtResource("7_klvil")
 
 [node name="StartButton" type="Button" parent="."]
-modulate = Color(5, 5, 5, 1)
 offset_left = 241.0
-offset_top = 234.0
-offset_right = 399.0
-offset_bottom = 265.0
+offset_top = 230.0
+offset_right = 443.0
+offset_bottom = 267.0
+theme = ExtResource("8_62qim")
 text = "BATTLE_ROOM_BEGIN_BUTTON"

Scenes/BattleDirector/BattleScene.tscn

@@ -108,7 +108,8 @@ layout_mode = 0
 offset_right = 80.0
 offset_bottom = 35.0
 mouse_filter = 2
-text = "    x1"
+theme_override_font_sizes/font_size = 32
+text = " x1"
 context_menu_enabled = false
 shortcut_keys_enabled = false
 selecting_enabled = false

Scenes/BattleDirector/NotePlacementBar.tscn

@@ -49,7 +49,7 @@ private double CurrentBarValue
 
     private void UpdateComboMultText()
     {
-        _currentComboMultText.Text = $"    x{ComboMult.ToString()}";
+        _currentComboMultText.Text = $" x{ComboMult.ToString()}";
     }
     #endregion
 

Scenes/BattleDirector/Scripts/NotePlacementBar.cs

@@ -1,11 +1,12 @@
-[gd_scene load_steps=9 format=3 uid="uid://c4vmb783d3v03"]
+[gd_scene load_steps=10 format=3 uid="uid://c4vmb783d3v03"]
 
 [ext_resource type="Script" uid="uid://cetn71kolbrmg" path="res://Scenes/ChestScene/ChestScene.cs" id="1_ardd2"]
 [ext_resource type="AudioStream" uid="uid://be5ial13ynf3o" path="res://Audio/Song1.ogg" id="2_x78jo"]
 [ext_resource type="Script" uid="uid://pl57giqyhckb" path="res://Scenes/UI/Scripts/MenuModule.cs" id="3_5uvci"]
 [ext_resource type="Shader" uid="uid://dp36iuuy414k1" path="res://SharedAssets/StarryNight.gdshader" id="5_whthd"]
 [ext_resource type="Texture2D" uid="uid://qhwve7fik4do" path="res://SharedAssets/BackGround_Full.png" id="6_37nar"]
 [ext_resource type="Texture2D" uid="uid://d0ywqw1j1k71v" path="res://Scenes/ChestScene/Assets/Chest.png" id="6_58hf4"]
+[ext_resource type="Theme" uid="uid://bcejp4llrb3m0" path="res://Scenes/UI/Assets/EmptyButton.tres" id="6_pisq4"]
 [ext_resource type="Texture2D" uid="uid://dbjotl0v1ymia" path="res://SharedAssets/BattleFrame1.png" id="7_kkck7"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_8x17a"]
@@ -18,7 +19,7 @@ shader_parameter/time_scale = 1.0
 [node name="ChestScene" type="Node2D" node_paths=PackedStringArray("ChestButton", "PlayerMarker")]
 process_mode = 1
 script = ExtResource("1_ardd2")
-ChestButton = NodePath("ChestButton")
+ChestButton = NodePath("CenterContainer/VBoxContainer/ChestButton")
 PlayerMarker = NodePath("PlayerMarker")
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
@@ -45,12 +46,34 @@ offset_right = 640.0
 offset_bottom = 360.0
 texture = ExtResource("7_kkck7")
 
-[node name="ChestButton" type="Button" parent="."]
-offset_left = 375.0
-offset_top = 126.0
-offset_right = 431.0
+[node name="CenterContainer" type="CenterContainer" parent="."]
+offset_left = 348.0
+offset_top = 88.0
+offset_right = 424.0
 offset_bottom = 166.0
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
+layout_mode = 2
+
+[node name="OpenLabel" type="Label" parent="CenterContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
+theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
+theme_override_constants/shadow_offset_x = 2
+theme_override_constants/shadow_offset_y = 3
+theme_override_constants/outline_size = 2
+theme_override_constants/shadow_outline_size = 6
+theme_override_font_sizes/font_size = 48
+text = "!"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="ChestButton" type="Button" parent="CenterContainer/VBoxContainer"]
+custom_minimum_size = Vector2(60, 44)
+layout_mode = 2
+theme = ExtResource("6_pisq4")
 icon = ExtResource("6_58hf4")
+icon_alignment = 1
 
 [node name="SubViewportContainer" type="SubViewportContainer" parent="."]
 z_index = -2

Scenes/ChestScene/ChestScene.tscn

@@ -1,23 +1,25 @@
-[gd_scene load_steps=5 format=3 uid="uid://cydmo2lbnj1de"]
+[gd_scene load_steps=6 format=3 uid="uid://cydmo2lbnj1de"]
 
-[ext_resource type="Script" path="res://Scenes/Maps/Scripts/Cartographer.cs" id="1_u4q3n"]
+[ext_resource type="Script" uid="uid://dtlpiwt4n3pta" path="res://Scenes/Maps/Scripts/Cartographer.cs" id="1_u4q3n"]
 [ext_resource type="Texture2D" uid="uid://qhwve7fik4do" path="res://SharedAssets/BackGround_Full.png" id="2_5g6at"]
-[ext_resource type="Script" path="res://Scenes/UI/Scripts/MenuModule.cs" id="2_cl7v0"]
+[ext_resource type="Script" uid="uid://pl57giqyhckb" path="res://Scenes/UI/Scripts/MenuModule.cs" id="2_cl7v0"]
+[ext_resource type="Theme" uid="uid://bcejp4llrb3m0" path="res://Scenes/UI/Assets/EmptyButton.tres" id="2_rnj1y"]
 [ext_resource type="Texture2D" uid="uid://cmc7gcplqnebx" path="res://SharedAssets/Player.png" id="3_qiprp"]
 
 [node name="Cartographer" type="Node2D" node_paths=PackedStringArray("PlayerSprite")]
 process_mode = 1
 script = ExtResource("1_u4q3n")
 PlayerSprite = NodePath("Player")
+ButtonTheme = ExtResource("2_rnj1y")
 
 [node name="UI" type="CanvasLayer" parent="." node_paths=PackedStringArray("CurSceneNode")]
 script = ExtResource("2_cl7v0")
 CurSceneNode = NodePath("..")
 
 [node name="BG" type="Sprite2D" parent="."]
 modulate = Color(0.462, 0.462, 0.66, 1)
-position = Vector2(870, 219)
-scale = Vector2(2.75702, 2.75702)
+position = Vector2(-10, 229)
+scale = Vector2(3, 3)
 texture = ExtResource("2_5g6at")
 
 [node name="Player" type="Sprite2D" parent="."]

Scenes/Maps/Cartographer.tscn

@@ -14,6 +14,9 @@ public partial class Cartographer : Node2D
     [Export]
     public Sprite2D PlayerSprite;
 
+    [Export]
+    public Theme ButtonTheme;
+
     private Button[] _validButtons = Array.Empty<Button>();
 
     private Button _focusedButton;
@@ -70,9 +73,14 @@ private void DrawMap()
         AddFocusNeighbors();
     }
 
+    private static readonly Vector2 MapIconSize = new(48, 48);
+
     private void DrawMapSprite(MapGrid.Room room)
     {
         var newButton = new Button();
+        newButton.Theme = ButtonTheme;
+        newButton.CustomMinimumSize = MapIconSize;
+        newButton.IconAlignment = HorizontalAlignment.Center;
         AddChild(newButton);
         //button is disabled if it is not a child of current room.
         if (!StageProducer.GetCurRoom().Children.Contains(room.Idx))
@@ -94,7 +102,7 @@ private void DrawMapSprite(MapGrid.Room room)
         newButton.Icon = StageIcons[room.Type];
 
         newButton.ZIndex = 1;
-        newButton.Position = GetPosition(room.X, room.Y) - newButton.Size * 2;
+        newButton.Position = GetPosition(room.X, room.Y) - newButton.Size / 2;
         if (room == StageProducer.GetCurRoom())
             PlayerSprite.Position = newButton.Position + newButton.Size * .5f;
     }

Scenes/Maps/Scripts/Cartographer.cs

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dj0nfgig1kd5l"
+path="res://.godot/imported/3DButton.png-5667e80fe10b05a655cb053e722bb974.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Scenes/UI/Assets/3DButton.png"
+dest_files=["res://.godot/imported/3DButton.png-5667e80fe10b05a655cb053e722bb974.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1