From 522080d52e14899d1d18e41489f45e86f9a6bf4e Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Tue, 18 Jul 2023 22:02:35 +0200 Subject: [PATCH] Added settings for final page (+ some notes on the global state) --- src/logic-scenes/startup/startup.tscn | 30 ++++++++++++++++++++++++++- src/singletons/global_state.gd | 8 +++---- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/logic-scenes/startup/startup.tscn b/src/logic-scenes/startup/startup.tscn index f6048de..863f283 100644 --- a/src/logic-scenes/startup/startup.tscn +++ b/src/logic-scenes/startup/startup.tscn @@ -26,6 +26,11 @@ func _on_simplified_controls_toggled(button_pressed): func _on_show_nav_ui_toggled(button_pressed): State.show_navigation_buttons = button_pressed +# toggle streaming notes +func _on_streaming_notes_toggled(button_pressed): + State.streaming_content_notes = button_pressed + + # select font # still needs handling to change the style func _on_font_style_selected(index): @@ -66,6 +71,8 @@ func _on_subtitle_option_selected(index): 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) @@ -89,6 +96,19 @@ func _on_text_volume_changed(value): func _on_master_volume_changed(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 + + +func _on_provide_summaries_toggled(button_pressed): + State.provide_summaries = button_pressed + + +func _on_allow_skipping_toggled(button_pressed): + State.allow_skipping = button_pressed " [sub_resource type="GDScript" id="GDScript_ia432"] @@ -371,7 +391,7 @@ size_flags_horizontal = 3 size_flags_vertical = 4 max_value = 1.0 step = 0.05 -value = 0.5 +value = 1.0 ticks_on_borders = true script = ExtResource("3_q2gbh") @@ -561,6 +581,10 @@ text = "show content notes relevant to the current context" layout_mode = 2 text = "prompt me with content notes before playing a scene" +[node name="CheckBox3" type="CheckBox" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer"] +layout_mode = 2 +text = "I would like to be able to skip scenes and get a summary." + [node name="navbuttons" type="VSplitContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes"] layout_mode = 2 size_flags_horizontal = 4 @@ -663,7 +687,11 @@ text = "I stream this game, please show content notes." [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Audio Settings/navbuttons/previous" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer" method="previous"] [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/show content Notes" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes" method="show"] [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/CheckBox" to="." method="_on_content_notes_toggled"] +[connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer/CheckBox2" to="." method="_on_provide_summaries_toggled"] +[connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Content Notes/ScrollContainer/Content Notes/VBoxContainer5/VBoxContainer/CheckBox3" 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="CenterContainer/PanelContainer/VBoxContainer/TabContainer" method="next"] [connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/TabContainer/Managing Expectations/navbuttons/previous" to="CenterContainer/PanelContainer/VBoxContainer/TabContainer" method="previous"] +[connection signal="toggled" from="continue/CheckBox" to="." method="_on_streaming_notes_toggled"] diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd index 29c4248..b1c8a23 100644 --- a/src/singletons/global_state.gd +++ b/src/singletons/global_state.gd @@ -6,10 +6,10 @@ var simplified_navigation:bool = false # simplified controls var show_navigation_buttons: bool = false # show nav ui var enable_subtitles: bool = false # ItemList2 var enable_closed_caption: bool = false # ItemList2 -var reduce_motion: bool = false -var streaming_content_notes: bool = false -var show_content_notes: bool = false -var provide_summaries: bool = false +var reduce_motion: bool = false # ? +var streaming_content_notes: bool = false # continue/CheckBox +var show_content_notes: bool = false # ContentNotes/.../Checkbox +var provide_summaries: bool = false # ContentNotes/.../Checkbox2 var allow_skipping: bool = false var stage_list:Array = []