diff --git a/Resources/Styles/DebugMenuButtons.tres b/Resources/Styles/DebugMenuButtons.tres index 8e26bcdd..8a39e449 100644 --- a/Resources/Styles/DebugMenuButtons.tres +++ b/Resources/Styles/DebugMenuButtons.tres @@ -1,6 +1,7 @@ -[gd_resource type="Theme" load_steps=2 format=3 uid="uid://dkom8gcup42kd"] +[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dkom8gcup42kd"] [ext_resource type="FontFile" uid="uid://coek1e2q257pq" path="res://fonts/at01.ttf" id="1_87kc4"] +[ext_resource type="StyleBox" uid="uid://ctw2hju32l3rg" path="res://Resources/Styles/PixelStyleBoxRed.tres" id="2_p2o70"] [resource] default_font = ExtResource("1_87kc4") @@ -24,8 +25,8 @@ Button/constants/icon_max_width = 0 Button/constants/outline_size = 0 Button/font_sizes/font_size = 10 Button/fonts/font = ExtResource("1_87kc4") -Button/styles/disabled = null -Button/styles/focus = null -Button/styles/hover = null -Button/styles/normal = null -Button/styles/pressed = null +Button/styles/disabled = ExtResource("2_p2o70") +Button/styles/focus = ExtResource("2_p2o70") +Button/styles/hover = ExtResource("2_p2o70") +Button/styles/normal = ExtResource("2_p2o70") +Button/styles/pressed = ExtResource("2_p2o70") diff --git a/Resources/Styles/MainMenuButtons.tres b/Resources/Styles/MainMenuButtons.tres index 7a29f1a2..dcc745c5 100644 --- a/Resources/Styles/MainMenuButtons.tres +++ b/Resources/Styles/MainMenuButtons.tres @@ -1,6 +1,7 @@ -[gd_resource type="Theme" load_steps=2 format=3 uid="uid://dnsadvmunm76k"] +[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dnsadvmunm76k"] [ext_resource type="FontFile" uid="uid://coek1e2q257pq" path="res://fonts/at01.ttf" id="1_dp7be"] +[ext_resource type="StyleBox" uid="uid://ctw2hju32l3rg" path="res://Resources/Styles/PixelStyleBoxRed.tres" id="2_wf67a"] [resource] default_font = ExtResource("1_dp7be") @@ -24,8 +25,8 @@ Button/constants/icon_max_width = 0 Button/constants/outline_size = 0 Button/font_sizes/font_size = 16 Button/fonts/font = ExtResource("1_dp7be") -Button/styles/disabled = null -Button/styles/focus = null -Button/styles/hover = null -Button/styles/normal = null -Button/styles/pressed = null +Button/styles/disabled = ExtResource("2_wf67a") +Button/styles/focus = ExtResource("2_wf67a") +Button/styles/hover = ExtResource("2_wf67a") +Button/styles/normal = ExtResource("2_wf67a") +Button/styles/pressed = ExtResource("2_wf67a") diff --git a/Resources/Styles/PixelStyleBoxRed.tres b/Resources/Styles/PixelStyleBoxRed.tres new file mode 100644 index 00000000..d362a0ff --- /dev/null +++ b/Resources/Styles/PixelStyleBoxRed.tres @@ -0,0 +1,11 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://ctw2hju32l3rg"] + +[ext_resource type="Texture2D" uid="uid://d0obc2svu8ege" path="res://Sprites/UI/MenuBackgroundSmall.png" id="1_7cs4p"] + +[resource] +texture = ExtResource("1_7cs4p") +texture_margin_left = 4.0 +texture_margin_top = 4.0 +texture_margin_right = 4.0 +texture_margin_bottom = 4.0 +modulate_color = Color(1, 1, 1, 0.847059) diff --git a/Scenes/HUD/HUD.tscn b/Scenes/HUD/HUD.tscn index 038cb844..d1d30848 100644 --- a/Scenes/HUD/HUD.tscn +++ b/Scenes/HUD/HUD.tscn @@ -186,7 +186,7 @@ offset_bottom = 144.0 [node name="Control" type="Control" parent="."] layout_mode = 3 anchors_preset = 0 -offset_left = 68.0 +offset_left = 41.0 offset_top = 16.0 offset_right = 291.0 offset_bottom = 146.0 diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index c3ce43ce..e5c1fb64 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -9,6 +9,7 @@ [ext_resource type="AudioStream" uid="uid://di416g5wgx6j0" path="res://Music/Title.mp3" id="4_i6ku4"] [ext_resource type="Theme" uid="uid://dnsadvmunm76k" path="res://Resources/Styles/MainMenuButtons.tres" id="4_nk7wn"] [ext_resource type="LabelSettings" uid="uid://wr7cb2qa6w71" path="res://Resources/Styles/Title_Text_Style.tres" id="7_loo7a"] +[ext_resource type="StyleBox" uid="uid://ctw2hju32l3rg" path="res://Resources/Styles/PixelStyleBoxRed.tres" id="7_rrcx7"] [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="8_koqhg"] [ext_resource type="PackedScene" uid="uid://bemu3l6b1e84y" path="res://Scenes/HUD/debug_menu.tscn" id="9_nwlsr"] @@ -21,9 +22,6 @@ font_size = 12 outline_size = 4 outline_color = Color(0, 0, 0, 1) -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_if7li"] -bg_color = Color(0, 0, 0, 0.760784) - [node name="Control" type="Control" node_paths=PackedStringArray("SubMenuHolder")] layout_mode = 3 anchors_preset = 15 @@ -81,6 +79,7 @@ Game" [node name="DebugButton2" type="Button" parent="MarginContainer/GridContainer/GameButtons"] layout_mode = 2 theme = ExtResource("4_nk7wn") +theme_override_styles/normal = ExtResource("7_rrcx7") text = "Continue" [node name="DebugButton" type="Button" parent="MarginContainer/GridContainer/GameButtons"] @@ -160,7 +159,7 @@ offset_left = 13.0 offset_top = 23.0 offset_right = 312.0 offset_bottom = 156.0 -theme_override_styles/panel = SubResource("StyleBoxFlat_if7li") +theme_override_styles/panel = ExtResource("7_rrcx7") [connection signal="pressed" from="MarginContainer/GridContainer/GameButtons/StartButton" to="." method="_on_start_button_pressed"] [connection signal="pressed" from="MarginContainer/GridContainer/GameButtons/DebugButton2" to="." method="_on_debug_button_pressed"] diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 1b36cb86..a9d8fc92 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -474,7 +474,7 @@ SpawnMarkers = Dictionary[int, NodePath]({ 255: NodePath("Factory Tilemaps/Debug Room/DebugRoomStartPosition") }) WeaponTemplate = ExtResource("3_2wlhc") -StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("4_swym2"), ExtResource("5_nqier")]) +StartingEquipment = [ExtResource("4_swym2"), ExtResource("5_nqier")] MapStartData = SubResource("Resource_6sau4") metadata/_edit_lock_ = true diff --git a/Sprites/UI/MenuBackground.aseprite b/Sprites/UI/MenuBackground.aseprite new file mode 100644 index 00000000..67cb9dca --- /dev/null +++ b/Sprites/UI/MenuBackground.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6afd18fe4a83211c1768838d3035946abfa4d00b90536901dc32521dc648265 +size 508 diff --git a/Sprites/UI/MenuBackground.png b/Sprites/UI/MenuBackground.png new file mode 100644 index 00000000..e2602cb7 --- /dev/null +++ b/Sprites/UI/MenuBackground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aa2177c683142ee03841cd5a8a1d69220679e6f4b8fc29bef8dc72aa2ede662 +size 192 diff --git a/Sprites/UI/MenuBackground.png.import b/Sprites/UI/MenuBackground.png.import new file mode 100644 index 00000000..041e2b41 --- /dev/null +++ b/Sprites/UI/MenuBackground.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2hv7m7d036n3" +path="res://.godot/imported/MenuBackground.png-ae80389e015b0174776d23dfc346fe81.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/UI/MenuBackground.png" +dest_files=["res://.godot/imported/MenuBackground.png-ae80389e015b0174776d23dfc346fe81.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 diff --git a/Sprites/UI/MenuBackgroundSmall.aseprite b/Sprites/UI/MenuBackgroundSmall.aseprite new file mode 100644 index 00000000..41e1a9bf --- /dev/null +++ b/Sprites/UI/MenuBackgroundSmall.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f796a630cc8f726ae634bbabe80aa294da9203f9a28da05fde935e18d92de85f +size 463 diff --git a/Sprites/UI/MenuBackgroundSmall.png b/Sprites/UI/MenuBackgroundSmall.png new file mode 100644 index 00000000..f591d0f0 --- /dev/null +++ b/Sprites/UI/MenuBackgroundSmall.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e21bc670b16f9714c6c7e65866b95b8b213ad8168bfeda714ecab666dadffa3 +size 124 diff --git a/Sprites/UI/MenuBackgroundSmall.png.import b/Sprites/UI/MenuBackgroundSmall.png.import new file mode 100644 index 00000000..6cdadb52 --- /dev/null +++ b/Sprites/UI/MenuBackgroundSmall.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d0obc2svu8ege" +path="res://.godot/imported/MenuBackgroundSmall.png-873cc7d2aca7f8580286de1347378bd3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/UI/MenuBackgroundSmall.png" +dest_files=["res://.godot/imported/MenuBackgroundSmall.png-873cc7d2aca7f8580286de1347378bd3.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