diff --git a/Classes/Relics/Assets/Relic_Breakfast.png b/Classes/Relics/Assets/Relic_Breakfast.png index 1c6bbe1d..eb31fb12 100644 Binary files a/Classes/Relics/Assets/Relic_Breakfast.png and b/Classes/Relics/Assets/Relic_Breakfast.png differ diff --git a/README.md b/README.md index c672191d..cbc67b94 100644 --- a/README.md +++ b/README.md @@ -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) \ No newline at end of file +- Main System Font: [Fibberish - nathan scott](https://caffinate.itch.io/fibberish/) diff --git a/Scenes/BattleDirector/BattleScene.tscn b/Scenes/BattleDirector/BattleScene.tscn index 379f741e..59e75503 100644 --- a/Scenes/BattleDirector/BattleScene.tscn +++ b/Scenes/BattleDirector/BattleScene.tscn @@ -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" diff --git a/Scenes/BattleDirector/NotePlacementBar.tscn b/Scenes/BattleDirector/NotePlacementBar.tscn index 8376f287..492ee90b 100644 --- a/Scenes/BattleDirector/NotePlacementBar.tscn +++ b/Scenes/BattleDirector/NotePlacementBar.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 diff --git a/Scenes/BattleDirector/Scripts/NotePlacementBar.cs b/Scenes/BattleDirector/Scripts/NotePlacementBar.cs index 60d3ed0f..a02acf33 100644 --- a/Scenes/BattleDirector/Scripts/NotePlacementBar.cs +++ b/Scenes/BattleDirector/Scripts/NotePlacementBar.cs @@ -49,7 +49,7 @@ private double CurrentBarValue private void UpdateComboMultText() { - _currentComboMultText.Text = $" x{ComboMult.ToString()}"; + _currentComboMultText.Text = $" x{ComboMult.ToString()}"; } #endregion diff --git a/Scenes/ChestScene/ChestScene.tscn b/Scenes/ChestScene/ChestScene.tscn index 796342d5..96281b84 100644 --- a/Scenes/ChestScene/ChestScene.tscn +++ b/Scenes/ChestScene/ChestScene.tscn @@ -1,4 +1,4 @@ -[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"] @@ -6,6 +6,7 @@ [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 diff --git a/Scenes/Maps/Cartographer.tscn b/Scenes/Maps/Cartographer.tscn index 204a2880..f492aa8e 100644 --- a/Scenes/Maps/Cartographer.tscn +++ b/Scenes/Maps/Cartographer.tscn @@ -1,14 +1,16 @@ -[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") @@ -16,8 +18,8 @@ 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="."] diff --git a/Scenes/Maps/Scripts/Cartographer.cs b/Scenes/Maps/Scripts/Cartographer.cs index c48f82b8..030485e4 100644 --- a/Scenes/Maps/Scripts/Cartographer.cs +++ b/Scenes/Maps/Scripts/Cartographer.cs @@ -14,6 +14,9 @@ public partial class Cartographer : Node2D [Export] public Sprite2D PlayerSprite; + [Export] + public Theme ButtonTheme; + private Button[] _validButtons = Array.Empty