diff --git a/ui/icons/main_menu/continue.png b/ui/icons/main_menu/continue.png new file mode 100644 index 0000000..02edd20 Binary files /dev/null and b/ui/icons/main_menu/continue.png differ diff --git a/ui/icons/main_menu/continue.png.import b/ui/icons/main_menu/continue.png.import new file mode 100644 index 0000000..e3d25cf --- /dev/null +++ b/ui/icons/main_menu/continue.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dnogslv6pkde2" +path="res://.godot/imported/continue.png-fafa146157a4e8f701945c30397c79a9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/main_menu/continue.png" +dest_files=["res://.godot/imported/continue.png-fafa146157a4e8f701945c30397c79a9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/ui/icons/main_menu/new_game.png b/ui/icons/main_menu/new_game.png new file mode 100644 index 0000000..cceebbd Binary files /dev/null and b/ui/icons/main_menu/new_game.png differ diff --git a/ui/icons/main_menu/new_game.png.import b/ui/icons/main_menu/new_game.png.import new file mode 100644 index 0000000..8f78965 --- /dev/null +++ b/ui/icons/main_menu/new_game.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://s4g23wyojpq7" +path="res://.godot/imported/new_game.png-5da99ab1028706b5372a3db83952bc63.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/main_menu/new_game.png" +dest_files=["res://.godot/imported/new_game.png-5da99ab1028706b5372a3db83952bc63.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/ui/pause_menu.tscn b/ui/pause_menu.tscn index 941e26e..dbea731 100644 --- a/ui/pause_menu.tscn +++ b/ui/pause_menu.tscn @@ -13,7 +13,7 @@ [ext_resource type="Texture2D" path="res://ui/icons/pictograms/online_dark.png" id="11_online_dark"] [ext_resource type="Texture2D" path="res://ui/icons/pictograms/save_dark.png" id="12_save_dark"] [ext_resource type="Texture2D" path="res://ui/icons/pictograms/settings_dark.png" id="13_settings_dark"] -[ext_resource type="Texture2D" path="res://ui/icons/pictograms/undo_dark.png" id="14_undo_dark"] +[ext_resource type="Texture2D" path="res://ui/icons/main_menu/continue.png" id="14_continue"] [ext_resource type="Texture2D" path="res://ui/icons/pictograms/x_dark.png" id="15_x_dark"] [node name="PauseMenu" type="Control"] @@ -93,7 +93,7 @@ compact_reference_size = Vector2(608, 448) unique_name_in_owner = true custom_minimum_size = Vector2(0, 0) texture_filter = 1 -icon = ExtResource("14_undo_dark") +icon = ExtResource("14_continue") tooltip_text = "return to game" accessibility_name = "return to game" neutral_size = Vector2(174, 164) diff --git a/ui/title_screen.gd b/ui/title_screen.gd index 7406c17..8fa371e 100644 --- a/ui/title_screen.gd +++ b/ui/title_screen.gd @@ -107,7 +107,6 @@ enum ConfirmationAction { @onready var _delete_button: BubbleButtonType = %DeleteSaveButton @onready var _quit_button: BubbleButtonType = %QuitButton @onready var _join_game_button: BubbleButtonType = %JoinGameButton -@onready var _new_game_label: Label = %NewGameLabel @onready var _delete_save_label: Label = %DeleteSaveLabel @onready var _feedback_label: RichTextLabel = %FeedbackLabel @onready var _confirmation_page: TitleConfirmationBubblePageType = ( @@ -434,7 +433,6 @@ func _update_title_layout() -> void: ) if not _title_settings_transition_active: call_deferred("_capture_title_bubble_rest_position") - _new_game_label.text = "new\ngame" if compact_layout else "new game" _delete_save_label.text = ( "delete\nsave" if compact_layout else "delete save" ) diff --git a/ui/title_screen.tscn b/ui/title_screen.tscn index febc43b..7c098ef 100644 --- a/ui/title_screen.tscn +++ b/ui/title_screen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3] +[gd_scene load_steps=21 format=3] [ext_resource type="Script" path="res://ui/title_screen.gd" id="1_script"] [ext_resource type="Theme" path="res://ui/game_theme.tres" id="2_theme"] @@ -15,6 +15,8 @@ [ext_resource type="Texture2D" path="res://ui/icons/pictograms/settings_dark.png" id="13_settings_dark"] [ext_resource type="Texture2D" path="res://ui/icons/pictograms/x_dark.png" id="14_x_dark"] [ext_resource type="PackedScene" path="res://ui/title_credits_page.tscn" id="15_credits_page"] +[ext_resource type="Texture2D" path="res://ui/icons/main_menu/continue.png" id="16_continue"] +[ext_resource type="Texture2D" path="res://ui/icons/main_menu/new_game.png" id="17_new_game"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_title_water"] shader = ExtResource("4_water_shader") @@ -261,7 +263,10 @@ offset_left = 123.0 offset_top = 86.0 offset_right = 307.0 offset_bottom = 264.0 -text = "continue" +texture_filter = 1 +icon = ExtResource("16_continue") +tooltip_text = "continue" +accessibility_name = "continue" script = ExtResource("7_bubble_button") profile = ExtResource("9_bubble_profile") neutral_size = Vector2(184, 178) @@ -281,13 +286,16 @@ offset_left = 42.0 offset_top = 4.0 offset_right = 170.0 offset_bottom = 126.0 +texture_filter = 1 +icon = ExtResource("17_new_game") +tooltip_text = "new game" +accessibility_name = "new game" script = ExtResource("7_bubble_button") profile = ExtResource("9_bubble_profile") neutral_size = Vector2(128, 122) desktop_anchor = Vector2(106, 65) compact_anchor = Vector2(106, 68) compact_minimum_size = Vector2(84, 84) -label_control_path = NodePath("NewGameLabel") minimum_font_size = 15 maximum_font_size = 23 horizontal_amplitude = 2.3 @@ -297,21 +305,6 @@ motion_phase = 1.2 deformation_amplitude = 0.018 deformation_period = 5.9 -[node name="NewGameLabel" type="Label" parent="ResponsiveTitleStage/TitlePresentationScaleRoot/Center/MainContent/ButtonCenter/BubbleLayoutSlot/BubbleMotionRoot/BubbleField/NewGameButton"] -unique_name_in_owner = true -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_colors/font_color = Color(0.035, 0.145, 0.22, 1) -theme_override_constants/line_spacing = -3 -text = "new game" -horizontal_alignment = 1 -vertical_alignment = 1 - [node name="SettingsButton" type="Button" parent="ResponsiveTitleStage/TitlePresentationScaleRoot/Center/MainContent/ButtonCenter/BubbleLayoutSlot/BubbleMotionRoot/BubbleField"] unique_name_in_owner = true offset_left = 264.0