diff --git a/tests/title_credits_validation.gd b/tests/title_credits_validation.gd index d1e4c8c..abee11e 100644 --- a/tests/title_credits_validation.gd +++ b/tests/title_credits_validation.gd @@ -34,6 +34,10 @@ func _run() -> void: await process_frame _expect(credits_button != null, "title menu exposes a credits button") + _expect( + credits_button.icon != null and credits_button.text.is_empty(), + "credits bubble uses its authored icon", + ) _expect(credits_page != null, "title screen contains the credits page") _expect(not credits_page.visible, "credits page starts closed") _expect( @@ -145,15 +149,19 @@ func _run() -> void: var chillnfill_credit := credits_page.get_node( "Paper/Margin/Layout/Columns/CreativeCredits/ChillnfillCredit" ) as Label + var adamantris_name := credits_page.get_node( + "Paper/Margin/Layout/Columns/CreativeCredits/AdamantrisName" + ) as Label + var adamantris_credit := credits_page.get_node( + "Paper/Margin/Layout/Columns/CreativeCredits/AdamantrisCredit" + ) as Label var tekgator_name := credits_page.get_node( "Paper/Margin/Layout/Columns/CreativeCredits/TekgatorName" ) as Label var tekgator_credit := credits_page.get_node( "Paper/Margin/Layout/Columns/CreativeCredits/TekgatorCredit" ) as Label - var creative_credits := credits_page.get_node( - "Paper/Margin/Layout/Columns/CreativeCredits" - ) as VBoxContainer + var credits_paper := credits_page.get_node("Paper") as PanelContainer var audio_credits := credits_page.get_node( "Paper/Margin/Layout/Columns/AdditionalCredits/AudioCredits" ) as Label @@ -170,6 +178,15 @@ func _run() -> void: "trees and bridges" in chillnfill_credit.text.to_lower(), "in-game credits describe the supplied model families", ) + _expect( + adamantris_name.text == "adamantris", + "in-game credits name adamantris", + ) + _expect( + "hand-net model" in adamantris_credit.text.to_lower() + and "texture artwork" in adamantris_credit.text.to_lower(), + "in-game credits describe adamantris's hand-net contribution", + ) _expect( tekgator_name.text == "Tekgator", "in-game credits name Tekgator", @@ -187,10 +204,10 @@ func _run() -> void: "in-game credits name kim's animalese voice contribution", ) _expect( - Rect2(Vector2.ZERO, creative_credits.size).encloses( - Rect2(tekgator_credit.position, tekgator_credit.size) + credits_paper.get_global_rect().encloses( + tekgator_credit.get_global_rect() ), - "Tekgator's credit stays inside the authored credits column", + "contributor credits stay inside the authored credits panel", ) title_screen.queue_free() diff --git a/ui/icons/main_menu/credits.png b/ui/icons/main_menu/credits.png new file mode 100644 index 0000000..9578e07 Binary files /dev/null and b/ui/icons/main_menu/credits.png differ diff --git a/ui/icons/main_menu/credits.png.import b/ui/icons/main_menu/credits.png.import new file mode 100644 index 0000000..5693a18 --- /dev/null +++ b/ui/icons/main_menu/credits.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://lii5gr5mfogl" +path="res://.godot/imported/credits.png-eb9b4fb8e11f84c6aa04c8aed2e18040.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ui/icons/main_menu/credits.png" +dest_files=["res://.godot/imported/credits.png-eb9b4fb8e11f84c6aa04c8aed2e18040.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/title_credits_page.tscn b/ui/title_credits_page.tscn index c81dc25..566bee7 100644 --- a/ui/title_credits_page.tscn +++ b/ui/title_credits_page.tscn @@ -114,6 +114,19 @@ theme_override_font_sizes/font_size = 15 text = "original 3d models for character bodies and arms, ears and tails, and multiple world props and decorative assets including trees and bridges" autowrap_mode = 2 +[node name="AdamantrisName" type="Label" parent="Paper/Margin/Layout/Columns/CreativeCredits"] +layout_mode = 2 +theme_override_colors/font_color = Color(0.902, 0.969, 0.969, 1) +theme_override_font_sizes/font_size = 18 +text = "adamantris" + +[node name="AdamantrisCredit" type="Label" parent="Paper/Margin/Layout/Columns/CreativeCredits"] +layout_mode = 2 +theme_override_colors/font_color = Color(0.624, 0.812, 0.824, 1) +theme_override_font_sizes/font_size = 15 +text = "original hand-net model and texture artwork" +autowrap_mode = 2 + [node name="TekgatorName" type="Label" parent="Paper/Margin/Layout/Columns/CreativeCredits"] layout_mode = 2 theme_override_colors/font_color = Color(0.902, 0.969, 0.969, 1) diff --git a/ui/title_screen.tscn b/ui/title_screen.tscn index 64a5ec7..4edac50 100644 --- a/ui/title_screen.tscn +++ b/ui/title_screen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3] +[gd_scene load_steps=22 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"] @@ -17,6 +17,7 @@ [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"] +[ext_resource type="Texture2D" path="res://ui/icons/main_menu/credits.png" id="18_credits"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_title_water"] shader = ExtResource("4_water_shader") @@ -333,7 +334,8 @@ offset_left = 330.0 offset_top = 125.0 offset_right = 414.0 offset_bottom = 207.0 -text = "credits" +texture_filter = 1 +icon = ExtResource("18_credits") tooltip_text = "credits" accessibility_name = "credits" script = ExtResource("7_bubble_button")