From 22a655474f3fc8a743d05afa2e59f5c075b05610 Mon Sep 17 00:00:00 2001 From: betalars Date: Sun, 15 Sep 2024 15:50:21 +0200 Subject: [PATCH] misc --- .../youth_room/import/cheeky-city.glb.import | 2 + src/logic-scenes/startup/startup.tscn | 164 +++++++++--------- 2 files changed, 81 insertions(+), 85 deletions(-) diff --git a/src/base-environments/youth_room/import/cheeky-city.glb.import b/src/base-environments/youth_room/import/cheeky-city.glb.import index c404394..9b1ae8f 100644 --- a/src/base-environments/youth_room/import/cheeky-city.glb.import +++ b/src/base-environments/youth_room/import/cheeky-city.glb.import @@ -17,6 +17,7 @@ nodes/root_type="Node3D" nodes/root_name="Scene Root" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,6 +29,7 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={ "materials": { diff --git a/src/logic-scenes/startup/startup.tscn b/src/logic-scenes/startup/startup.tscn index 13d57c3..f9afb99 100644 --- a/src/logic-scenes/startup/startup.tscn +++ b/src/logic-scenes/startup/startup.tscn @@ -12,123 +12,121 @@ script/source = "extends Panel @onready var show_navigation_buttons = $\"CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/margin/show nav ui\" func _ready(): - theme = State.current_main_theme - State.theme_changed.connect(func change_theme(new_theme): theme = new_theme) + theme = State.current_main_theme + State.theme_changed.connect(func change_theme(new_theme): theme = new_theme) + TranslationServer.set_locale(\"de\") func starting(): - $\"CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/navbuttons/Next\".grab_focus() + $\"CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/navbuttons/Next\".grab_focus() func _on_reduce_motion_toggled(toggled_on): - State.reduce_motion = toggled_on + State.reduce_motion = toggled_on # toggle for disable rendering func _on_disable_rendering_toggled(toggled_on): - State.disable_rendering = toggled_on + State.disable_rendering = toggled_on # toggle for simplified controls func _on_simplified_controls_toggled(toggled_on): - State.simplified_navigation = toggled_on # this is how you reach the global state - show_navigation_buttons.disabled = not toggled_on # if simpl. controls was toggled - disabled = false + State.simplified_navigation = toggled_on # this is how you reach the global state + show_navigation_buttons.disabled = not toggled_on # if simpl. controls was toggled - disabled = false # toggle for show nav buttons func _on_show_nav_ui_toggled(toggled_on): - State.show_navigation_buttons = toggled_on + State.show_navigation_buttons = toggled_on # toggle streaming notes func _on_streaming_notes_toggled(toggled_on): - State.streaming_content_notes = toggled_on + State.streaming_content_notes = toggled_on # select font # still needs handling to change the style func _on_font_style_selected(index): - match index: - 0: - return - 1: - State.current_main_theme = preload(\"res://logic-scenes/themes/easy-handwriting.theme\") - print_debug(\"easy handwriting selected\") - #owner.theme.set_font(\"NanumPenScript.ttf\") - return - 2: - State.current_main_theme = preload(\"res://logic-scenes/themes/serif.theme\") - #owner.theme.set_font(\"Eczar-VariableFont_wght.ttf\") - return - 3: - State.current_main_theme = preload(\"res://logic-scenes/themes/hyperlegible.theme\") - #owner.theme.set_font(\"AtkinsonHyperlegible.ttf\") - return - 4: - State.current_main_theme = preload(\"res://logic-scenes/themes/system.theme\") - #owner.theme.set_font(SystemFont.fallbacks[0]) - return + match index: + 0: + return + 1: + State.current_main_theme = preload(\"res://logic-scenes/themes/easy-handwriting.theme\") + print_debug(\"easy handwriting selected\") + #owner.theme.set_font(\"NanumPenScript.ttf\") + return + 2: + State.current_main_theme = preload(\"res://logic-scenes/themes/serif.theme\") + #owner.theme.set_font(\"Eczar-VariableFont_wght.ttf\") + return + 3: + State.current_main_theme = preload(\"res://logic-scenes/themes/hyperlegible.theme\") + #owner.theme.set_font(\"AtkinsonHyperlegible.ttf\") + return + 4: + State.current_main_theme = preload(\"res://logic-scenes/themes/system.theme\") + #owner.theme.set_font(SystemFont.fallbacks[0]) + return func _on_subtitle_option_selected(index): - match index: - 0: - State.enable_subtitles = false - State.enable_closed_caption = false - 1: - State.enable_subtitles = true - State.enable_closed_caption = false - 2: - State.enable_subtitles = true - State.enable_closed_caption = true + match index: + 0: + State.enable_subtitles = false + State.enable_closed_caption = false + 1: + State.enable_subtitles = true + State.enable_closed_caption = false + 2: + State.enable_subtitles = true + State.enable_closed_caption = true - print_debug(State.print_settings()) + print_debug(State.print_settings()) # Volume Settings func _on_mute_soundtrack_toggled(button_pressed): - AudioServer.set_bus_mute(AudioServer.get_bus_index(\"music\"),button_pressed) + AudioServer.set_bus_mute(AudioServer.get_bus_index(\"music\"),button_pressed) func _on_mute_sfx_toggled(button_pressed): - AudioServer.set_bus_mute(AudioServer.get_bus_index(\"sfx\"),button_pressed) + AudioServer.set_bus_mute(AudioServer.get_bus_index(\"sfx\"),button_pressed) func _on_music_volume_changed(value): - AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"music\"), linear_to_db(value/2)) + AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"music\"), linear_to_db(value/2)) func _on_sfx_volume_changed(value): - AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"sfx\"), linear_to_db(value/2)) + AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"sfx\"), linear_to_db(value/2)) func _on_text_volume_changed(value): - AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"text\"), linear_to_db(value)) + AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"text\"), linear_to_db(value)) func _on_master_volume_changed(value): - AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"Master\"), linear_to_db(value)) + AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"Master\"), linear_to_db(value)) # Final Page func _on_content_notes_toggled(button_pressed): - State.show_content_notes = button_pressed + State.show_content_notes = button_pressed func _on_provide_summaries_toggled(button_pressed): - State.provide_summaries = button_pressed + State.provide_summaries = button_pressed func _on_allow_skipping_toggled(button_pressed): - State.allow_skipping = button_pressed - + State.allow_skipping = button_pressed + func hide(): - get_parent().get_child(0).get_ready() - var child_tween = create_tween() - child_tween.tween_property($CenterContainer, \"modulate\", Color(1, 1, 1, 0), .5) - await child_tween.finished - var self_tween = create_tween() - self_tween.tween_property(self, \"modulate\", Color(1, 1, 1, 0), .5) - await self_tween.finished - self.visible = false - - - + get_parent().get_child(0).get_ready() + var child_tween = create_tween() + child_tween.tween_property($CenterContainer, \"modulate\", Color(1, 1, 1, 0), .5) + await child_tween.finished + var self_tween = create_tween() + self_tween.tween_property(self, \"modulate\", Color(1, 1, 1, 0), .5) + await self_tween.finished + self.visible = false " [sub_resource type="GDScript" id="GDScript_ia432"] @@ -225,12 +223,13 @@ layout_mode = 1 anchors_preset = 5 anchor_left = 0.5 anchor_right = 0.5 -offset_left = -223.5 -offset_top = 24.0 -offset_right = 223.5 -offset_bottom = 62.0 +offset_left = -283.5 +offset_top = 23.0 +offset_right = 283.5 +offset_bottom = 61.0 grow_horizontal = 2 text = "Acessibility, Disclaimers and Content Notes" +horizontal_alignment = 1 [node name="CenterContainer" type="CenterContainer" parent="."] layout_mode = 1 @@ -263,17 +262,19 @@ layout_mode = 2 [node name="TabContainer" type="TabContainer" parent="CenterContainer/PanelContainer/VBoxContainer"] layout_mode = 2 +current_tab = 0 tabs_visible = false use_hidden_tabs_for_min_size = true script = SubResource("GDScript_ia432") [node name="physical Accessibility" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer"] layout_mode = 2 +metadata/_tab_index = 0 [node name="Label" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility"] layout_mode = 2 theme_type_variation = &"HeaderLarge" -text = "physical Accessibility" +text = "Accessibility" [node name="Label4" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility"] layout_mode = 2 @@ -298,7 +299,7 @@ layout_mode = 2 [node name="disable rendering" type="CheckBox" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/margin2"] layout_mode = 2 disabled = true -text = "disable rendering" +text = "disable video" [node name="simplified controls" type="CheckBox" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2"] layout_mode = 2 @@ -328,10 +329,9 @@ layout_mode = 2 [node name="font settings" type="OptionButton" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/GridContainer"] layout_mode = 2 size_flags_vertical = 4 -item_count = 5 selected = 1 +item_count = 5 popup/item_0/text = "messy handwriting" -popup/item_0/id = 0 popup/item_0/disabled = true popup/item_1/text = "easy handwriting" popup/item_1/id = 1 @@ -354,13 +354,12 @@ layout_mode = 2 layout_mode = 2 size_flags_vertical = 4 disabled = true -item_count = 3 selected = 1 +item_count = 3 popup/item_0/text = "none" -popup/item_0/id = 0 popup/item_1/text = "spoken text" popup/item_1/id = 1 -popup/item_2/text = "text and audio" +popup/item_2/text = "closed captions" popup/item_2/id = 2 [node name="Label3" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility/Container2/GridContainer"] @@ -398,9 +397,11 @@ text = "go back" [node name="Audio Settings" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer"] visible = false layout_mode = 2 +metadata/_tab_index = 1 [node name="Label" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Audio Settings"] layout_mode = 2 +theme_type_variation = &"HeaderLarge" text = "Audio Settings" [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Audio Settings"] @@ -450,8 +451,7 @@ value = 0.5 [node name="Label4" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Audio Settings/VBoxContainer/GridContainer"] layout_mode = 2 -text = "Speech -" +text = "Speech" [node name="Speech" type="HSlider" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Audio Settings/VBoxContainer/GridContainer"] layout_mode = 2 @@ -463,8 +463,7 @@ value = 0.5 [node name="Label5" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Audio Settings/VBoxContainer/GridContainer"] layout_mode = 2 -text = "Sum -" +text = "Sum" [node name="Sum" type="HSlider" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Audio Settings/VBoxContainer/GridContainer"] layout_mode = 2 @@ -506,6 +505,7 @@ text = "go back" visible = false custom_minimum_size = Vector2(512, 0) layout_mode = 2 +metadata/_tab_index = 2 [node name="Label" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes"] layout_mode = 2 @@ -601,7 +601,6 @@ text = "Mental Health Acessibility Options" script = SubResource("GDScript_rhtho") [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5"] -visible = false layout_mode = 2 [node name="RichTextLabel2" type="RichTextLabel" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer"] @@ -610,7 +609,7 @@ layout_mode = 2 bbcode_enabled = true text = "[ul] You can always Pause using Escape or Spacebar -You can always choose to just get a neutral summary of scenes or skip them entirely +You can always choose to just get a neutral summary of scenes or skip them entirely [/ul]" fit_content = true @@ -622,11 +621,6 @@ text = "show content notes during the game" layout_mode = 2 text = "allow me to skip scenes" -[node name="provide_summary" type="CheckBox" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer"] -layout_mode = 2 -disabled = true -text = "When skipping a scene, give me a neutral summary." - [node name="navbuttons" type="VSplitContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes"] layout_mode = 2 size_flags_horizontal = 4 @@ -643,6 +637,7 @@ text = "go back" [node name="Managing Expectations" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer"] visible = false layout_mode = 2 +metadata/_tab_index = 3 [node name="VSeparator" type="VSeparator" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Managing Expectations"] custom_minimum_size = Vector2(0, 50) @@ -652,7 +647,7 @@ layout_mode = 2 layout_mode = 2 bbcode_enabled = true text = "[center][i]I assure you I did my best, -but I am only human and this is just one game.[/i][/center]" +But I am only human and this is just one game.[/i][/center]" fit_content = true [node name="VSeparator2" type="VSeparator" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Managing Expectations"] @@ -737,7 +732,6 @@ text = "I never put in much effort for Homework" [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/show content Notes" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/show content Notes" method="set_disabled" binds= [true]] [connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer/content_notes" to="." method="_on_content_notes_toggled"] [connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer/allow_skipping" to="." method="_on_provide_summaries_toggled"] -[connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer/provide_summary" to="." method="_on_allow_skipping_toggled"] [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/navbuttons/Next" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer" method="next"] [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/navbuttons/previous" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer" method="previous"] [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Managing Expectations/navbuttons/Next" to="." method="hide"]