From 515462b6319c29a55c06ed3d580b1530565e7791 Mon Sep 17 00:00:00 2001 From: Tiger Jove Date: Wed, 10 Dec 2025 18:07:45 +0100 Subject: [PATCH] chore: trying to clean up some of the structure --- .../shaders/stars.gdshader | 0 .../shaders/stars.gdshader.uid | 0 .../textures/sky_textures.png | 0 .../textures/sky_textures.png.import | 6 +- .../textures/sky_textures_2.png | 0 .../textures/sky_textures_2.png.import | 6 +- .../{intro_scene => intro}/textures/star.png | 0 .../textures/star.png.import | 6 +- .../transition/subway_sequence.gd | 10 +- .../transition/transition.tscn | 29 +- .../volunteer_room/scenes/autism.tscn | 2 +- .../volunteer_room/scenes/burnout.tscn | 2 +- .../scenes/eating_challenges.tscn | 2 +- .../volunteer_room/scenes/self_advocacy.tscn | 2 +- .../volunteer_room/scenes/therapy_uni.tscn | 2 +- .../scenes/therapy_volunteer.tscn | 2 +- .../volunteer_room/scenes/trans.tscn | 2 +- .../volunteer_room/scenes/trauma.tscn | 2 +- .../volunteer_room/shared_flat.gd | 4 +- .../volunteer_room/volunteer_room.tscn | 4 +- .../youth_room/room_handle.gd | 2 +- .../youth_room/scnees/childhood.tscn | 2 +- .../youth_room/scnees/draven.tscn | 2 +- .../youth_room/scnees/jui_jutsu.tscn | 4 +- .../youth_room/scnees/voice_training.tscn | 2 +- .../youth_room/show_room.tscn | 6 +- .../youth_room/youth_room.tscn | 4 +- src/{ => code}/button_themer.gd | 0 src/{ => code}/button_themer.gd.uid | 0 ...sync-conflict-20250815-000312-SLN3AAF.tscn | 731 ---------------- src/demo-main.tscn | 787 ------------------ src/demo-warning.svg | 181 ---- src/demo-warning.svg.import | 43 - src/dev-util/sky prototyping.tscn | 4 +- src/logic-scenes/boot/boot.gd | 1 + src/logic-scenes/boot/boot.gd.uid | 1 + src/logic-scenes/boot/boot.tscn | 6 + src/logic-scenes/card_picker/card_picker.gd | 3 +- .../disclaimer}/disclaimer.tscn | 2 +- src/logic-scenes/startup/startup.tscn | 4 +- src/project.godot | 3 +- src/{ => singletons/main}/main.gd | 0 src/{ => singletons/main}/main.gd.uid | 0 src/{ => singletons/main}/main.tscn | 12 +- .../main menu => ui/menu_main}/Main Menu.gd | 0 .../menu_main}/Main Menu.gd.uid | 0 .../menu_main}/acessability_settings.gd | 0 .../menu_main}/acessability_settings.gd.uid | 0 .../menu_main}/acessability_settings.tscn | 2 +- .../menu_main}/audio_settings.gd | 0 .../menu_main}/audio_settings.gd.uid | 0 .../menu_main}/audio_settings.tscn | 2 +- .../menu_main}/content_settings.gd | 0 .../menu_main}/content_settings.gd.uid | 0 .../menu_main}/content_settings.tscn | 2 +- .../menu_main}/gameplay_settings.gd | 0 .../menu_main}/gameplay_settings.gd.uid | 0 .../menu_main}/gameplay_settings.tscn | 2 +- .../main menu => ui/menu_main}/logo.png | 0 .../menu_main}/logo.png.import | 6 +- .../main menu => ui/menu_main}/main_menu.gd | 0 .../menu_main}/main_menu.gd.uid | 0 src/{ => ui/menu_main}/main_menu.tscn | 16 +- .../main menu => ui/menu_main}/pause_menu.gd | 0 .../menu_main}/pause_menu.gd.uid | 0 .../menu_main}/privacy_settings.gd | 0 .../menu_main}/privacy_settings.gd.uid | 0 .../menu_main}/privacy_settings.tscn | 2 +- .../menu_main}/save_game_display.gd | 0 .../menu_main}/save_game_display.gd.uid | 0 .../menu_main}/save_game_list.gd | 0 .../menu_main}/save_game_list.gd.uid | 0 .../menu_main}/video_settings.gd | 0 .../menu_main}/video_settings.gd.uid | 0 .../menu_main}/video_settings.tscn | 2 +- .../misc => ui/skip_control}/skip_control.gd | 0 .../skip_control}/skip_control.gd.uid | 0 .../skip_control}/skip_control.tscn | 8 +- 78 files changed, 94 insertions(+), 1829 deletions(-) rename src/base-environments/{intro_scene => intro}/shaders/stars.gdshader (100%) rename src/base-environments/{intro_scene => intro}/shaders/stars.gdshader.uid (100%) rename src/base-environments/{intro_scene => intro}/textures/sky_textures.png (100%) rename src/base-environments/{intro_scene => intro}/textures/sky_textures.png.import (74%) rename src/base-environments/{intro_scene => intro}/textures/sky_textures_2.png (100%) rename src/base-environments/{intro_scene => intro}/textures/sky_textures_2.png.import (73%) rename src/base-environments/{intro_scene => intro}/textures/star.png (100%) rename src/base-environments/{intro_scene => intro}/textures/star.png.import (76%) rename src/{ => code}/button_themer.gd (100%) rename src/{ => code}/button_themer.gd.uid (100%) delete mode 100644 src/demo-main.sync-conflict-20250815-000312-SLN3AAF.tscn delete mode 100644 src/demo-main.tscn delete mode 100644 src/demo-warning.svg delete mode 100644 src/demo-warning.svg.import create mode 100644 src/logic-scenes/boot/boot.gd create mode 100644 src/logic-scenes/boot/boot.gd.uid create mode 100644 src/logic-scenes/boot/boot.tscn rename src/{ => logic-scenes/disclaimer}/disclaimer.tscn (99%) rename src/{ => singletons/main}/main.gd (100%) rename src/{ => singletons/main}/main.gd.uid (100%) rename src/{ => singletons/main}/main.tscn (99%) rename src/{logic-scenes/main menu => ui/menu_main}/Main Menu.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/Main Menu.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/acessability_settings.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/acessability_settings.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/acessability_settings.tscn (98%) rename src/{logic-scenes/main menu => ui/menu_main}/audio_settings.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/audio_settings.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/audio_settings.tscn (99%) rename src/{logic-scenes/main menu => ui/menu_main}/content_settings.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/content_settings.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/content_settings.tscn (99%) rename src/{logic-scenes/main menu => ui/menu_main}/gameplay_settings.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/gameplay_settings.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/gameplay_settings.tscn (98%) rename src/{logic-scenes/main menu => ui/menu_main}/logo.png (100%) rename src/{logic-scenes/main menu => ui/menu_main}/logo.png.import (77%) rename src/{logic-scenes/main menu => ui/menu_main}/main_menu.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/main_menu.gd.uid (100%) rename src/{ => ui/menu_main}/main_menu.tscn (96%) rename src/{logic-scenes/main menu => ui/menu_main}/pause_menu.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/pause_menu.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/privacy_settings.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/privacy_settings.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/privacy_settings.tscn (98%) rename src/{logic-scenes/main menu => ui/menu_main}/save_game_display.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/save_game_display.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/save_game_list.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/save_game_list.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/video_settings.gd (100%) rename src/{logic-scenes/main menu => ui/menu_main}/video_settings.gd.uid (100%) rename src/{logic-scenes/main menu => ui/menu_main}/video_settings.tscn (99%) rename src/{logic-scenes/misc => ui/skip_control}/skip_control.gd (100%) rename src/{logic-scenes/misc => ui/skip_control}/skip_control.gd.uid (100%) rename src/{logic-scenes/misc => ui/skip_control}/skip_control.tscn (97%) diff --git a/src/base-environments/intro_scene/shaders/stars.gdshader b/src/base-environments/intro/shaders/stars.gdshader similarity index 100% rename from src/base-environments/intro_scene/shaders/stars.gdshader rename to src/base-environments/intro/shaders/stars.gdshader diff --git a/src/base-environments/intro_scene/shaders/stars.gdshader.uid b/src/base-environments/intro/shaders/stars.gdshader.uid similarity index 100% rename from src/base-environments/intro_scene/shaders/stars.gdshader.uid rename to src/base-environments/intro/shaders/stars.gdshader.uid diff --git a/src/base-environments/intro_scene/textures/sky_textures.png b/src/base-environments/intro/textures/sky_textures.png similarity index 100% rename from src/base-environments/intro_scene/textures/sky_textures.png rename to src/base-environments/intro/textures/sky_textures.png diff --git a/src/base-environments/intro_scene/textures/sky_textures.png.import b/src/base-environments/intro/textures/sky_textures.png.import similarity index 74% rename from src/base-environments/intro_scene/textures/sky_textures.png.import rename to src/base-environments/intro/textures/sky_textures.png.import index a2f7488..d2efc57 100644 --- a/src/base-environments/intro_scene/textures/sky_textures.png.import +++ b/src/base-environments/intro/textures/sky_textures.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cfwa5dq3flk4b" -path="res://.godot/imported/sky_textures.png-1bc387632f79299cfe768a08f95b36df.ctex" +path="res://.godot/imported/sky_textures.png-1ba6043dcaf28986e3e05f5171fee2b4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base-environments/intro_scene/textures/sky_textures.png" -dest_files=["res://.godot/imported/sky_textures.png-1bc387632f79299cfe768a08f95b36df.ctex"] +source_file="res://base-environments/intro/textures/sky_textures.png" +dest_files=["res://.godot/imported/sky_textures.png-1ba6043dcaf28986e3e05f5171fee2b4.ctex"] [params] diff --git a/src/base-environments/intro_scene/textures/sky_textures_2.png b/src/base-environments/intro/textures/sky_textures_2.png similarity index 100% rename from src/base-environments/intro_scene/textures/sky_textures_2.png rename to src/base-environments/intro/textures/sky_textures_2.png diff --git a/src/base-environments/intro_scene/textures/sky_textures_2.png.import b/src/base-environments/intro/textures/sky_textures_2.png.import similarity index 73% rename from src/base-environments/intro_scene/textures/sky_textures_2.png.import rename to src/base-environments/intro/textures/sky_textures_2.png.import index 9e7df84..3bfd45b 100644 --- a/src/base-environments/intro_scene/textures/sky_textures_2.png.import +++ b/src/base-environments/intro/textures/sky_textures_2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dabnlcnuticww" -path="res://.godot/imported/sky_textures_2.png-a1913291aa98549785b8c12dd6aa67b9.ctex" +path="res://.godot/imported/sky_textures_2.png-79f9797d0c2a05f0a7e04941a93a9158.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base-environments/intro_scene/textures/sky_textures_2.png" -dest_files=["res://.godot/imported/sky_textures_2.png-a1913291aa98549785b8c12dd6aa67b9.ctex"] +source_file="res://base-environments/intro/textures/sky_textures_2.png" +dest_files=["res://.godot/imported/sky_textures_2.png-79f9797d0c2a05f0a7e04941a93a9158.ctex"] [params] diff --git a/src/base-environments/intro_scene/textures/star.png b/src/base-environments/intro/textures/star.png similarity index 100% rename from src/base-environments/intro_scene/textures/star.png rename to src/base-environments/intro/textures/star.png diff --git a/src/base-environments/intro_scene/textures/star.png.import b/src/base-environments/intro/textures/star.png.import similarity index 76% rename from src/base-environments/intro_scene/textures/star.png.import rename to src/base-environments/intro/textures/star.png.import index d8b6a22..c331cde 100644 --- a/src/base-environments/intro_scene/textures/star.png.import +++ b/src/base-environments/intro/textures/star.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bblv1y6l4re8y" -path="res://.godot/imported/star.png-8963d4096c36d0531880a451c851e16d.ctex" +path="res://.godot/imported/star.png-a94df91fbef396160044c05bed745e1c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://base-environments/intro_scene/textures/star.png" -dest_files=["res://.godot/imported/star.png-8963d4096c36d0531880a451c851e16d.ctex"] +source_file="res://base-environments/intro/textures/star.png" +dest_files=["res://.godot/imported/star.png-a94df91fbef396160044c05bed745e1c.ctex"] [params] diff --git a/src/base-environments/transition/subway_sequence.gd b/src/base-environments/transition/subway_sequence.gd index 04cc776..1e8b60b 100644 --- a/src/base-environments/transition/subway_sequence.gd +++ b/src/base-environments/transition/subway_sequence.gd @@ -48,7 +48,7 @@ func pull_save_state(save: SaveGame) -> void: save.sequences_enabled = Scenes.enabled_sequences save.current_room = State.rooms.ADULTHOOD save_game = save - + func prepare_transition(): for child in %Stations.get_children(): if child is Node3D: @@ -73,7 +73,7 @@ func on_left_train_enter(_body): %SubwayMap.current_station = Scenes.id.ADULT_CHRISTMAS await get_tree().create_timer(5.0).timeout %Train2.get_child(0).door_open = true - + await get_tree().create_timer(5.0).timeout if not changeover: %Train2.get_child(0).door_open = false @@ -127,9 +127,9 @@ func on_right_train_enter(_body): %SubwayMap.current_station = Scenes.id.ADULT_UNI await get_tree().create_timer(5.0).timeout %Train.get_child(0).door_open = true - + await get_tree().create_timer(5.0).timeout - + if not changeover: %Train.get_child(0).door_open = false on_second_transition() @@ -164,7 +164,7 @@ func on_left_train_exit(_body): if on_second_platform and not on_final: changeover = true %ShedulePlayer_R.play("train_arriving") - + func on_right_train_exit(_body): if on_second_platform and not on_final: changeover = true diff --git a/src/base-environments/transition/transition.tscn b/src/base-environments/transition/transition.tscn index 8cd08c3..eb3f1d9 100644 --- a/src/base-environments/transition/transition.tscn +++ b/src/base-environments/transition/transition.tscn @@ -958,23 +958,14 @@ viewport_path = NodePath("Displays/Train_Display_R") [sub_resource type="ViewportTexture" id="ViewportTexture_csq32"] viewport_path = NodePath("Displays/Train_Display_L") -[sub_resource type="Animation" id="Animation_symoa"] -resource_name = "init" - -[sub_resource type="Animation" id="Animation_820wi"] -resource_name = "volunteer_exit" +[sub_resource type="Animation" id="Animation_o0t2h"] +resource_name = "dnd_to_uni" [sub_resource type="Animation" id="Animation_e75no"] resource_name = "dnd_to_volunteer" -[sub_resource type="Animation" id="Animation_c3uo7"] -resource_name = "volunteer_to_uni" - -[sub_resource type="Animation" id="Animation_r7fs3"] -resource_name = "volunteer_to_therapy" - -[sub_resource type="Animation" id="Animation_o0t2h"] -resource_name = "dnd_to_uni" +[sub_resource type="Animation" id="Animation_symoa"] +resource_name = "init" [sub_resource type="Animation" id="Animation_jleua"] resource_name = "uni_to_burnout" @@ -985,6 +976,15 @@ resource_name = "uni_to_therapy" [sub_resource type="Animation" id="Animation_dm3ia"] resource_name = "uni_to_volunteer" +[sub_resource type="Animation" id="Animation_820wi"] +resource_name = "volunteer_exit" + +[sub_resource type="Animation" id="Animation_r7fs3"] +resource_name = "volunteer_to_therapy" + +[sub_resource type="Animation" id="Animation_c3uo7"] +resource_name = "volunteer_to_uni" + [sub_resource type="AnimationLibrary" id="AnimationLibrary_xcyoy"] _data = { &"dnd_to_uni": SubResource("Animation_o0t2h"), @@ -1058,7 +1058,7 @@ transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6.24 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7804413, 0, 0) [node name="MeshInstance3D8" type="MeshInstance3D" parent="Train/Visuals/Train"] -transform = Transform3D(-42.01, 4.075623e-07, 4.3401022e-07, -6.330816e-06, -2.8743172, -0.1808367, -5.9450385e-06, 0.1808367, -2.8743172, -3.9468384, 1.286, 2.488358) +transform = Transform3D(-42.01, 4.075623e-07, 4.340103e-07, -6.330816e-06, -2.8743172, -0.1808367, -5.9450394e-06, 0.1808367, -2.8743172, -3.9468384, 1.286, 2.488358) visible = false material_override = SubResource("ShaderMaterial_0vobo") mesh = SubResource("QuadMesh_ppxbm") @@ -1391,6 +1391,7 @@ unique_name_in_owner = true [node name="Displays" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.003971815, 9.536743e-07, 0.0078623295) +visible = false [node name="Train_Display_L" type="SubViewport" parent="Displays"] transparent_bg = true diff --git a/src/base-environments/volunteer_room/scenes/autism.tscn b/src/base-environments/volunteer_room/scenes/autism.tscn index f532557..4572102 100644 --- a/src/base-environments/volunteer_room/scenes/autism.tscn +++ b/src/base-environments/volunteer_room/scenes/autism.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_hmyim"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_n54tc"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="5_xi27m"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="6_h63aa"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="6_h63aa"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="7_71rn2"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="8_3ljef"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="9_nvo2d"] diff --git a/src/base-environments/volunteer_room/scenes/burnout.tscn b/src/base-environments/volunteer_room/scenes/burnout.tscn index 39c89af..c8490f0 100644 --- a/src/base-environments/volunteer_room/scenes/burnout.tscn +++ b/src/base-environments/volunteer_room/scenes/burnout.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_280pk"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_ji3tv"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_iwhp8"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_iufku"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_iufku"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="5_4ni3m"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_eqxbt"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_pthbi"] diff --git a/src/base-environments/volunteer_room/scenes/eating_challenges.tscn b/src/base-environments/volunteer_room/scenes/eating_challenges.tscn index 15fd1f5..47cba79 100644 --- a/src/base-environments/volunteer_room/scenes/eating_challenges.tscn +++ b/src/base-environments/volunteer_room/scenes/eating_challenges.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_86ec2"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_abtq0"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_pcx8t"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_w4vem"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_w4vem"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="5_0dsyx"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_fiu8d"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_sh3ja"] diff --git a/src/base-environments/volunteer_room/scenes/self_advocacy.tscn b/src/base-environments/volunteer_room/scenes/self_advocacy.tscn index 34365b8..cbd6f03 100644 --- a/src/base-environments/volunteer_room/scenes/self_advocacy.tscn +++ b/src/base-environments/volunteer_room/scenes/self_advocacy.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_8utmq"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_gfeis"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_u0xc1"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_62vlf"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_62vlf"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="5_6h2ud"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_44s4k"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_rpv31"] diff --git a/src/base-environments/volunteer_room/scenes/therapy_uni.tscn b/src/base-environments/volunteer_room/scenes/therapy_uni.tscn index 97ea324..ebdc538 100644 --- a/src/base-environments/volunteer_room/scenes/therapy_uni.tscn +++ b/src/base-environments/volunteer_room/scenes/therapy_uni.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_uxp36"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_27dlw"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_6qw45"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_pf7gl"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_pf7gl"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_ecg2n"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_ld7n3"] diff --git a/src/base-environments/volunteer_room/scenes/therapy_volunteer.tscn b/src/base-environments/volunteer_room/scenes/therapy_volunteer.tscn index e58b50f..0661090 100644 --- a/src/base-environments/volunteer_room/scenes/therapy_volunteer.tscn +++ b/src/base-environments/volunteer_room/scenes/therapy_volunteer.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_ym0sv"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_00crh"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_3iy8l"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_32a0r"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_32a0r"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="5_bfggg"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_hdxjv"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_xkdnh"] diff --git a/src/base-environments/volunteer_room/scenes/trans.tscn b/src/base-environments/volunteer_room/scenes/trans.tscn index 29694e1..a4c9d84 100644 --- a/src/base-environments/volunteer_room/scenes/trans.tscn +++ b/src/base-environments/volunteer_room/scenes/trans.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_d3khy"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_fe2un"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_uj7tn"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_05o76"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_05o76"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="5_0b3yt"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_4fkwm"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_ede0y"] diff --git a/src/base-environments/volunteer_room/scenes/trauma.tscn b/src/base-environments/volunteer_room/scenes/trauma.tscn index 710de3a..72f0025 100644 --- a/src/base-environments/volunteer_room/scenes/trauma.tscn +++ b/src/base-environments/volunteer_room/scenes/trauma.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_1pvsj"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_5x2mw"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_xe0ue"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_apcmj"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_apcmj"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="5_aytqp"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="6_l131v"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="7_rd1kp"] diff --git a/src/base-environments/volunteer_room/shared_flat.gd b/src/base-environments/volunteer_room/shared_flat.gd index e6a8a4c..52239a5 100644 --- a/src/base-environments/volunteer_room/shared_flat.gd +++ b/src/base-environments/volunteer_room/shared_flat.gd @@ -23,9 +23,9 @@ func start_room(): func _ready(): id = State.rooms.ADULTHOOD - + Scenes.scene_finished.connect(_on_scene_finished) - + card_picker.cards_picked.connect(card_board.populate_board) func pull_save_state(save: SaveGame) -> void: diff --git a/src/base-environments/volunteer_room/volunteer_room.tscn b/src/base-environments/volunteer_room/volunteer_room.tscn index 52e6132..eb57501 100644 --- a/src/base-environments/volunteer_room/volunteer_room.tscn +++ b/src/base-environments/volunteer_room/volunteer_room.tscn @@ -21,8 +21,8 @@ [ext_resource type="PackedScene" uid="uid://brk4hjdf2x81a" path="res://logic-scenes/card_picker/card_picker.tscn" id="18_upyac"] [ext_resource type="PackedScene" uid="uid://bnskiyx1sksww" path="res://logic-scenes/board/physics-board.tscn" id="19_ci4rn"] [ext_resource type="PackedScene" uid="uid://citwb7f4dl3l1" path="res://thank-you.tscn" id="20_e1uao"] -[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro_scene/shaders/stars.gdshader" id="22_e1uao"] -[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro_scene/textures/sky_textures_2.png" id="23_my8p4"] +[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro/shaders/stars.gdshader" id="22_e1uao"] +[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro/textures/sky_textures_2.png" id="23_my8p4"] [sub_resource type="BoxMesh" id="BoxMesh_tmbwx"] size = Vector3(1, 2.778, 1.353) diff --git a/src/base-environments/youth_room/room_handle.gd b/src/base-environments/youth_room/room_handle.gd index e5689f1..d772094 100644 --- a/src/base-environments/youth_room/room_handle.gd +++ b/src/base-environments/youth_room/room_handle.gd @@ -36,7 +36,7 @@ func get_ready(): func _ready(): Scenes.scene_finished.connect(_on_scene_finished) - + card_picker.cards_picked.connect(card_board.populate_board) func pull_save_state(save: SaveGame) -> void: diff --git a/src/base-environments/youth_room/scnees/childhood.tscn b/src/base-environments/youth_room/scnees/childhood.tscn index 54c629d..c962093 100644 --- a/src/base-environments/youth_room/scnees/childhood.tscn +++ b/src/base-environments/youth_room/scnees/childhood.tscn @@ -4,7 +4,7 @@ [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="1_bkq30"] [ext_resource type="ArrayMesh" uid="uid://bfc3d4g40n0wy" path="res://logic-scenes/collectable/import/old-mask.res" id="2_jrxfv"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_o63m7"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="4_q0fee"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="4_q0fee"] [ext_resource type="AudioStream" uid="uid://dfblaqsfgm8le" path="res://base-environments/youth_room/audio/Childhood.wav" id="7_51c6s"] [ext_resource type="AudioStream" uid="uid://b5d4c6n2mw02s" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_TheaterAG_Deutsch_newt.wav" id="7_htg3l"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="8_51c6s"] diff --git a/src/base-environments/youth_room/scnees/draven.tscn b/src/base-environments/youth_room/scnees/draven.tscn index 74fdf88..2d7bd8e 100644 --- a/src/base-environments/youth_room/scnees/draven.tscn +++ b/src/base-environments/youth_room/scnees/draven.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_o2rjr"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_xwj2j"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="4_qgfj8"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="5_ddnfo"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="5_ddnfo"] [ext_resource type="AudioStream" uid="uid://cvlqvlrc6lqru" path="res://base-environments/youth_room/audio/draven-de.wav" id="5_f6vs7"] [ext_resource type="AudioStream" uid="uid://c4clagpd3ril0" path="res://base-environments/youth_room/audio/Ambient 5.ogg" id="6_7f2et"] [ext_resource type="AudioStream" uid="uid://d1r1tvb1paup4" path="res://base-environments/youth_room/audio/draeven.ogg" id="7_nbb1o"] diff --git a/src/base-environments/youth_room/scnees/jui_jutsu.tscn b/src/base-environments/youth_room/scnees/jui_jutsu.tscn index 1fed45e..12f7604 100644 --- a/src/base-environments/youth_room/scnees/jui_jutsu.tscn +++ b/src/base-environments/youth_room/scnees/jui_jutsu.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://base-environments/youth_room/scnees/scene_player.gd" id="1_aby4n"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_k4i8e"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="4_s5qj7"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="5_0qiyf"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="5_0qiyf"] [ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="5_s5qj7"] [ext_resource type="Texture2D" uid="uid://kpmk21d8rlso" path="res://logic-scenes/board/particle_textures/star.png" id="6_0qiyf"] [ext_resource type="AudioStream" uid="uid://bwh60165c3saj" path="res://base-environments/youth_room/audio/lisa_youth_voice.ogg" id="7_bvh45"] @@ -821,8 +821,6 @@ offset_right = -424.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_aby4n") -story_array = PackedStringArray("Why do i still have this junk lying around? its not like I want to do ju jutsu ever again. I just fucked it.", "I mean I did enjoy it while it lasted. Being able to properly hit people was great.", "It gave me the confidence to intimidate students, that were begging to get folded and - as I only once actually got to do that - it also was a great vent for anger. ", "I mean my tits just about killed me during warmup and the changing room really didn\'t need mirrors - thank you I know my hips are fat and disgusting - but at least there was Lukas.", "He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.", "Also: my math grades pretty much leaped for my final year in high school thanks to him.", "He also helped me so much with jiu jitsu, as he properly floored me when I slipped up. ", "So Fighting for wins with him was actually rewarding even tho more often than not I ended up having to tap out.", "We also had my first proper kiss. I thought I loved him. But now?", "He was weird that evening. Even more huggy and hyperactive than usual.", "We were under my bed, reading my secret comic stash when I got tired of the floor and told him we should go upstairs.", "We had a play fight on my mattress. I\'ve never seen him fight like this.", "His fingers Curled across my Skin without grabbing me, like he would normally do. And he let me win", "… with this smirk on his face.", "I rolled over exhausted when suddenly he sat on top of me, a pearl of sweat dropped from his nose on my throat.", "He started undoing his shirt.", "Do you have condoms?", "Yes, of course everybody has Why did he ask that?", "I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.", "My body didn\'t move. It didn\'t say a word when the butterflies tried to escape from its stomach as he kissed it.", "I … observed him from afar. He … didn\'t seem to notice, that I had left.", "That I didn\'t return to kiss him goodbye. That I didn\'t hug him when he went home.", "My hands knocked on my brother’s door. He let me lie on his carpet.", "I slowly returned.", "\"How did it go?, Fabian asked.", "\"It was moist”, I said.", "“That usually helps.”", "He laughed awkwardly. I just wanted to also laugh, but curled into a ball and cried.", "It took him a while to say something. “I … you … it\'s fine Lisa. I know it hurts the first time.”", "He gently stroked the back I was curling towards him.", "That was good. He was a sweet angel. Why must he be so bad at comforting?") -paragraph_lengths = PackedInt32Array(3, 6, 8, 9, 10, 12, 15, 16, 17, 18, 20, 22, 24, 25, 26, 27, 28, 29, 31, 32, 33, 32, 31, 30) progress = 17.0 [node name="PanelContainer" type="PanelContainer" parent="."] diff --git a/src/base-environments/youth_room/scnees/voice_training.tscn b/src/base-environments/youth_room/scnees/voice_training.tscn index 096a051..7cfa853 100644 --- a/src/base-environments/youth_room/scnees/voice_training.tscn +++ b/src/base-environments/youth_room/scnees/voice_training.tscn @@ -5,7 +5,7 @@ [ext_resource type="ArrayMesh" uid="uid://bhfqffldbvdgq" path="res://base-environments/youth_room/import/youth_special_meshes_comic_book_1.res" id="3_ho85h"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="4_ayw8a"] [ext_resource type="ArrayMesh" uid="uid://byjfgvx7jeal" path="res://base-environments/youth_room/import/youth_special_meshes_comic_book_2.res" id="4_kn83e"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="5_b3y80"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="5_b3y80"] [ext_resource type="AudioStream" uid="uid://d15ltkofdggly" path="res://base-environments/youth_room/audio/Voice-Training-Workshop.wav" id="8_ho85h"] [ext_resource type="AudioStream" uid="uid://dupcfwi54fpjx" path="res://base-environments/youth_room/audio/FoM_Lisa_Kindheit_Voice_Acting_deutsch_newt.wav" id="8_kn83e"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="9_kn83e"] diff --git a/src/base-environments/youth_room/show_room.tscn b/src/base-environments/youth_room/show_room.tscn index 9308a21..1e3bc80 100644 --- a/src/base-environments/youth_room/show_room.tscn +++ b/src/base-environments/youth_room/show_room.tscn @@ -14,7 +14,7 @@ [ext_resource type="AudioStream" uid="uid://cho5neuxkvpyh" path="res://base-environments/youth_room/audio/Voice Loop.wav" id="12_kmdcg"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="13_h8ip1"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="14_t30qm"] -[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="15_n6nrr"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="15_n6nrr"] [ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="16_t6yr4"] [ext_resource type="Texture2D" uid="uid://kpmk21d8rlso" path="res://logic-scenes/board/particle_textures/star.png" id="17_ce5x6"] [ext_resource type="Texture2D" uid="uid://bqilajx05t0eb" path="res://logic-scenes/board/particle_textures/void_nomotion.png" id="18_xppl3"] @@ -32,8 +32,8 @@ [ext_resource type="AudioStream" uid="uid://bghjiqkyehs1p" path="res://base-environments/youth_room/import/sounds/rain and thunder.mp3" id="30_ustah"] [ext_resource type="PackedScene" uid="uid://dwtxjvprjyx8p" path="res://base-environments/youth_room/lava-lamp.tscn" id="31_hv11t"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="32_xw563"] -[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro_scene/shaders/stars.gdshader" id="33_v36su"] -[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro_scene/textures/sky_textures_2.png" id="34_g2brt"] +[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro/shaders/stars.gdshader" id="33_v36su"] +[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro/textures/sky_textures_2.png" id="34_g2brt"] [ext_resource type="ArrayMesh" uid="uid://jjrvf8px2ut3" path="res://base-environments/youth_room/shaders/winfow_frames.res" id="35_62hgr"] [ext_resource type="Material" uid="uid://bmu72cnsr8c5e" path="res://base-environments/youth_room/shaders/window.material" id="36_3qqid"] [ext_resource type="PackedScene" uid="uid://bwc2wp7tckm7t" path="res://base-environments/youth_room/outside.tscn" id="37_3deyi"] diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 0a20437..81b688e 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -38,9 +38,9 @@ [ext_resource type="PackedScene" uid="uid://bw47g00bi710i" path="res://base-environments/youth_room/youth_room_visuals.tscn" id="30_dqyng"] [ext_resource type="PackedScene" uid="uid://bwc2wp7tckm7t" path="res://base-environments/youth_room/outside.tscn" id="32_2vgep"] [ext_resource type="Script" uid="uid://br1w2nt4pj8lt" path="res://vfx/post_processing/post_process_shader_template.gd" id="32_corra"] -[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro_scene/shaders/stars.gdshader" id="32_k5rvd"] +[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro/shaders/stars.gdshader" id="32_k5rvd"] [ext_resource type="ArrayMesh" uid="uid://jjrvf8px2ut3" path="res://base-environments/youth_room/shaders/winfow_frames.res" id="32_w6oa5"] -[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro_scene/textures/sky_textures_2.png" id="33_mvrs2"] +[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro/textures/sky_textures_2.png" id="33_mvrs2"] [ext_resource type="Shader" uid="uid://dspme86ky8yj0" path="res://base-environments/youth_room/rainy-window.gdshader" id="35_ea6x8"] [ext_resource type="Texture2D" uid="uid://ds1n0xhxqlp4b" path="res://base-environments/youth_room/shaders/universe_noise.png" id="36_bgk6f"] [ext_resource type="PackedScene" uid="uid://cg70r0102t8nl" path="res://base-environments/youth_room/fairylights.tscn" id="39_q6rov"] diff --git a/src/button_themer.gd b/src/code/button_themer.gd similarity index 100% rename from src/button_themer.gd rename to src/code/button_themer.gd diff --git a/src/button_themer.gd.uid b/src/code/button_themer.gd.uid similarity index 100% rename from src/button_themer.gd.uid rename to src/code/button_themer.gd.uid diff --git a/src/demo-main.sync-conflict-20250815-000312-SLN3AAF.tscn b/src/demo-main.sync-conflict-20250815-000312-SLN3AAF.tscn deleted file mode 100644 index 9469e64..0000000 --- a/src/demo-main.sync-conflict-20250815-000312-SLN3AAF.tscn +++ /dev/null @@ -1,731 +0,0 @@ -[gd_scene load_steps=37 format=3 uid="uid://dxxiyefijv48j"] - -[ext_resource type="Texture2D" uid="uid://d3ewjumh0b0g6" path="res://logic-scenes/main menu/logo.png" id="1_61qpo"] -[ext_resource type="Texture2D" uid="uid://ds1n0xhxqlp4b" path="res://base-environments/youth_room/shaders/universe_noise.png" id="1_t34p3"] -[ext_resource type="Texture2D" uid="uid://sfo05h6uah7b" path="res://import/interface-elements/USK_12.svg" id="2_ncfee"] -[ext_resource type="Texture2D" uid="uid://bdyg065h8vcdi" path="res://base-environments/youth_room/shaders/starlight-textures.png" id="2_s1yf2"] -[ext_resource type="Texture2D" uid="uid://buo4ntxw1vofu" path="res://addons/input_prompts/icons/keyboard/w.png" id="4_8e30h"] -[ext_resource type="Script" uid="uid://bbs1u7ojno7xo" path="res://addons/input_prompts/action_prompt/action_prompt.gd" id="5_6w5b4"] -[ext_resource type="Texture2D" uid="uid://yakqusko3p3h" path="res://addons/input_prompts/icons/keyboard/a.png" id="7_g425y"] -[ext_resource type="Texture2D" uid="uid://b0kuadlp4jw6j" path="res://addons/input_prompts/icons/keyboard/d.png" id="8_kj67n"] -[ext_resource type="Texture2D" uid="uid://bwhf0tx67yj7a" path="res://addons/input_prompts/icons/keyboard/s.png" id="9_xo70c"] -[ext_resource type="Script" uid="uid://0h0lrkntx0uh" path="res://logic-scenes/main menu/pause_menu.gd" id="10_g425y"] -[ext_resource type="PackedScene" uid="uid://u0bwjr5l6nkh" path="res://logic-scenes/main menu/privacy_settings.tscn" id="10_jirkf"] -[ext_resource type="PackedScene" uid="uid://g2a27jwdapai" path="res://logic-scenes/card_burner/card_burner.tscn" id="10_kj67n"] -[ext_resource type="Script" uid="uid://sa15wakvpj2e" path="res://dev-util/bug_button.gd" id="11_kj67n"] -[ext_resource type="PackedScene" uid="uid://b3wlecqvelh22" path="res://logic-scenes/main menu/acessability_settings.tscn" id="11_kt5p7"] -[ext_resource type="PackedScene" uid="uid://citwb7f4dl3l1" path="res://thank-you.tscn" id="13_xo70c"] -[ext_resource type="AudioStream" uid="uid://cho5neuxkvpyh" path="res://base-environments/youth_room/audio/Voice Loop.wav" id="14_k41g6"] - -[sub_resource type="GDScript" id="GDScript_t34p3"] -script/source = "extends Node3D - -var has_stage = false - -var room = preload(\"res://base-environments/youth_room/youth_room.tscn\") -var loaded_room: RoomTemplate - -func _ready() -> void: - State.take_stage(self) - load_room() - State.settings_initialised = true - State.show_content_notes = false - State.text_language = 1 - State.speech_language = 1 - $Menu/VBoxContainer2/PressStart.grab_focus() - Scenes.sign_up_for_sequence(prepare_transition, Scenes.id.TRANSITION, 0) - Scenes.sign_up_for_sequence(transition, Scenes.id.TRANSITION, 2) - if OS.get_locale_language() == \"de\": - $Menu/VBoxContainer/SpeechButton.select(1) - -func prepare_transition(_id): - await get_tree().process_frame - Scenes.continue_sequence(self) - - await get_tree().create_timer(5.0).timeout - loaded_room.prepare_transition() - ResourceLoader.load_threaded_request(\"res://base-environments/transition/first_platform.tscn\") - -func transition(_id, _repeat): - #$TextureRect.texture = get_tree().root.get_texture() - #$TextureRect.visible = true - loaded_room.unload() - var packed_second_room:PackedScene = ResourceLoader.load_threaded_get(\"res://base-environments/transition/first_platform.tscn\") - loaded_room.queue_free() - %Room.add_child(packed_second_room.instantiate()) - await get_tree().create_timer(15.5).timeout - $AudioStreamPlayer/AnimationPlayer.play(\"ending\") - $ending.show() - $ending.mouse_filter = Control.MOUSE_FILTER_STOP - %Room.get_child(0).queue_free() - -func load_room(): - for child in %Room.get_children(): - child.queue_free() - - loaded_room = room.instantiate() - %Room.add_child(loaded_room) - -var in_game: bool -func _on_start_button_pressed(): - in_game = true - var new_save = SaveGame.new() - if DirAccess.dir_exists_absolute( State.user_saves_path ): - var usr_dir = DirAccess.open(State.user_saves_path) - for path in usr_dir.get_files(): - if path.ends_with(\".json\"): - var found_save: = SaveGame.new(\"%s/%s\" % [State.user_saves_path, path.get_basename()]) - if found_save.is_demo: - new_save = found_save - break - - State.active_save_game = new_save - var vis_tween = get_tree().create_tween() - vis_tween.tween_property(%Menu, \"modulate\", Color(1,1,1,0), .3) - await vis_tween.finished - %Menu.visible = false - %Menu.mouse_filter = Control.MouseFilter.MOUSE_FILTER_PASS - loaded_room.start_room() - -func _process(delta: float) -> void: - if Input.is_action_just_pressed(\"reset_demo\"): - _on_reset() - -func _on_reset(): - load_room() - %Menu.modulate = Color.WHITE - %Menu.mouse_filter = Control.MouseFilter.MOUSE_FILTER_STOP - %Menu.visible = true - - -func _on_cn_box_toggled(toggled_on: bool) -> void: - State.show_content_notes = toggled_on - -func _on_motion_box_toggled(toggled_on: bool) -> void: - State.reduce_motion = toggled_on - -func _on_text_button_item_selected(index: int) -> void: - match index: - 0: - State.text_language = 1 - 1: - State.text_language = 2 - -func _on_speech_button_item_selected(index: int) -> void: - State.speech_language = index + 1 - %TextButton.select(1) - -func _unhandled_input(event: InputEvent) -> void: - if event is InputEvent and in_game: - if event.is_action_pressed(\"ui_menu\") and not %Accessibility.is_active: - toggle_pause_menu() - -func show_accessibility_settings(): - %AccessibilityContainer.show() - %Accessibility.is_active = true - await %Accessibility.leave_stage - %AccessibilityContainer.hide() - -func toggle_pause_menu(): - if not get_tree().paused: - get_tree().paused = true - %PauseContainer.show() - Input.mouse_mode = Input.MOUSE_MODE_VISIBLE - else: - get_tree().paused = false - %PauseContainer.hide() - - if State.stage_list[0] is Player: - Input.mouse_mode = Input.MOUSE_MODE_CAPTURED -" - -[sub_resource type="Shader" id="Shader_jirkf"] -code = "shader_type canvas_item; -render_mode blend_premul_alpha; - -uniform float nebula_brightness = 4; -uniform vec2 nebula_scale = vec2(1.5); -uniform sampler2D starlight_noise: repeat_enable; -uniform sampler2D starlight_textures; -uniform float rotation_speed = 0.02; -uniform vec2 rotation_pivot = vec2(.8); -uniform vec2 drift_compensation = vec2(0.1, -0.2); -uniform float noise_strength = 0.2; - -// https://gist.github.com/ayamflow/c06bc0c8a64f985dd431bd0ac5b557cd -vec2 rotateUV(vec2 uv, vec2 pivot, float rotation) -{ - return vec2( - cos(rotation) * (uv.x - pivot.x) + sin(rotation) * (uv.y - pivot.y) + pivot.x, - cos(rotation) * (uv.y - pivot.y) - sin(rotation) * (uv.x - pivot.x) + pivot.y - ); -} - -//clamp(, .0, 1.0 - -void fragment() { - COLOR *= vec4(.0, - texture(starlight_textures,fract(UV*2.0)).x * 2.0*pow(max(sin(TIME + 10.0 * texture(starlight_textures,UV).y), .0), 5.0), - texture(starlight_textures, - clamp( - UV / nebula_scale + drift_compensation + 1.0 * - texture(starlight_noise, rotateUV( - UV / nebula_scale + noise_strength * texture(starlight_noise, rotateUV(UV, -rotation_pivot, TIME*rotation_speed)).yz, - rotation_pivot, TIME*rotation_speed) - ).xz, - .0, 1.0)) - .z * nebula_brightness, - clamp(pow(COLOR.x * 2.5 - (texture(starlight_noise, UV*2.0+TIME*.02).x + 0.8), 1.5), .0, 1.0) - ) * COLOR.w; -} -" - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_k41g6"] -shader = SubResource("Shader_jirkf") -shader_parameter/nebula_brightness = 2.4 -shader_parameter/nebula_scale = Vector2(1.3, 1.6) -shader_parameter/starlight_noise = ExtResource("1_t34p3") -shader_parameter/starlight_textures = ExtResource("2_s1yf2") -shader_parameter/rotation_speed = 0.02 -shader_parameter/rotation_pivot = Vector2(0.8, 0.8) -shader_parameter/drift_compensation = Vector2(0.1, -0.2) -shader_parameter/noise_strength = 0.2 - -[sub_resource type="Gradient" id="Gradient_kt5p7"] -interpolation_color_space = 2 -colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 0) - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_jirkf"] -gradient = SubResource("Gradient_kt5p7") -width = 2048 -height = 1536 -fill = 1 -fill_from = Vector2(0.538462, 0.491453) -fill_to = Vector2(1.3, -0.3) - -[sub_resource type="InputEventKey" id="InputEventKey_kt5p7"] -device = -1 -physical_keycode = 87 -unicode = 119 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_mivr6"] -device = -1 -axis = 1 -axis_value = -1.0 - -[sub_resource type="InputEventKey" id="InputEventKey_52c3j"] -device = -1 -physical_keycode = 65 -unicode = 97 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_b7q2n"] -device = -1 -axis_value = -1.0 - -[sub_resource type="InputEventKey" id="InputEventKey_qhf78"] -device = -1 -physical_keycode = 68 -unicode = 100 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_gatj6"] -device = -1 -axis_value = 1.0 - -[sub_resource type="InputEventKey" id="InputEventKey_ol51q"] -device = -1 -physical_keycode = 83 -unicode = 115 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_2rqk2"] -device = -1 -axis = 1 -axis_value = 1.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_kt5p7"] -bg_color = Color(0.0288289, 0.0448641, 0.121276, 1) -border_width_left = 10 -border_width_top = 10 -border_width_right = 10 -border_width_bottom = 10 -border_color = Color(0.0288289, 0.0448641, 0.121276, 1) -corner_radius_top_left = 20 -corner_radius_top_right = 20 -corner_radius_bottom_right = 20 -corner_radius_bottom_left = 20 -expand_margin_left = 20.0 -expand_margin_right = 20.0 - -[sub_resource type="Shader" id="Shader_gatj6"] -code = "shader_type canvas_item; -render_mode blend_premul_alpha; - -uniform float nebula_brightness = 4; -uniform vec2 nebula_scale = vec2(1.5); -uniform sampler2D starlight_noise: repeat_enable; -uniform sampler2D starlight_textures; -uniform float rotation_speed = 0.02; -uniform vec2 rotation_pivot = vec2(.8); -uniform vec2 drift_compensation = vec2(0.1, -0.2); -uniform float noise_strength = 0.2; - -// https://gist.github.com/ayamflow/c06bc0c8a64f985dd431bd0ac5b557cd -vec2 rotateUV(vec2 uv, vec2 pivot, float rotation) -{ - return vec2( - cos(rotation) * (uv.x - pivot.x) + sin(rotation) * (uv.y - pivot.y) + pivot.x, - cos(rotation) * (uv.y - pivot.y) - sin(rotation) * (uv.x - pivot.x) + pivot.y - ); -} - -//clamp(, .0, 1.0 - -void fragment() { - COLOR *= vec4(.0, - texture(starlight_textures,fract(UV*2.0)).x * 2.0*pow(max(sin(TIME + 10.0 * texture(starlight_textures,UV).y), .0), 5.0), - texture(starlight_textures, - clamp( - UV / nebula_scale + drift_compensation + 1.0 * - texture(starlight_noise, rotateUV( - UV / nebula_scale + noise_strength * texture(starlight_noise, rotateUV(UV, -rotation_pivot, TIME*rotation_speed)).yz, - rotation_pivot, TIME*rotation_speed) - ).xz, - .0, 1.0)) - .z * nebula_brightness, - clamp(pow(COLOR.x * 2.5 - (texture(starlight_noise, UV*2.0+TIME*.02).x + 0.8), 1.5), .0, 1.0) - ) * COLOR.w; -} -" - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ol51q"] -shader = SubResource("Shader_gatj6") -shader_parameter/nebula_brightness = 2.4 -shader_parameter/nebula_scale = Vector2(1.3, 1.6) -shader_parameter/starlight_noise = ExtResource("1_t34p3") -shader_parameter/starlight_textures = ExtResource("2_s1yf2") -shader_parameter/rotation_speed = 0.02 -shader_parameter/rotation_pivot = Vector2(0.8, 0.8) -shader_parameter/drift_compensation = Vector2(0.1, -0.2) -shader_parameter/noise_strength = 0.2 - -[sub_resource type="Gradient" id="Gradient_2rqk2"] -interpolation_color_space = 2 -colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 0) - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_w8m28"] -gradient = SubResource("Gradient_2rqk2") -width = 2048 -height = 1536 -fill = 1 -fill_from = Vector2(0.538462, 0.491453) -fill_to = Vector2(1.3, -0.3) - -[sub_resource type="Animation" id="Animation_kt5p7"] -resource_name = "ending" -length = 120.0 -tracks/0/type = "audio" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 8.34472, -"stream": ExtResource("14_k41g6") -}], -"times": PackedFloat32Array(0.517639) -} -tracks/0/use_blend = true - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_mivr6"] -_data = { -&"ending": SubResource("Animation_kt5p7") -} - -[node name="DemoMain" type="Node3D"] -process_mode = 3 -script = SubResource("GDScript_t34p3") - -[node name="Room" type="Node3D" parent="."] -unique_name_in_owner = true - -[node name="Menu" type="Control" parent="."] -unique_name_in_owner = true -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="Panel" type="Panel" parent="Menu"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="TextureRect3" type="TextureRect" parent="Menu/Panel"] -material = SubResource("ShaderMaterial_k41g6") -layout_mode = 0 -offset_left = 2073.0 -offset_top = 1497.0 -offset_right = 4353.0 -offset_bottom = 3530.0 -rotation = -3.14159 -texture = SubResource("GradientTexture2D_jirkf") - -[node name="TextureRect2" type="TextureRect" parent="Menu/Panel"] -visible = false -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -395.0 -offset_top = -447.0 -offset_right = 1011.0 -offset_bottom = 959.0 -grow_horizontal = 0 -grow_vertical = 0 -scale = Vector2(0.2, 0.2) -texture = ExtResource("2_ncfee") - -[node name="Label" type="Label" parent="Menu/Panel/TextureRect2"] -layout_mode = 1 -anchors_preset = 7 -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -offset_left = -988.0 -offset_top = 99.0002 -offset_right = -590.0 -offset_bottom = 187.0 -grow_horizontal = 2 -grow_vertical = 0 -scale = Vector2(5, 5) -text = "*Als Messe-Demo geprüft. Entspricht angestrebtem finalen Rating." -horizontal_alignment = 1 -autowrap_mode = 2 - -[node name="VBoxContainer2" type="VBoxContainer" parent="Menu"] -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -256.0 -offset_top = -281.5 -offset_right = 256.0 -offset_bottom = 281.5 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="TextureRect" type="TextureRect" parent="Menu/VBoxContainer2"] -custom_minimum_size = Vector2(512, 512) -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 4 -texture = ExtResource("1_61qpo") -expand_mode = 2 - -[node name="PressStart" type="Button" parent="Menu/VBoxContainer2"] -layout_mode = 2 -theme_override_font_sizes/font_size = 45 -text = "Start the Demo!" - -[node name="VBoxContainer" type="VBoxContainer" parent="Menu"] -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -392.0 -offset_top = -310.0 -offset_right = -78.0 -offset_bottom = -92.0 -grow_horizontal = 0 -grow_vertical = 0 - -[node name="Label" type="Label" parent="Menu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderMedium" -text = "Accessibility" - -[node name="CNBox" type="CheckBox" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "show Content Notes" - -[node name="MotionBox" type="CheckBox" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "reduce motion and flickering" - -[node name="A11Y" type="Button" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "More Options" - -[node name="Label3" type="Label" parent="Menu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderMedium" -text = "Spoken Text" - -[node name="SpeechButton" type="OptionButton" parent="Menu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -selected = 0 -item_count = 2 -popup/item_0/text = "englisch" -popup/item_0/id = 0 -popup/item_1/text = "deutsch" -popup/item_1/id = 1 - -[node name="Label2" type="Label" parent="Menu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderMedium" -text = "Written Text" - -[node name="TextButton" type="OptionButton" parent="Menu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -selected = 0 -item_count = 2 -popup/item_0/text = "englisch" -popup/item_0/id = 1 -popup/item_1/text = "deutsch" -popup/item_1/id = 2 - -[node name="Button" type="Button" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "Privacy Info" - -[node name="Control" type="Control" parent="Menu"] -layout_mode = 1 -anchors_preset = 2 -anchor_top = 1.0 -anchor_bottom = 1.0 -offset_top = -40.0 -offset_right = 40.0 -grow_vertical = 0 - -[node name="ActionPrompt" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 134.0 -offset_top = -282.0 -offset_right = 234.0 -offset_bottom = -182.0 -texture = ExtResource("4_8e30h") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_forwards" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_kt5p7"), SubResource("InputEventJoypadMotion_mivr6")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="ActionPrompt2" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 70.0 -offset_top = -187.0 -offset_right = 170.0 -offset_bottom = -87.0 -texture = ExtResource("7_g425y") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_left" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_52c3j"), SubResource("InputEventJoypadMotion_b7q2n")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="ActionPrompt4" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 247.0 -offset_top = -187.0 -offset_right = 347.0 -offset_bottom = -87.0 -texture = ExtResource("8_kj67n") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_right" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_qhf78"), SubResource("InputEventJoypadMotion_gatj6")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="ActionPrompt3" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 158.0 -offset_top = -187.0 -offset_right = 258.0 -offset_bottom = -87.0 -texture = ExtResource("9_xo70c") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_backwards" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_ol51q"), SubResource("InputEventJoypadMotion_2rqk2")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="Label" type="Label" parent="Menu/Control"] -layout_mode = 0 -offset_left = 72.0 -offset_top = -89.0 -offset_right = 374.0 -offset_bottom = -40.0 -theme_type_variation = &"HeaderMedium" -text = "Move trough the room" - -[node name="PrivacyPanel" type="PanelContainer" parent="Menu"] -visible = false -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -701.5 -offset_top = -464.5 -offset_right = 701.5 -offset_bottom = 464.5 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") - -[node name="PrivacyAndDataProtection" parent="Menu/PrivacyPanel" instance=ExtResource("10_jirkf")] -layout_mode = 2 - -[node name="TextureRect" type="TextureRect" parent="."] -visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 - -[node name="CardBurner" parent="." instance=ExtResource("10_kj67n")] -visible = false - -[node name="PauseContainer" type="CenterContainer" parent="."] -unique_name_in_owner = true -visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="TextureRect" type="TextureRect" parent="PauseContainer"] -material = SubResource("ShaderMaterial_ol51q") -layout_mode = 2 -texture = SubResource("GradientTexture2D_w8m28") - -[node name="PauseMenu" type="PanelContainer" parent="PauseContainer"] -unique_name_in_owner = true -layout_mode = 2 -script = ExtResource("10_g425y") - -[node name="VBoxContainer" type="VBoxContainer" parent="PauseContainer/PauseMenu"] -layout_mode = 2 - -[node name="Label" type="Label" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderLarge" -text = "Game Paused" - -[node name="ResumeButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -text = "Resume" - -[node name="A11Y" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -text = "Accessibility" - -[node name="BugButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -script = ExtResource("11_kj67n") -metadata/_custom_type_script = "uid://sa15wakvpj2e" - -[node name="ToMenuButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -visible = false -layout_mode = 2 -text = "Return to Menu" - -[node name="ToSettingsButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -visible = false -layout_mode = 2 -text = "Open Settings" - -[node name="ToDesktopButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -text = "Quit to Desktop" - -[node name="HSeparator" type="HSeparator" parent="PauseContainer/PauseMenu/VBoxContainer"] -custom_minimum_size = Vector2(0, 20) -layout_mode = 2 - -[node name="FindHelplineButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -text = "Find Help-Lines" - -[node name="Label2" type="Label" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -text = "opens findahelpline.com" -horizontal_alignment = 1 - -[node name="SkipStoryButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -visible = false -layout_mode = 2 -text = "Skip this Story" - -[node name="ending" parent="." instance=ExtResource("13_xo70c")] -visible = false -mouse_filter = 2 - -[node name="AccessibilityContainer" type="CenterContainer" parent="."] -unique_name_in_owner = true -visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="AccessibilityPanel" type="PanelContainer" parent="AccessibilityContainer"] -unique_name_in_owner = true -layout_mode = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") - -[node name="Accessibility" parent="AccessibilityContainer/AccessibilityPanel" instance=ExtResource("11_kt5p7")] -unique_name_in_owner = true -layout_mode = 2 - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] - -[node name="AnimationPlayer" type="AnimationPlayer" parent="AudioStreamPlayer"] -libraries = { -&"": SubResource("AnimationLibrary_mivr6") -} - -[connection signal="pressed" from="Menu/VBoxContainer2/PressStart" to="." method="_on_start_button_pressed"] -[connection signal="toggled" from="Menu/VBoxContainer/CNBox" to="." method="_on_cn_box_toggled"] -[connection signal="toggled" from="Menu/VBoxContainer/MotionBox" to="." method="_on_motion_box_toggled"] -[connection signal="pressed" from="Menu/VBoxContainer/A11Y" to="." method="show_accessibility_settings"] -[connection signal="item_selected" from="Menu/VBoxContainer/SpeechButton" to="." method="_on_speech_button_item_selected"] -[connection signal="item_selected" from="Menu/VBoxContainer/TextButton" to="." method="_on_text_button_item_selected"] -[connection signal="pressed" from="Menu/VBoxContainer/Button" to="Menu/PrivacyPanel" method="show"] -[connection signal="leave_stage" from="Menu/PrivacyPanel/PrivacyAndDataProtection" to="Menu/PrivacyPanel" method="hide"] -[connection signal="pressed" from="PauseContainer/PauseMenu/VBoxContainer/A11Y" to="." method="show_accessibility_settings"] diff --git a/src/demo-main.tscn b/src/demo-main.tscn deleted file mode 100644 index 6033073..0000000 --- a/src/demo-main.tscn +++ /dev/null @@ -1,787 +0,0 @@ -[gd_scene load_steps=41 format=3 uid="uid://cd63barv73rfx"] - -[ext_resource type="Texture2D" uid="uid://d3ewjumh0b0g6" path="res://logic-scenes/main menu/logo.png" id="1_61qpo"] -[ext_resource type="Texture2D" uid="uid://ds1n0xhxqlp4b" path="res://base-environments/youth_room/shaders/universe_noise.png" id="1_t34p3"] -[ext_resource type="Texture2D" uid="uid://sfo05h6uah7b" path="res://import/interface-elements/USK_12.svg" id="2_ncfee"] -[ext_resource type="Texture2D" uid="uid://bdyg065h8vcdi" path="res://base-environments/youth_room/shaders/starlight-textures.png" id="2_s1yf2"] -[ext_resource type="Texture2D" uid="uid://buo4ntxw1vofu" path="res://addons/input_prompts/icons/keyboard/w.png" id="4_8e30h"] -[ext_resource type="Script" uid="uid://bbs1u7ojno7xo" path="res://addons/input_prompts/action_prompt/action_prompt.gd" id="5_6w5b4"] -[ext_resource type="Texture2D" uid="uid://dep3kuio0xnui" path="res://import/interface-elements/lower_corner.png" id="5_b7q2n"] -[ext_resource type="Script" uid="uid://cxton1pffwxk4" path="res://button_themer.gd" id="6_qhf78"] -[ext_resource type="Texture2D" uid="uid://yakqusko3p3h" path="res://addons/input_prompts/icons/keyboard/a.png" id="7_g425y"] -[ext_resource type="Texture2D" uid="uid://b0kuadlp4jw6j" path="res://addons/input_prompts/icons/keyboard/d.png" id="8_kj67n"] -[ext_resource type="Texture2D" uid="uid://bwhf0tx67yj7a" path="res://addons/input_prompts/icons/keyboard/s.png" id="9_xo70c"] -[ext_resource type="Script" uid="uid://0h0lrkntx0uh" path="res://logic-scenes/main menu/pause_menu.gd" id="10_g425y"] -[ext_resource type="PackedScene" uid="uid://u0bwjr5l6nkh" path="res://logic-scenes/main menu/privacy_settings.tscn" id="10_jirkf"] -[ext_resource type="PackedScene" uid="uid://g2a27jwdapai" path="res://logic-scenes/card_burner/card_burner.tscn" id="10_kj67n"] -[ext_resource type="Script" uid="uid://sa15wakvpj2e" path="res://dev-util/bug_button.gd" id="11_kj67n"] -[ext_resource type="PackedScene" uid="uid://b3wlecqvelh22" path="res://logic-scenes/main menu/acessability_settings.tscn" id="11_kt5p7"] -[ext_resource type="PackedScene" uid="uid://gmxenhavh1lp" path="res://logic-scenes/main menu/video_settings.tscn" id="11_mivr6"] -[ext_resource type="PackedScene" uid="uid://citwb7f4dl3l1" path="res://thank-you.tscn" id="13_xo70c"] -[ext_resource type="AudioStream" uid="uid://cho5neuxkvpyh" path="res://base-environments/youth_room/audio/Voice Loop.wav" id="14_k41g6"] - -[sub_resource type="GDScript" id="GDScript_t34p3"] -script/source = "extends Node3D - -var has_stage = false: - set(stage): - if stage: - if not is_node_ready(): - await ready - await get_tree().process_frame - %PressStart.grab_focus() - has_stage = stage - -var room = preload(\"res://base-environments/youth_room/youth_room.tscn\") -var loaded_room: RoomTemplate - -func _ready() -> void: - State.take_stage(self) - load_room() - State.settings_initialised = true - State.show_content_notes = false - State.text_language = 1 - State.speech_language = 1 - Scenes.sign_up_for_sequence(prepare_transition, Scenes.id.TRANSITION, 0) - Scenes.sign_up_for_sequence(transition, Scenes.id.TRANSITION, 2) - if OS.get_locale_language() == \"de\": - $Menu/VBoxContainer/SpeechButton.select(1) - $Menu/VBoxContainer/SpeechButton.item_selected.emit(1) - - -func prepare_transition(_id): - await get_tree().process_frame - Scenes.continue_sequence(self) - - await get_tree().create_timer(5.0).timeout - loaded_room.prepare_transition() - ResourceLoader.load_threaded_request(\"res://base-environments/transition/first_platform.tscn\") - -func transition(_id, _repeat): - #$TextureRect.texture = get_tree().root.get_texture() - #$TextureRect.visible = true - while ResourceLoader.load_threaded_get_status(\"res://base-environments/transition/first_platform.tscn\") != ResourceLoader.THREAD_LOAD_IN_PROGRESS: - await get_tree().process_frame - loaded_room.unload() - var packed_second_room:PackedScene = ResourceLoader.load_threaded_get(\"res://base-environments/transition/first_platform.tscn\") - loaded_room.queue_free() - %Room.add_child(packed_second_room.instantiate()) - await get_tree().create_timer(15.5).timeout - $AudioStreamPlayer/AnimationPlayer.play(\"ending\") - $ending.show() - $ending.mouse_filter = Control.MOUSE_FILTER_STOP - %Room.get_child(0).queue_free() - -func load_room(): - for child in %Room.get_children(): - child.queue_free() - - loaded_room = room.instantiate() - %Room.add_child(loaded_room) - -var in_game: bool -func _on_start_button_pressed(): - in_game = true - var new_save = SaveGame.new() - if DirAccess.dir_exists_absolute( State.user_saves_path ): - var usr_dir = DirAccess.open(State.user_saves_path) - for path in usr_dir.get_files(): - if path.ends_with(\".json\"): - var found_save: = SaveGame.new(\"%s/%s\" % [State.user_saves_path, path.get_basename()]) - if found_save.is_demo: - new_save = found_save - break - - State.active_save_game = new_save - var vis_tween = get_tree().create_tween() - vis_tween.tween_property(%Menu, \"modulate\", Color(1,1,1,0), .3) - await vis_tween.finished - %Menu.visible = false - %Menu.mouse_filter = Control.MouseFilter.MOUSE_FILTER_PASS - loaded_room.start_room() - -#func _process(_delta: float) -> void: -# if Input.is_action_just_pressed(\"reset_demo\"): -# _on_reset() - -func _on_reset(): - load_room() - %Menu.modulate = Color.WHITE - %Menu.mouse_filter = Control.MouseFilter.MOUSE_FILTER_STOP - %Menu.visible = true - - -func _on_cn_box_toggled(toggled_on: bool) -> void: - State.show_content_notes = toggled_on - -func _on_motion_box_toggled(toggled_on: bool) -> void: - State.reduce_motion = toggled_on - -func _on_text_button_item_selected(index: int) -> void: - match index: - 0: - State.text_language = 1 - 1: - State.text_language = 2 - -func _on_speech_button_item_selected(index: int) -> void: - State.speech_language = index + 1 - if index == 1: - %TextButton.select(1) - %TextButton.item_selected.emit(1) - -func _unhandled_input(event: InputEvent) -> void: - if event is InputEvent and in_game: - if event.is_action_pressed(\"ui_menu\"): - toggle_pause_menu() - -func show_accessibility_settings(): - %AccessibilityContainer.show() - %Accessibility.is_active = true - await %Accessibility.leave_stage - %AccessibilityContainer.hide() - if in_game: - %ResumeButton.grab_focus() - else: - %PressStart.grab_focus() - -func toggle_pause_menu(): - if not get_tree().paused: - get_tree().paused = true - %PauseContainer.show() - %ResumeButton.grab_focus() - Input.mouse_mode = Input.MOUSE_MODE_VISIBLE - else: - get_tree().paused = false - %PauseContainer.hide() - %ResumeButton.grab_focus() - - if State.stage_list[0] is Player: - Input.mouse_mode = Input.MOUSE_MODE_CAPTURED -" - -[sub_resource type="Shader" id="Shader_jirkf"] -code = "shader_type canvas_item; -render_mode blend_premul_alpha; - -uniform float nebula_brightness = 4; -uniform vec2 nebula_scale = vec2(1.5); -uniform sampler2D starlight_noise: repeat_enable; -uniform sampler2D starlight_textures; -uniform float rotation_speed = 0.02; -uniform vec2 rotation_pivot = vec2(.8); -uniform vec2 drift_compensation = vec2(0.1, -0.2); -uniform float noise_strength = 0.2; - -// https://gist.github.com/ayamflow/c06bc0c8a64f985dd431bd0ac5b557cd -vec2 rotateUV(vec2 uv, vec2 pivot, float rotation) -{ - return vec2( - cos(rotation) * (uv.x - pivot.x) + sin(rotation) * (uv.y - pivot.y) + pivot.x, - cos(rotation) * (uv.y - pivot.y) - sin(rotation) * (uv.x - pivot.x) + pivot.y - ); -} - -//clamp(, .0, 1.0 - -void fragment() { - COLOR *= vec4(.0, - texture(starlight_textures,fract(UV*2.0)).x * 2.0*pow(max(sin(TIME + 10.0 * texture(starlight_textures,UV).y), .0), 5.0), - texture(starlight_textures, - clamp( - UV / nebula_scale + drift_compensation + 1.0 * - texture(starlight_noise, rotateUV( - UV / nebula_scale + noise_strength * texture(starlight_noise, rotateUV(UV, -rotation_pivot, TIME*rotation_speed)).yz, - rotation_pivot, TIME*rotation_speed) - ).xz, - .0, 1.0)) - .z * nebula_brightness, - clamp(pow(COLOR.x * 2.5 - (texture(starlight_noise, UV*2.0+TIME*.02).x + 0.8), 1.5), .0, 1.0) - ) * COLOR.w; -} -" - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_k41g6"] -shader = SubResource("Shader_jirkf") -shader_parameter/nebula_brightness = 2.4 -shader_parameter/nebula_scale = Vector2(1.3, 1.6) -shader_parameter/starlight_noise = ExtResource("1_t34p3") -shader_parameter/starlight_textures = ExtResource("2_s1yf2") -shader_parameter/rotation_speed = 0.02 -shader_parameter/rotation_pivot = Vector2(0.8, 0.8) -shader_parameter/drift_compensation = Vector2(0.1, -0.2) -shader_parameter/noise_strength = 0.2 - -[sub_resource type="Gradient" id="Gradient_kt5p7"] -interpolation_color_space = 2 -colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 0) - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_jirkf"] -gradient = SubResource("Gradient_kt5p7") -width = 2048 -height = 1536 -fill = 1 -fill_from = Vector2(0.538462, 0.491453) -fill_to = Vector2(1.3, -0.3) - -[sub_resource type="InputEventKey" id="InputEventKey_b7q2n"] -device = -1 -physical_keycode = 87 -unicode = 119 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_qhf78"] -device = -1 -axis = 1 -axis_value = -1.0 - -[sub_resource type="InputEventKey" id="InputEventKey_gatj6"] -device = -1 -physical_keycode = 65 -unicode = 97 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_ol51q"] -device = -1 -axis_value = -1.0 - -[sub_resource type="InputEventKey" id="InputEventKey_2rqk2"] -device = -1 -physical_keycode = 68 -unicode = 100 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_w8m28"] -device = -1 -axis_value = 1.0 - -[sub_resource type="InputEventKey" id="InputEventKey_kwpdx"] -device = -1 -physical_keycode = 83 -unicode = 115 - -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_2xua5"] -device = -1 -axis = 1 -axis_value = 1.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_kt5p7"] -bg_color = Color(0.0288289, 0.0448641, 0.121276, 1) -border_width_left = 10 -border_width_top = 10 -border_width_right = 10 -border_width_bottom = 10 -border_color = Color(0.0288289, 0.0448641, 0.121276, 1) -corner_radius_top_left = 20 -corner_radius_top_right = 20 -corner_radius_bottom_right = 20 -corner_radius_bottom_left = 20 -expand_margin_left = 20.0 -expand_margin_right = 20.0 - -[sub_resource type="Shader" id="Shader_gatj6"] -code = "shader_type canvas_item; -render_mode blend_premul_alpha; - -uniform float nebula_brightness = 4; -uniform vec2 nebula_scale = vec2(1.5); -uniform sampler2D starlight_noise: repeat_enable; -uniform sampler2D starlight_textures; -uniform float rotation_speed = 0.02; -uniform vec2 rotation_pivot = vec2(.8); -uniform vec2 drift_compensation = vec2(0.1, -0.2); -uniform float noise_strength = 0.2; - -// https://gist.github.com/ayamflow/c06bc0c8a64f985dd431bd0ac5b557cd -vec2 rotateUV(vec2 uv, vec2 pivot, float rotation) -{ - return vec2( - cos(rotation) * (uv.x - pivot.x) + sin(rotation) * (uv.y - pivot.y) + pivot.x, - cos(rotation) * (uv.y - pivot.y) - sin(rotation) * (uv.x - pivot.x) + pivot.y - ); -} - -//clamp(, .0, 1.0 - -void fragment() { - COLOR *= vec4(.0, - texture(starlight_textures,fract(UV*2.0)).x * 2.0*pow(max(sin(TIME + 10.0 * texture(starlight_textures,UV).y), .0), 5.0), - texture(starlight_textures, - clamp( - UV / nebula_scale + drift_compensation + 1.0 * - texture(starlight_noise, rotateUV( - UV / nebula_scale + noise_strength * texture(starlight_noise, rotateUV(UV, -rotation_pivot, TIME*rotation_speed)).yz, - rotation_pivot, TIME*rotation_speed) - ).xz, - .0, 1.0)) - .z * nebula_brightness, - clamp(pow(COLOR.x * 2.5 - (texture(starlight_noise, UV*2.0+TIME*.02).x + 0.8), 1.5), .0, 1.0) - ) * COLOR.w; -} -" - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ol51q"] -shader = SubResource("Shader_gatj6") -shader_parameter/nebula_brightness = 2.4 -shader_parameter/nebula_scale = Vector2(1.3, 1.6) -shader_parameter/starlight_noise = ExtResource("1_t34p3") -shader_parameter/starlight_textures = ExtResource("2_s1yf2") -shader_parameter/rotation_speed = 0.02 -shader_parameter/rotation_pivot = Vector2(0.8, 0.8) -shader_parameter/drift_compensation = Vector2(0.1, -0.2) -shader_parameter/noise_strength = 0.2 - -[sub_resource type="Gradient" id="Gradient_2rqk2"] -interpolation_color_space = 2 -colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 0) - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_w8m28"] -gradient = SubResource("Gradient_2rqk2") -width = 2048 -height = 1536 -fill = 1 -fill_from = Vector2(0.538462, 0.491453) -fill_to = Vector2(1.3, -0.3) - -[sub_resource type="Animation" id="Animation_kt5p7"] -resource_name = "ending" -length = 120.0 -tracks/0/type = "audio" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"clips": [{ -"end_offset": 0.0, -"start_offset": 8.34472, -"stream": ExtResource("14_k41g6") -}], -"times": PackedFloat32Array(0.517639) -} -tracks/0/use_blend = true - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_mivr6"] -_data = { -&"ending": SubResource("Animation_kt5p7") -} - -[sub_resource type="GDScript" id="GDScript_kt5p7"] -script/source = "extends Label - -func _ready() -> void: - if not OS.has_feature(\"debug\"): - hide() - -func _process(_delta): - text = \"%d/%d\" % [Engine.get_frames_per_second(), Engine.max_fps] -" - -[node name="DemoMain" type="Node3D"] -process_mode = 3 -script = SubResource("GDScript_t34p3") - -[node name="Room" type="Node3D" parent="."] -unique_name_in_owner = true - -[node name="Menu" type="Control" parent="."] -unique_name_in_owner = true -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="Panel" type="Panel" parent="Menu"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="TextureRect3" type="TextureRect" parent="Menu/Panel"] -material = SubResource("ShaderMaterial_k41g6") -layout_mode = 0 -offset_left = 2073.0 -offset_top = 1497.0 -offset_right = 4353.0 -offset_bottom = 3530.0 -rotation = -3.14159 -texture = SubResource("GradientTexture2D_jirkf") - -[node name="TextureRect2" type="TextureRect" parent="Menu/Panel"] -visible = false -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -395.0 -offset_top = -447.0 -offset_right = 1011.0 -offset_bottom = 959.0 -grow_horizontal = 0 -grow_vertical = 0 -scale = Vector2(0.2, 0.2) -texture = ExtResource("2_ncfee") - -[node name="Label" type="Label" parent="Menu/Panel/TextureRect2"] -layout_mode = 1 -anchors_preset = 7 -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -offset_left = -988.0 -offset_top = 99.0002 -offset_right = -590.0 -offset_bottom = 187.0 -grow_horizontal = 2 -grow_vertical = 0 -scale = Vector2(5, 5) -text = "*Als Messe-Demo geprüft. Entspricht angestrebtem finalen Rating." -horizontal_alignment = 1 -autowrap_mode = 2 - -[node name="VBoxContainer2" type="VBoxContainer" parent="Menu"] -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -256.0 -offset_top = -281.5 -offset_right = 256.0 -offset_bottom = 281.5 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="TextureRect" type="TextureRect" parent="Menu/VBoxContainer2"] -custom_minimum_size = Vector2(512, 512) -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 4 -texture = ExtResource("1_61qpo") -expand_mode = 2 - -[node name="PressStart" type="Button" parent="Menu/VBoxContainer2"] -unique_name_in_owner = true -clip_contents = true -layout_mode = 2 -size_flags_horizontal = 4 -theme_type_variation = &"H1Button" -text = "Start the Demo!" -script = ExtResource("6_qhf78") -metadata/_custom_type_script = "uid://cxton1pffwxk4" - -[node name="VBoxContainer" type="VBoxContainer" parent="Menu"] -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -392.0 -offset_top = -310.0 -offset_right = -78.0 -offset_bottom = -92.0 -grow_horizontal = 0 -grow_vertical = 0 - -[node name="TextureRect2" type="TextureRect" parent="Menu/VBoxContainer"] -layout_mode = 2 -size_flags_horizontal = 4 -size_flags_vertical = 4 -texture = ExtResource("5_b7q2n") -expand_mode = 1 -stretch_mode = 4 - -[node name="Label" type="Label" parent="Menu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderMedium" -text = "Accessibility" - -[node name="CNBox" type="CheckBox" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "show Content Notes" - -[node name="MotionBox" type="CheckBox" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "reduce motion and flickering" - -[node name="A11Y" type="Button" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "More Options" - -[node name="Label3" type="Label" parent="Menu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderMedium" -text = "Spoken Text" - -[node name="SpeechButton" type="OptionButton" parent="Menu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -selected = 0 -item_count = 2 -popup/item_0/text = "englisch" -popup/item_0/id = 0 -popup/item_1/text = "deutsch" -popup/item_1/id = 1 - -[node name="Label2" type="Label" parent="Menu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderMedium" -text = "Written Text" - -[node name="TextButton" type="OptionButton" parent="Menu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -selected = 0 -item_count = 2 -popup/item_0/text = "englisch" -popup/item_0/id = 1 -popup/item_1/text = "deutsch" -popup/item_1/id = 2 - -[node name="Button" type="Button" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "Privacy Info" - -[node name="Control" type="Control" parent="Menu"] -layout_mode = 1 -anchors_preset = 2 -anchor_top = 1.0 -anchor_bottom = 1.0 -offset_top = -40.0 -offset_right = 40.0 -grow_vertical = 0 - -[node name="ActionPrompt" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 134.0 -offset_top = -282.0 -offset_right = 234.0 -offset_bottom = -182.0 -texture = ExtResource("4_8e30h") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_forwards" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_b7q2n"), SubResource("InputEventJoypadMotion_qhf78")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="ActionPrompt2" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 70.0 -offset_top = -187.0 -offset_right = 170.0 -offset_bottom = -87.0 -texture = ExtResource("7_g425y") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_left" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_gatj6"), SubResource("InputEventJoypadMotion_ol51q")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="ActionPrompt4" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 247.0 -offset_top = -187.0 -offset_right = 347.0 -offset_bottom = -87.0 -texture = ExtResource("8_kj67n") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_right" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_2rqk2"), SubResource("InputEventJoypadMotion_w8m28")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="ActionPrompt3" type="TextureRect" parent="Menu/Control"] -texture_filter = 1 -layout_mode = 0 -offset_left = 158.0 -offset_top = -187.0 -offset_right = 258.0 -offset_bottom = -87.0 -texture = ExtResource("9_xo70c") -stretch_mode = 5 -script = ExtResource("5_6w5b4") -action = "player_backwards" -icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_kwpdx"), SubResource("InputEventJoypadMotion_2xua5")]) -metadata/_custom_type_script = "uid://bbs1u7ojno7xo" - -[node name="Label" type="Label" parent="Menu/Control"] -layout_mode = 0 -offset_left = 72.0 -offset_top = -89.0 -offset_right = 374.0 -offset_bottom = -40.0 -theme_type_variation = &"HeaderMedium" -text = "Move trough the room" - -[node name="PrivacyPanel" type="PanelContainer" parent="Menu"] -visible = false -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -701.5 -offset_top = -464.5 -offset_right = 701.5 -offset_bottom = 464.5 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") - -[node name="PrivacyAndDataProtection" parent="Menu/PrivacyPanel" instance=ExtResource("10_jirkf")] -layout_mode = 2 - -[node name="Video Settings" parent="Menu" instance=ExtResource("11_mivr6")] -layout_mode = 1 -offset_left = 2330.0 -offset_top = 96.0 -offset_right = 2330.0 -offset_bottom = 96.0 - -[node name="TextureRect" type="TextureRect" parent="."] -visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 - -[node name="CardBurner" parent="." instance=ExtResource("10_kj67n")] -visible = false - -[node name="PauseContainer" type="CenterContainer" parent="."] -unique_name_in_owner = true -visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="TextureRect" type="TextureRect" parent="PauseContainer"] -material = SubResource("ShaderMaterial_ol51q") -layout_mode = 2 -texture = SubResource("GradientTexture2D_w8m28") - -[node name="PauseMenu" type="PanelContainer" parent="PauseContainer"] -unique_name_in_owner = true -layout_mode = 2 -script = ExtResource("10_g425y") - -[node name="VBoxContainer" type="VBoxContainer" parent="PauseContainer/PauseMenu"] -layout_mode = 2 - -[node name="Label" type="Label" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -theme_type_variation = &"HeaderLarge" -text = "Game Paused" - -[node name="ResumeButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -text = "Resume" - -[node name="A11Y2" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -text = "Accessibility" - -[node name="BugButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -script = ExtResource("11_kj67n") -metadata/_custom_type_script = "uid://sa15wakvpj2e" - -[node name="ToMenuButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -visible = false -layout_mode = 2 -text = "Return to Menu" - -[node name="ToSettingsButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -visible = false -layout_mode = 2 -text = "Open Settings" - -[node name="ToDesktopButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -text = "Quit to Desktop" - -[node name="HSeparator" type="HSeparator" parent="PauseContainer/PauseMenu/VBoxContainer"] -custom_minimum_size = Vector2(0, 20) -layout_mode = 2 - -[node name="FindHelplineButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -text = "Find Help-Lines" - -[node name="Label2" type="Label" parent="PauseContainer/PauseMenu/VBoxContainer"] -layout_mode = 2 -text = "opens findahelpline.com" -horizontal_alignment = 1 - -[node name="SkipStoryButton" type="Button" parent="PauseContainer/PauseMenu/VBoxContainer"] -unique_name_in_owner = true -visible = false -layout_mode = 2 -text = "Skip this Story" - -[node name="ending" parent="." instance=ExtResource("13_xo70c")] -visible = false -mouse_filter = 2 - -[node name="AccessibilityContainer" type="CenterContainer" parent="."] -unique_name_in_owner = true -visible = false -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="AccessibilityPanel" type="PanelContainer" parent="AccessibilityContainer"] -layout_mode = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") - -[node name="Accessibility" parent="AccessibilityContainer/AccessibilityPanel" instance=ExtResource("11_kt5p7")] -unique_name_in_owner = true -layout_mode = 2 - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] - -[node name="AnimationPlayer" type="AnimationPlayer" parent="AudioStreamPlayer"] -libraries = { -&"": SubResource("AnimationLibrary_mivr6") -} - -[node name="FPSLabel" type="Label" parent="."] -offset_right = 40.0 -offset_bottom = 35.0 -script = SubResource("GDScript_kt5p7") - -[connection signal="pressed" from="Menu/VBoxContainer2/PressStart" to="." method="_on_start_button_pressed"] -[connection signal="toggled" from="Menu/VBoxContainer/CNBox" to="." method="_on_cn_box_toggled"] -[connection signal="toggled" from="Menu/VBoxContainer/MotionBox" to="." method="_on_motion_box_toggled"] -[connection signal="pressed" from="Menu/VBoxContainer/A11Y" to="." method="show_accessibility_settings"] -[connection signal="item_selected" from="Menu/VBoxContainer/SpeechButton" to="." method="_on_speech_button_item_selected"] -[connection signal="item_selected" from="Menu/VBoxContainer/TextButton" to="." method="_on_text_button_item_selected"] -[connection signal="pressed" from="Menu/VBoxContainer/Button" to="Menu/PrivacyPanel" method="show"] -[connection signal="leave_stage" from="Menu/PrivacyPanel/PrivacyAndDataProtection" to="Menu/PrivacyPanel" method="hide"] -[connection signal="pressed" from="PauseContainer/PauseMenu/VBoxContainer/A11Y2" to="." method="show_accessibility_settings"] diff --git a/src/demo-warning.svg b/src/demo-warning.svg deleted file mode 100644 index 6424e5d..0000000 --- a/src/demo-warning.svg +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - UNDER CONSTRUCTION - - - - - - - UNDER CONSTRUCTION - - - - - - - diff --git a/src/demo-warning.svg.import b/src/demo-warning.svg.import deleted file mode 100644 index c35fac8..0000000 --- a/src/demo-warning.svg.import +++ /dev/null @@ -1,43 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c6r2y18qlqsvh" -path="res://.godot/imported/demo-warning.svg-5bc85c9c263d3931745057454217e7fa.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://demo-warning.svg" -dest_files=["res://.godot/imported/demo-warning.svg-5bc85c9c263d3931745057454217e7fa.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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/src/dev-util/sky prototyping.tscn b/src/dev-util/sky prototyping.tscn index 3611204..35558f4 100644 --- a/src/dev-util/sky prototyping.tscn +++ b/src/dev-util/sky prototyping.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=12 format=3 uid="uid://d0qqluenght6a"] -[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro_scene/shaders/stars.gdshader" id="1_8nej7"] -[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro_scene/textures/sky_textures_2.png" id="2_qoi7m"] +[ext_resource type="Shader" uid="uid://d324neibxpomg" path="res://base-environments/intro/shaders/stars.gdshader" id="1_8nej7"] +[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro/textures/sky_textures_2.png" id="2_qoi7m"] [sub_resource type="Gradient" id="Gradient_d5lk6"] interpolation_mode = 2 diff --git a/src/logic-scenes/boot/boot.gd b/src/logic-scenes/boot/boot.gd new file mode 100644 index 0000000..61510e1 --- /dev/null +++ b/src/logic-scenes/boot/boot.gd @@ -0,0 +1 @@ +extends Node diff --git a/src/logic-scenes/boot/boot.gd.uid b/src/logic-scenes/boot/boot.gd.uid new file mode 100644 index 0000000..8c9910d --- /dev/null +++ b/src/logic-scenes/boot/boot.gd.uid @@ -0,0 +1 @@ +uid://cq25hqgfl2eiu diff --git a/src/logic-scenes/boot/boot.tscn b/src/logic-scenes/boot/boot.tscn new file mode 100644 index 0000000..ee6b67d --- /dev/null +++ b/src/logic-scenes/boot/boot.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3 uid="uid://ccdfkvtu6sb36"] + +[ext_resource type="Script" uid="uid://cq25hqgfl2eiu" path="res://logic-scenes/boot/boot.gd" id="1_hjvc4"] + +[node name="Boot" type="Node"] +script = ExtResource("1_hjvc4") diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index e6ba25f..a1596cc 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -74,8 +74,7 @@ func _ready(): Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_THERAPY, 1) Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_BURNOUT, 1) else: - return - assert(false) + assert(false, "Not Implemented") if get_tree().root == self.get_parent(): pick_cards(3, false) diff --git a/src/disclaimer.tscn b/src/logic-scenes/disclaimer/disclaimer.tscn similarity index 99% rename from src/disclaimer.tscn rename to src/logic-scenes/disclaimer/disclaimer.tscn index 888972e..67ae419 100644 --- a/src/disclaimer.tscn +++ b/src/logic-scenes/disclaimer/disclaimer.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://bayuh2vafablg" path="res://addons/markdownlabel/header_formats/h4_format.gd" id="6_63x3b"] [ext_resource type="Script" uid="uid://dfr1w7u3jgni3" path="res://addons/markdownlabel/header_formats/h5_format.gd" id="7_sp2lx"] [ext_resource type="Script" uid="uid://bsi6dexoofpe6" path="res://addons/markdownlabel/header_formats/h6_format.gd" id="8_bd0uj"] -[ext_resource type="Script" uid="uid://cxton1pffwxk4" path="res://button_themer.gd" id="9_pl7dp"] +[ext_resource type="Script" uid="uid://cxton1pffwxk4" path="res://code/button_themer.gd" id="9_pl7dp"] [sub_resource type="GDScript" id="GDScript_nkjm2"] script/source = "extends Panel diff --git a/src/logic-scenes/startup/startup.tscn b/src/logic-scenes/startup/startup.tscn index 00ee9d3..de5f2d0 100644 --- a/src/logic-scenes/startup/startup.tscn +++ b/src/logic-scenes/startup/startup.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=6 format=3 uid="uid://gldtxysavetf"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="1_8giso"] -[ext_resource type="PackedScene" uid="uid://b3wlecqvelh22" path="res://logic-scenes/main menu/acessability_settings.tscn" id="3_2p4fc"] -[ext_resource type="PackedScene" uid="uid://chal0ioagspx0" path="res://logic-scenes/main menu/content_settings.tscn" id="3_fso6q"] +[ext_resource type="PackedScene" uid="uid://b3wlecqvelh22" path="res://ui/menu_main/acessability_settings.tscn" id="3_2p4fc"] +[ext_resource type="PackedScene" uid="uid://chal0ioagspx0" path="res://ui/menu_main/content_settings.tscn" id="3_fso6q"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_s5ssh"] [sub_resource type="GDScript" id="GDScript_a78qq"] diff --git a/src/project.godot b/src/project.godot index 8b3359d..d0adc76 100644 --- a/src/project.godot +++ b/src/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Frame of Mind" -run/main_scene="uid://befxf8uruwnrl" +run/main_scene="uid://ccdfkvtu6sb36" config/use_custom_user_dir=true config/features=PackedStringArray("4.5", "Forward Plus") boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1) @@ -26,6 +26,7 @@ Scenes="*res://singletons/scene_reference.gd" Steamworks="*res://dev-util/steamworks.gd" PromptManager="*res://addons/input_prompts/input_prompt_manager.gd" Steam="*res://dev-util/steam.gd" +Main="*res://singletons/main/main.tscn" [debug] diff --git a/src/main.gd b/src/singletons/main/main.gd similarity index 100% rename from src/main.gd rename to src/singletons/main/main.gd diff --git a/src/main.gd.uid b/src/singletons/main/main.gd.uid similarity index 100% rename from src/main.gd.uid rename to src/singletons/main/main.gd.uid diff --git a/src/main.tscn b/src/singletons/main/main.tscn similarity index 99% rename from src/main.tscn rename to src/singletons/main/main.tscn index 6b4f5cd..3538846 100644 --- a/src/main.tscn +++ b/src/singletons/main/main.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=68 format=3 uid="uid://befxf8uruwnrl"] -[ext_resource type="Script" uid="uid://k8yppfbkq0xv" path="res://main.gd" id="1_rqkns"] +[ext_resource type="Script" uid="uid://k8yppfbkq0xv" path="res://singletons/main/main.gd" id="1_rqkns"] [ext_resource type="PackedScene" uid="uid://gldtxysavetf" path="res://logic-scenes/startup/startup.tscn" id="1_v5rpm"] -[ext_resource type="PackedScene" uid="uid://b51wdql4mby47" path="res://main_menu.tscn" id="3_ik73t"] +[ext_resource type="PackedScene" uid="uid://b51wdql4mby47" path="res://ui/menu_main/main_menu.tscn" id="3_ik73t"] [ext_resource type="Texture2D" uid="uid://d031kxe5m4ihh" path="res://import/interface-elements/loading_rect_clip.png" id="5_sr555"] [ext_resource type="Texture2D" uid="uid://bqf82f8dk4yun" path="res://import/interface-elements/loading_rect_frame.png" id="6_aaaxa"] [ext_resource type="Texture2D" uid="uid://dpftqdvtrkioh" path="res://import/interface-elements/loading_rect_deco.png" id="7_koraw"] -[ext_resource type="PackedScene" uid="uid://6aaxpvoepqrm" path="res://disclaimer.tscn" id="7_t45fc"] +[ext_resource type="PackedScene" uid="uid://6aaxpvoepqrm" path="res://logic-scenes/disclaimer/disclaimer.tscn" id="7_t45fc"] [ext_resource type="AudioStream" uid="uid://fej7yw25lgqy" path="res://import/menu_music/Ambient 6.ogg" id="8_tptb8"] -[ext_resource type="Script" uid="uid://0h0lrkntx0uh" path="res://logic-scenes/main menu/pause_menu.gd" id="9_ihfph"] +[ext_resource type="Script" uid="uid://0h0lrkntx0uh" path="res://ui/menu_main/pause_menu.gd" id="9_ihfph"] [ext_resource type="Texture2D" uid="uid://ds1n0xhxqlp4b" path="res://base-environments/youth_room/shaders/universe_noise.png" id="9_l7v4b"] [ext_resource type="Texture2D" uid="uid://bdyg065h8vcdi" path="res://base-environments/youth_room/shaders/starlight-textures.png" id="10_pipov"] [ext_resource type="Script" uid="uid://dbap0gqox0ty1" path="res://addons/markdownlabel/markdownlabel.gd" id="12_074og"] @@ -1406,7 +1406,7 @@ offset_right = 1926.0 offset_bottom = 5260.0 bbcode_enabled = true text = "[center] -[img=512]res://logic-scenes/main menu/logo.png[/img] +[img=512]res://ui/menu_main/logo.png[/img] [img][/img] [font_size=34]is[/font_size] [font_size=45]made by betalars[/font_size] @@ -1524,7 +1524,7 @@ Maxi, iFire fit_content = true script = ExtResource("12_074og") markdown_text = "[center] -[img=512]res://logic-scenes/main menu/logo.png[/img] +[img=512]res://ui/menu_main/logo.png[/img] ![This is an image]() ## is #made by betalars diff --git a/src/logic-scenes/main menu/Main Menu.gd b/src/ui/menu_main/Main Menu.gd similarity index 100% rename from src/logic-scenes/main menu/Main Menu.gd rename to src/ui/menu_main/Main Menu.gd diff --git a/src/logic-scenes/main menu/Main Menu.gd.uid b/src/ui/menu_main/Main Menu.gd.uid similarity index 100% rename from src/logic-scenes/main menu/Main Menu.gd.uid rename to src/ui/menu_main/Main Menu.gd.uid diff --git a/src/logic-scenes/main menu/acessability_settings.gd b/src/ui/menu_main/acessability_settings.gd similarity index 100% rename from src/logic-scenes/main menu/acessability_settings.gd rename to src/ui/menu_main/acessability_settings.gd diff --git a/src/logic-scenes/main menu/acessability_settings.gd.uid b/src/ui/menu_main/acessability_settings.gd.uid similarity index 100% rename from src/logic-scenes/main menu/acessability_settings.gd.uid rename to src/ui/menu_main/acessability_settings.gd.uid diff --git a/src/logic-scenes/main menu/acessability_settings.tscn b/src/ui/menu_main/acessability_settings.tscn similarity index 98% rename from src/logic-scenes/main menu/acessability_settings.tscn rename to src/ui/menu_main/acessability_settings.tscn index 84a97da..514decb 100644 --- a/src/logic-scenes/main menu/acessability_settings.tscn +++ b/src/ui/menu_main/acessability_settings.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://b3wlecqvelh22"] -[ext_resource type="Script" uid="uid://cbax2lv4pstqk" path="res://logic-scenes/main menu/acessability_settings.gd" id="1_x3lym"] +[ext_resource type="Script" uid="uid://cbax2lv4pstqk" path="res://ui/menu_main/acessability_settings.gd" id="1_x3lym"] [ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="2_24dtk"] [sub_resource type="GDScript" id="GDScript_v567h"] diff --git a/src/logic-scenes/main menu/audio_settings.gd b/src/ui/menu_main/audio_settings.gd similarity index 100% rename from src/logic-scenes/main menu/audio_settings.gd rename to src/ui/menu_main/audio_settings.gd diff --git a/src/logic-scenes/main menu/audio_settings.gd.uid b/src/ui/menu_main/audio_settings.gd.uid similarity index 100% rename from src/logic-scenes/main menu/audio_settings.gd.uid rename to src/ui/menu_main/audio_settings.gd.uid diff --git a/src/logic-scenes/main menu/audio_settings.tscn b/src/ui/menu_main/audio_settings.tscn similarity index 99% rename from src/logic-scenes/main menu/audio_settings.tscn rename to src/ui/menu_main/audio_settings.tscn index f23410a..756853d 100644 --- a/src/logic-scenes/main menu/audio_settings.tscn +++ b/src/ui/menu_main/audio_settings.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://dfhkfocy8axb8"] -[ext_resource type="Script" uid="uid://b2redm7dwpcne" path="res://logic-scenes/main menu/audio_settings.gd" id="1_0lla1"] +[ext_resource type="Script" uid="uid://b2redm7dwpcne" path="res://ui/menu_main/audio_settings.gd" id="1_0lla1"] [ext_resource type="AudioStream" uid="uid://cl74a68tjwinh" path="res://base-environments/youth_room/audio/Youth Loop.wav" id="2_01rsa"] [sub_resource type="Animation" id="Animation_lax27"] diff --git a/src/logic-scenes/main menu/content_settings.gd b/src/ui/menu_main/content_settings.gd similarity index 100% rename from src/logic-scenes/main menu/content_settings.gd rename to src/ui/menu_main/content_settings.gd diff --git a/src/logic-scenes/main menu/content_settings.gd.uid b/src/ui/menu_main/content_settings.gd.uid similarity index 100% rename from src/logic-scenes/main menu/content_settings.gd.uid rename to src/ui/menu_main/content_settings.gd.uid diff --git a/src/logic-scenes/main menu/content_settings.tscn b/src/ui/menu_main/content_settings.tscn similarity index 99% rename from src/logic-scenes/main menu/content_settings.tscn rename to src/ui/menu_main/content_settings.tscn index 8a5a18b..5cc9f3a 100644 --- a/src/logic-scenes/main menu/content_settings.tscn +++ b/src/ui/menu_main/content_settings.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=22 format=3 uid="uid://chal0ioagspx0"] -[ext_resource type="Script" uid="uid://wybb38po3pbo" path="res://logic-scenes/main menu/content_settings.gd" id="1_wnuvg"] +[ext_resource type="Script" uid="uid://wybb38po3pbo" path="res://ui/menu_main/content_settings.gd" id="1_wnuvg"] [ext_resource type="Script" uid="uid://dbap0gqox0ty1" path="res://addons/markdownlabel/markdownlabel.gd" id="2_b7ja7"] [ext_resource type="Script" uid="uid://dcx7crs23nf4" path="res://addons/markdownlabel/header_formats/h1_format.gd" id="3_00t14"] [ext_resource type="Script" uid="uid://d0sin64i4v3op" path="res://addons/markdownlabel/header_formats/h2_format.gd" id="4_336xo"] diff --git a/src/logic-scenes/main menu/gameplay_settings.gd b/src/ui/menu_main/gameplay_settings.gd similarity index 100% rename from src/logic-scenes/main menu/gameplay_settings.gd rename to src/ui/menu_main/gameplay_settings.gd diff --git a/src/logic-scenes/main menu/gameplay_settings.gd.uid b/src/ui/menu_main/gameplay_settings.gd.uid similarity index 100% rename from src/logic-scenes/main menu/gameplay_settings.gd.uid rename to src/ui/menu_main/gameplay_settings.gd.uid diff --git a/src/logic-scenes/main menu/gameplay_settings.tscn b/src/ui/menu_main/gameplay_settings.tscn similarity index 98% rename from src/logic-scenes/main menu/gameplay_settings.tscn rename to src/ui/menu_main/gameplay_settings.tscn index 29eca29..a05343b 100644 --- a/src/logic-scenes/main menu/gameplay_settings.tscn +++ b/src/ui/menu_main/gameplay_settings.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://dxwqkxq6qjk7i"] -[ext_resource type="Script" uid="uid://bsnktd8qk5fl7" path="res://logic-scenes/main menu/gameplay_settings.gd" id="1_aurh1"] +[ext_resource type="Script" uid="uid://bsnktd8qk5fl7" path="res://ui/menu_main/gameplay_settings.gd" id="1_aurh1"] [sub_resource type="InputEventAction" id="InputEventAction_gy6yb"] action = &"ui_cancel" diff --git a/src/logic-scenes/main menu/logo.png b/src/ui/menu_main/logo.png similarity index 100% rename from src/logic-scenes/main menu/logo.png rename to src/ui/menu_main/logo.png diff --git a/src/logic-scenes/main menu/logo.png.import b/src/ui/menu_main/logo.png.import similarity index 77% rename from src/logic-scenes/main menu/logo.png.import rename to src/ui/menu_main/logo.png.import index bccd110..40c830b 100644 --- a/src/logic-scenes/main menu/logo.png.import +++ b/src/ui/menu_main/logo.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3ewjumh0b0g6" -path="res://.godot/imported/logo.png-2a2bb67beae729051be0dd4ef4434919.ctex" +path="res://.godot/imported/logo.png-60c22783798a3cd4fe9bcc3ba1860498.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://logic-scenes/main menu/logo.png" -dest_files=["res://.godot/imported/logo.png-2a2bb67beae729051be0dd4ef4434919.ctex"] +source_file="res://ui/menu_main/logo.png" +dest_files=["res://.godot/imported/logo.png-60c22783798a3cd4fe9bcc3ba1860498.ctex"] [params] diff --git a/src/logic-scenes/main menu/main_menu.gd b/src/ui/menu_main/main_menu.gd similarity index 100% rename from src/logic-scenes/main menu/main_menu.gd rename to src/ui/menu_main/main_menu.gd diff --git a/src/logic-scenes/main menu/main_menu.gd.uid b/src/ui/menu_main/main_menu.gd.uid similarity index 100% rename from src/logic-scenes/main menu/main_menu.gd.uid rename to src/ui/menu_main/main_menu.gd.uid diff --git a/src/main_menu.tscn b/src/ui/menu_main/main_menu.tscn similarity index 96% rename from src/main_menu.tscn rename to src/ui/menu_main/main_menu.tscn index 0e265a1..e8ad71a 100644 --- a/src/main_menu.tscn +++ b/src/ui/menu_main/main_menu.tscn @@ -1,21 +1,21 @@ [gd_scene load_steps=22 format=3 uid="uid://b51wdql4mby47"] [ext_resource type="Theme" uid="uid://b056fn288p8ha" path="res://logic-scenes/themes/handwriting.theme" id="1_2dg4n"] -[ext_resource type="Script" uid="uid://c3o65t2rwpbtn" path="res://logic-scenes/main menu/main_menu.gd" id="2_rm576"] +[ext_resource type="Script" uid="uid://c3o65t2rwpbtn" path="res://ui/menu_main/main_menu.gd" id="2_rm576"] [ext_resource type="Texture2D" uid="uid://dedg31cqac3n0" path="res://import/interface-elements/frame-of-mind-logo.png" id="3_cm266"] -[ext_resource type="PackedScene" uid="uid://gmxenhavh1lp" path="res://logic-scenes/main menu/video_settings.tscn" id="3_f0dcd"] +[ext_resource type="PackedScene" uid="uid://gmxenhavh1lp" path="res://ui/menu_main/video_settings.tscn" id="3_f0dcd"] [ext_resource type="Texture2D" uid="uid://bu6o68w763512" path="res://import/interface-elements/game-of-thoughts.png" id="4_g8g3n"] -[ext_resource type="Script" uid="uid://cxton1pffwxk4" path="res://button_themer.gd" id="4_iotk1"] +[ext_resource type="Script" uid="uid://cxton1pffwxk4" path="res://code/button_themer.gd" id="4_iotk1"] [ext_resource type="Script" uid="uid://sa15wakvpj2e" path="res://dev-util/bug_button.gd" id="4_j5v2v"] [ext_resource type="Script" uid="uid://byiih47fi6740" path="res://dev-util/settings_popup.gd" id="4_k8jo0"] -[ext_resource type="PackedScene" uid="uid://dfhkfocy8axb8" path="res://logic-scenes/main menu/audio_settings.tscn" id="4_o07mg"] +[ext_resource type="PackedScene" uid="uid://dfhkfocy8axb8" path="res://ui/menu_main/audio_settings.tscn" id="4_o07mg"] [ext_resource type="Script" uid="uid://dqq0wq3dvbnjs" path="res://dev-util/i18n_texture_rect.gd" id="5_8u0te"] [ext_resource type="Script" uid="uid://0tb763w0vfv7" path="res://tab_container.gd" id="5_lhfti"] -[ext_resource type="PackedScene" uid="uid://b3wlecqvelh22" path="res://logic-scenes/main menu/acessability_settings.tscn" id="6_875a3"] +[ext_resource type="PackedScene" uid="uid://b3wlecqvelh22" path="res://ui/menu_main/acessability_settings.tscn" id="6_875a3"] [ext_resource type="Texture2D" uid="uid://bv1o2xo71wvp6" path="res://import/interface-elements/gedanken-spiel.png" id="6_g8g3n"] -[ext_resource type="PackedScene" uid="uid://dxwqkxq6qjk7i" path="res://logic-scenes/main menu/gameplay_settings.tscn" id="6_p7ypt"] -[ext_resource type="PackedScene" uid="uid://chal0ioagspx0" path="res://logic-scenes/main menu/content_settings.tscn" id="7_pnd48"] -[ext_resource type="Script" uid="uid://dugfwcvp7i01k" path="res://logic-scenes/main menu/save_game_list.gd" id="8_o0cpj"] +[ext_resource type="PackedScene" uid="uid://dxwqkxq6qjk7i" path="res://ui/menu_main/gameplay_settings.tscn" id="6_p7ypt"] +[ext_resource type="PackedScene" uid="uid://chal0ioagspx0" path="res://ui/menu_main/content_settings.tscn" id="7_pnd48"] +[ext_resource type="Script" uid="uid://dugfwcvp7i01k" path="res://ui/menu_main/save_game_list.gd" id="8_o0cpj"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_njt06"] diff --git a/src/logic-scenes/main menu/pause_menu.gd b/src/ui/menu_main/pause_menu.gd similarity index 100% rename from src/logic-scenes/main menu/pause_menu.gd rename to src/ui/menu_main/pause_menu.gd diff --git a/src/logic-scenes/main menu/pause_menu.gd.uid b/src/ui/menu_main/pause_menu.gd.uid similarity index 100% rename from src/logic-scenes/main menu/pause_menu.gd.uid rename to src/ui/menu_main/pause_menu.gd.uid diff --git a/src/logic-scenes/main menu/privacy_settings.gd b/src/ui/menu_main/privacy_settings.gd similarity index 100% rename from src/logic-scenes/main menu/privacy_settings.gd rename to src/ui/menu_main/privacy_settings.gd diff --git a/src/logic-scenes/main menu/privacy_settings.gd.uid b/src/ui/menu_main/privacy_settings.gd.uid similarity index 100% rename from src/logic-scenes/main menu/privacy_settings.gd.uid rename to src/ui/menu_main/privacy_settings.gd.uid diff --git a/src/logic-scenes/main menu/privacy_settings.tscn b/src/ui/menu_main/privacy_settings.tscn similarity index 98% rename from src/logic-scenes/main menu/privacy_settings.tscn rename to src/ui/menu_main/privacy_settings.tscn index e860492..9258a83 100644 --- a/src/logic-scenes/main menu/privacy_settings.tscn +++ b/src/ui/menu_main/privacy_settings.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://u0bwjr5l6nkh"] -[ext_resource type="Script" uid="uid://vhppt23pmi6w" path="res://logic-scenes/main menu/privacy_settings.gd" id="1_evre2"] +[ext_resource type="Script" uid="uid://vhppt23pmi6w" path="res://ui/menu_main/privacy_settings.gd" id="1_evre2"] [sub_resource type="InputEventAction" id="InputEventAction_gy6yb"] action = &"ui_cancel" diff --git a/src/logic-scenes/main menu/save_game_display.gd b/src/ui/menu_main/save_game_display.gd similarity index 100% rename from src/logic-scenes/main menu/save_game_display.gd rename to src/ui/menu_main/save_game_display.gd diff --git a/src/logic-scenes/main menu/save_game_display.gd.uid b/src/ui/menu_main/save_game_display.gd.uid similarity index 100% rename from src/logic-scenes/main menu/save_game_display.gd.uid rename to src/ui/menu_main/save_game_display.gd.uid diff --git a/src/logic-scenes/main menu/save_game_list.gd b/src/ui/menu_main/save_game_list.gd similarity index 100% rename from src/logic-scenes/main menu/save_game_list.gd rename to src/ui/menu_main/save_game_list.gd diff --git a/src/logic-scenes/main menu/save_game_list.gd.uid b/src/ui/menu_main/save_game_list.gd.uid similarity index 100% rename from src/logic-scenes/main menu/save_game_list.gd.uid rename to src/ui/menu_main/save_game_list.gd.uid diff --git a/src/logic-scenes/main menu/video_settings.gd b/src/ui/menu_main/video_settings.gd similarity index 100% rename from src/logic-scenes/main menu/video_settings.gd rename to src/ui/menu_main/video_settings.gd diff --git a/src/logic-scenes/main menu/video_settings.gd.uid b/src/ui/menu_main/video_settings.gd.uid similarity index 100% rename from src/logic-scenes/main menu/video_settings.gd.uid rename to src/ui/menu_main/video_settings.gd.uid diff --git a/src/logic-scenes/main menu/video_settings.tscn b/src/ui/menu_main/video_settings.tscn similarity index 99% rename from src/logic-scenes/main menu/video_settings.tscn rename to src/ui/menu_main/video_settings.tscn index bd3a3fe..e8c572e 100644 --- a/src/logic-scenes/main menu/video_settings.tscn +++ b/src/ui/menu_main/video_settings.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://gmxenhavh1lp"] -[ext_resource type="Script" uid="uid://16y8yg750rxm" path="res://logic-scenes/main menu/video_settings.gd" id="1_sii8g"] +[ext_resource type="Script" uid="uid://16y8yg750rxm" path="res://ui/menu_main/video_settings.gd" id="1_sii8g"] [sub_resource type="GDScript" id="GDScript_24hb5"] script/source = " diff --git a/src/logic-scenes/misc/skip_control.gd b/src/ui/skip_control/skip_control.gd similarity index 100% rename from src/logic-scenes/misc/skip_control.gd rename to src/ui/skip_control/skip_control.gd diff --git a/src/logic-scenes/misc/skip_control.gd.uid b/src/ui/skip_control/skip_control.gd.uid similarity index 100% rename from src/logic-scenes/misc/skip_control.gd.uid rename to src/ui/skip_control/skip_control.gd.uid diff --git a/src/logic-scenes/misc/skip_control.tscn b/src/ui/skip_control/skip_control.tscn similarity index 97% rename from src/logic-scenes/misc/skip_control.tscn rename to src/ui/skip_control/skip_control.tscn index 328fcd9..2adc9be 100644 --- a/src/logic-scenes/misc/skip_control.tscn +++ b/src/ui/skip_control/skip_control.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=14 format=3 uid="uid://dvwuhobhka78d"] -[ext_resource type="Script" uid="uid://dw07pldd135f1" path="res://logic-scenes/misc/skip_control.gd" id="1_s6riu"] +[ext_resource type="Script" uid="uid://dw07pldd135f1" path="res://ui/skip_control/skip_control.gd" id="1_s6riu"] [ext_resource type="Script" uid="uid://bbs1u7ojno7xo" path="res://addons/input_prompts/action_prompt/action_prompt.gd" id="2_ev8gx"] [ext_resource type="Texture2D" uid="uid://615hvpuiacvm" path="res://addons/input_prompts/icons/xbox/X.png" id="2_pnwbx"] @@ -17,12 +17,12 @@ corner_radius_bottom_left = 5 expand_margin_top = 5.0 expand_margin_bottom = 5.0 -[sub_resource type="InputEventKey" id="InputEventKey_ckmi5"] +[sub_resource type="InputEventKey" id="InputEventKey_7em4l"] device = -1 physical_keycode = 88 unicode = 120 -[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_x6cxt"] +[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_hb4jw"] device = -1 button_index = 2 pressed = true @@ -296,7 +296,7 @@ stretch_mode = 5 script = ExtResource("2_ev8gx") action = "skip" icon = 0 -events = Array[InputEvent]([null, SubResource("InputEventKey_ckmi5"), SubResource("InputEventJoypadButton_x6cxt")]) +events = Array[InputEvent]([null, SubResource("InputEventKey_7em4l"), SubResource("InputEventJoypadButton_hb4jw")]) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = {