From 73d75da9a54585d86442445600f18caeb8f5a1d6 Mon Sep 17 00:00:00 2001 From: Tiger Jove Date: Mon, 19 Jan 2026 16:41:57 +0100 Subject: [PATCH] fix: light and blur now operates more safely, but there's a problem with room startup. --- .../youth_room/import/materials/wall.tres | 2 +- .../youth_room/scenes/voice_training.tscn | 54 ++-- .../youth_room/shaders/glass.tres | 86 +----- .../youth_room/youth_room.gd | 11 +- .../youth_room/youth_room.tscn | 249 +++++++++--------- .../youth_room/youth_room_environment.gd | 16 +- src/default_bus_layout.tres | 2 +- src/dev-util/debug_save.tres | 24 +- src/dev-util/hardcoded_cards.gd | 1 - src/dev-util/savegame.gd | 2 +- src/import/fonts/title_handwriting.tres | 11 +- .../board/card-textures/card-sprites.tres | 2 +- .../card-textures/sticky-note_sprites.tres | 2 +- src/logic-scenes/interactable/interactable.gd | 7 +- .../player_controller/player_controller.gd | 7 +- src/project.godot | 16 +- 16 files changed, 199 insertions(+), 293 deletions(-) diff --git a/src/base-environments/youth_room/import/materials/wall.tres b/src/base-environments/youth_room/import/materials/wall.tres index 349ccde..d9bfe45 100644 --- a/src/base-environments/youth_room/import/materials/wall.tres +++ b/src/base-environments/youth_room/import/materials/wall.tres @@ -1,4 +1,4 @@ -[gd_resource type="ShaderMaterial" load_steps=5 format=3 uid="uid://ct7uc5i5yp5qf"] +[gd_resource type="ShaderMaterial" format=3 uid="uid://ct7uc5i5yp5qf"] [ext_resource type="Texture2D" uid="uid://c61ekclk8loxn" path="res://base-environments/youth_room/import/textures/red_plaster_weathered_rough_4k.png" id="1_2nxvx"] [ext_resource type="Texture2D" uid="uid://kf0vfm4sf0o3" path="res://base-environments/youth_room/import/textures/red_plaster_weathered_nor_gl_4k.png" id="2_80i0p"] diff --git a/src/base-environments/youth_room/scenes/voice_training.tscn b/src/base-environments/youth_room/scenes/voice_training.tscn index 9e42014..50a9aa5 100644 --- a/src/base-environments/youth_room/scenes/voice_training.tscn +++ b/src/base-environments/youth_room/scenes/voice_training.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://cj1ccdk0686ke"] +[gd_scene format=3 uid="uid://cj1ccdk0686ke"] [ext_resource type="Script" uid="uid://cb1d5cwtgllvq" path="res://logic-scenes/luna/playables/story_playable.gd" id="1_543ki"] [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="2_ho85h"] @@ -652,7 +652,7 @@ _data = { &"vanish": SubResource("Animation_x0d5q") } -[node name="voice_training" type="CenterContainer"] +[node name="voice_training" type="CenterContainer" unique_id=879195009] visible = false anchors_preset = 15 anchor_right = 1.0 @@ -665,11 +665,11 @@ scene_id = 2 story_array = PackedStringArray("My secret comic stash. I remember playing Clue-Men with the boys.", "I had a voice for every character in that comic. But more often than not I played him: Agent Q.", "Going under the radar, putting in precise work to save the world.", "Not having to deal with being a girl.", "Boys were so much easier. They like cars, bikes, guns and agents.", "They don\'t talk behind your back. They don\'t think everything is about relationships.", "Girls don\'t get that. I knew they talked behind my back about me only “pretending” to like boy stuff, so I’d get laid ", "… I mean, maybe they were right?", "Like I won\'t deny I was probably the first girl in my class to see a dick.", "But like - that’s what the boys do, right?", "At least it has gotten better after me and Jojo became friends.", "I still remember how that happend. I did a voice acting workshop in art class.", "Being allowed to share my technique in front of everyone was just :D", "I mean next to nobody put in any effort. But Jojo did.", "When our Mr Funny then decided to ape her attempts instead of just minding his own, I pretty much exploded.", "After this, we suddenly were besties. And my class finally started to just leave me be. ", "Maybe because I for once was friends with another girl. Maybe because I scared them. Maybe both.") paragraph_lengths = PackedInt32Array(1, 2, 5, 7, 9, 10, 13, 14, 16) -[node name="PanelContainer" type="PanelContainer" parent="."] +[node name="PanelContainer" type="PanelContainer" parent="." unique_id=2032917301] layout_mode = 2 mouse_filter = 1 -[node name="StartFrame" type="TextureRect" parent="PanelContainer"] +[node name="StartFrame" type="TextureRect" parent="PanelContainer" unique_id=756499554] custom_minimum_size = Vector2(900, 900) layout_mode = 2 size_flags_vertical = 0 @@ -677,7 +677,7 @@ texture = ExtResource("2_ho85h") expand_mode = 2 stretch_mode = 4 -[node name="Panel" type="PanelContainer" parent="PanelContainer/StartFrame"] +[node name="Panel" type="PanelContainer" parent="PanelContainer/StartFrame" unique_id=907097464] show_behind_parent = true layout_mode = 1 anchors_preset = 8 @@ -695,7 +695,7 @@ rotation = 0.349066 pivot_offset = Vector2(450, 450) mouse_filter = 1 -[node name="TextureRect" type="TextureRect" parent="PanelContainer/StartFrame"] +[node name="TextureRect" type="TextureRect" parent="PanelContainer/StartFrame" unique_id=1771437247] layout_mode = 1 anchors_preset = 6 anchor_left = 1.0 @@ -711,7 +711,7 @@ grow_vertical = 2 scale = Vector2(0.5, 0.5) texture = SubResource("ViewportTexture_ho85h") -[node name="SubViewport" type="SubViewport" parent="PanelContainer/StartFrame/TextureRect"] +[node name="SubViewport" type="SubViewport" parent="PanelContainer/StartFrame/TextureRect" unique_id=2093055714] own_world_3d = true world_3d = SubResource("World3D_4m36g") transparent_bg = true @@ -720,25 +720,25 @@ canvas_cull_mask = 4293918724 size = Vector2i(1024, 1536) render_target_update_mode = 3 -[node name="Node3D" type="Node3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport"] +[node name="Node3D" type="Node3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport" unique_id=1223174623] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.21953, 3.52719, 0) -[node name="YouthSpecialMeshesComicBook1" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] -transform = Transform3D(-0.09237667, -0.0774974, -0.992704, 0.085104756, 0.9927038, -0.08541691, 0.992081, -0.092374295, -0.08510727, -0.045, -0.111, 0.033) +[node name="YouthSpecialMeshesComicBook1" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=1635341837] +transform = Transform3D(-0.09237667, -0.07749739, -0.992704, 0.085104756, 0.99270374, -0.08541691, 0.992081, -0.09237429, -0.08510727, -0.045, -0.111, 0.033) mesh = ExtResource("3_ho85h") skeleton = NodePath("../..") -[node name="YouthSpecialMeshesComicBook2" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] -transform = Transform3D(-0.4210099, 0.12640648, -0.7739451, 0.15260528, 0.78532714, 0.07756861, 0.78067994, -0.08534441, -0.4325408, 0.02, -0.055, -0.02) +[node name="YouthSpecialMeshesComicBook2" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=1795445499] +transform = Transform3D(-0.4210099, 0.12640648, -0.7739451, 0.15260528, 0.7853272, 0.07756861, 0.78067994, -0.08534442, -0.4325408, 0.02, -0.055, -0.02) mesh = ExtResource("4_kn83e") skeleton = NodePath("../..") -[node name="Camera3D" type="Camera3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +[node name="Camera3D" type="Camera3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=1920540085] transform = Transform3D(1, -4.88994e-09, 1.82221e-11, 4.88232e-09, 0.998636, 0.052214, -2.7352e-10, -0.052214, 0.998636, -0.025, 0, 0.81) current = true fov = 33.0 -[node name="SpotLight3D" type="SpotLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +[node name="SpotLight3D" type="SpotLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=327063891] transform = Transform3D(0.302014, 0.249491, -0.920077, 0.207638, 0.924758, 0.318918, 0.930416, -0.287361, 0.227486, -0.495, 0.186, 0.167) layers = 4 light_color = Color(0.992157, 0.917647, 0.835294, 1) @@ -749,28 +749,28 @@ shadow_normal_bias = 2.171 spot_range = 0.846959 spot_angle = 23.1819 -[node name="OmniLight3D" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +[node name="OmniLight3D" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=997492291] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.355, 0, -0.09) light_color = Color(0.266667, 0.286275, 1, 1) light_size = 0.5 omni_range = 2.5227 -[node name="OmniLight3D2" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +[node name="OmniLight3D2" type="OmniLight3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D" unique_id=660273946] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.435, -0.145, 0) light_color = Color(0.607843, 0.34902, 0.203922, 1) light_energy = 0.1 light_size = 0.5 omni_range = 2.0 -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer" unique_id=1232417546] layout_mode = 2 -[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"] +[node name="Label" type="Label" parent="PanelContainer/VBoxContainer" unique_id=990507674] layout_mode = 2 theme_type_variation = &"HeaderLarge" text = "secret Comic Stash" -[node name="StoryScroll" type="ScrollContainer" parent="PanelContainer/VBoxContainer"] +[node name="StoryScroll" type="ScrollContainer" parent="PanelContainer/VBoxContainer" unique_id=1023430885] unique_name_in_owner = true custom_minimum_size = Vector2(0, 700) layout_mode = 2 @@ -779,7 +779,7 @@ size_flags_vertical = 2 horizontal_scroll_mode = 0 vertical_scroll_mode = 3 -[node name="StoryLabel" type="RichTextLabel" parent="PanelContainer/VBoxContainer/StoryScroll"] +[node name="StoryLabel" type="RichTextLabel" parent="PanelContainer/VBoxContainer/StoryScroll" unique_id=1245725626] unique_name_in_owner = true custom_minimum_size = Vector2(800, 10) layout_mode = 2 @@ -790,7 +790,7 @@ fit_content = true scroll_active = false visible_characters_behavior = 1 -[node name="StartBottom" type="TextureRect" parent="PanelContainer/VBoxContainer"] +[node name="StartBottom" type="TextureRect" parent="PanelContainer/VBoxContainer" unique_id=532308306] custom_minimum_size = Vector2(0, 64) layout_mode = 2 size_flags_vertical = 8 @@ -798,19 +798,17 @@ texture = ExtResource("4_ayw8a") expand_mode = 2 stretch_mode = 4 -[node name="SkipControl" parent="PanelContainer" instance=ExtResource("5_b3y80")] +[node name="SkipControl" parent="PanelContainer" unique_id=615471104 instance=ExtResource("5_b3y80")] unique_name_in_owner = true layout_mode = 2 -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1196634762] unique_name_in_owner = true root_node = NodePath("../PanelContainer/StartFrame/Panel") -libraries = { -&"": SubResource("AnimationLibrary_dc6th") -} -autoplay = "ini" +libraries/ = SubResource("AnimationLibrary_dc6th") +autoplay = &"ini" -[node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer"] +[node name="Text" type="AudioStreamPlayer" parent="AnimationPlayer" unique_id=1140635269] mix_target = 2 bus = &"text" script = ExtResource("9_kn83e") diff --git a/src/base-environments/youth_room/shaders/glass.tres b/src/base-environments/youth_room/shaders/glass.tres index def5e94..cba99d3 100644 --- a/src/base-environments/youth_room/shaders/glass.tres +++ b/src/base-environments/youth_room/shaders/glass.tres @@ -1,4 +1,4 @@ -[gd_resource type="VisualShader" load_steps=10 format=3 uid="uid://bcuduhlnij5mc"] +[gd_resource type="VisualShader" format=3 uid="uid://bcuduhlnij5mc"] [sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_pq5me"] default_input_values = [0, 1.0, 1, 3.0] @@ -26,90 +26,6 @@ operator = 2 operator = 8 [resource] -code = "shader_type spatial; -render_mode blend_add, depth_draw_opaque, depth_test_default, cull_back, diffuse_lambert, specular_schlick_ggx; - -uniform vec4 glass_tint : source_color; -uniform vec4 lightcolor : source_color; - - - -void fragment() { -// ColorParameter:3 - vec4 n_out3p0 = glass_tint; - - -// FloatConstant:2 - float n_out2p0 = 0.000000; - - -// Input:5 - vec2 n_out5p0 = UV; - - -// VectorDecompose:6 - float n_out6p0 = vec3(n_out5p0, 0.0).x; - float n_out6p1 = vec3(n_out5p0, 0.0).y; - float n_out6p2 = vec3(n_out5p0, 0.0).z; - - -// FloatOp:11 - float n_in11p1 = 3.00000; - float n_out11p0 = pow(n_out6p1, n_in11p1); - - -// ColorParameter:4 - vec4 n_out4p0 = lightcolor; - - -// Fresnel:7 - float n_in7p3 = 1.00000; - float n_out7p0 = pow(1.0 - clamp(dot(NORMAL, VIEW), 0.0, 1.0), n_in7p3); - - -// VectorOp:8 - vec3 n_out8p0 = vec3(n_out4p0.xyz) * vec3(n_out7p0); - - - vec3 n_out9p0; -// ColorOp:9 - { - float base = vec3(n_out11p0).x; - float blend = n_out8p0.x; - if (base < 0.5) { - n_out9p0.x = (base * (2.0 * blend)); - } else { - n_out9p0.x = (1.0 - (1.0 - base) * (1.0 - 2.0 * (blend - 0.5))); - } - } - { - float base = vec3(n_out11p0).y; - float blend = n_out8p0.y; - if (base < 0.5) { - n_out9p0.y = (base * (2.0 * blend)); - } else { - n_out9p0.y = (1.0 - (1.0 - base) * (1.0 - 2.0 * (blend - 0.5))); - } - } - { - float base = vec3(n_out11p0).z; - float blend = n_out8p0.z; - if (base < 0.5) { - n_out9p0.z = (base * (2.0 * blend)); - } else { - n_out9p0.z = (1.0 - (1.0 - base) * (1.0 - 2.0 * (blend - 0.5))); - } - } - - -// Output:0 - ALBEDO = vec3(n_out3p0.xyz); - ROUGHNESS = n_out2p0; - EMISSION = n_out9p0; - - -} -" modes/blend = 1 nodes/fragment/2/node = SubResource("VisualShaderNodeFloatConstant_2mt73") nodes/fragment/2/position = Vector2(40, 260) diff --git a/src/base-environments/youth_room/youth_room.gd b/src/base-environments/youth_room/youth_room.gd index 767af55..adc3b1f 100644 --- a/src/base-environments/youth_room/youth_room.gd +++ b/src/base-environments/youth_room/youth_room.gd @@ -13,6 +13,9 @@ func start_room(): await Main.curtain.open() + # To start breathing etc. + %PlayerController.process_mode = PROCESS_MODE_INHERIT + # Skip intro if already loaded. if not Scenes.is_sequence_repeating(Scenes.id.YOUTH_DRAVEN): # Play intro scene directly (not triggered by CollectableUi) @@ -20,18 +23,16 @@ func start_room(): else: %LightAnimation.lights_on() - # To start breathing etc. - %PlayerController.process_mode = Node.PROCESS_MODE_INHERIT - - # Give player control after intro (or immediately if repeating) Scenes.player_enable.emit(true) + + func _play_intro_scene() -> void: # The intro scene is auto-played, not triggered by CollectableUi var intro: Interactable = $logic/CeilingInteractable - await intro.play_story() + await intro.interact() func get_ready(): diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 56dd758..197de8b 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=118 format=4 uid="uid://b3b0gyvklqn50"] +[gd_scene format=4 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" uid="uid://bsop46tqngddc" path="res://base-environments/youth_room/youth_room.gd" id="1_aitp0"] [ext_resource type="AudioStream" uid="uid://1h6k2d8q1kw3" path="res://base-environments/youth_room/import/sounds/rain_on_window.mp3" id="2_3haaq"] @@ -1400,7 +1400,6 @@ glow_levels/7 = 2.0 glow_intensity = 0.4 glow_strength = 0.7 glow_bloom = 0.13 -glow_blend_mode = 1 glow_hdr_threshold = 0.46 fog_enabled = true fog_light_color = Color(0.141176, 0.133333, 0.301961, 1) @@ -1511,180 +1510,180 @@ func hide(): visible = false " -[node name="youth room" type="Node3D" groups=["serializable"]] +[node name="youth room" type="Node3D" unique_id=881332335 groups=["serializable"]] process_mode = 1 script = ExtResource("1_aitp0") -[node name="logic" type="Node3D" parent="."] +[node name="logic" type="Node3D" parent="." unique_id=1076815435] -[node name="PlayerController" parent="logic" groups=["camera_owner"] instance=ExtResource("3_foj4y")] +[node name="PlayerController" parent="logic" unique_id=286688939 groups=["camera_owner"] instance=ExtResource("3_foj4y")] unique_name_in_owner = true transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.63, 0, 0.925) -[node name="Collision" type="Node3D" parent="logic"] +[node name="Collision" type="Node3D" parent="logic" unique_id=969458697] -[node name="Desk_Colission" type="StaticBody3D" parent="logic/Collision"] +[node name="Desk_Colission" type="StaticBody3D" parent="logic/Collision" unique_id=246170285] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.500324, 0, 1.36908) -[node name="wardrobe" type="CollisionShape3D" parent="logic/Collision/Desk_Colission"] +[node name="wardrobe" type="CollisionShape3D" parent="logic/Collision/Desk_Colission" unique_id=1961676455] transform = Transform3D(0.998323, 0, -0.0578951, 0, 1, 0, 0.0578951, 0, 0.998323, -0.340775, 1.06708, -1.66491) shape = SubResource("BoxShape3D_j3mqx") -[node name="desk" type="CollisionShape3D" parent="logic/Collision/Desk_Colission"] +[node name="desk" type="CollisionShape3D" parent="logic/Collision/Desk_Colission" unique_id=43798157] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0231352, 0.250741, 0.104591) shape = SubResource("BoxShape3D_ddjvs") -[node name="beanbag" type="CollisionShape3D" parent="logic/Collision/Desk_Colission"] +[node name="beanbag" type="CollisionShape3D" parent="logic/Collision/Desk_Colission" unique_id=735264519] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.617999, 0.0319539, 0.997871) shape = SubResource("SphereShape3D_gjlrn") -[node name="Bed_Colission" type="StaticBody3D" parent="logic/Collision"] +[node name="Bed_Colission" type="StaticBody3D" parent="logic/Collision" unique_id=1728991581] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.33596, 0, -0.345267) -[node name="bed" type="CollisionShape3D" parent="logic/Collision/Bed_Colission"] +[node name="bed" type="CollisionShape3D" parent="logic/Collision/Bed_Colission" unique_id=1995092431] transform = Transform3D(0.997568, 0, 0.0697043, 0, 1, 0, -0.0697042, 0, 0.997568, -0.474526, 0.939937, 0.0332472) shape = SubResource("BoxShape3D_r40dp") -[node name="shelf" type="CollisionShape3D" parent="logic/Collision/Bed_Colission"] +[node name="shelf" type="CollisionShape3D" parent="logic/Collision/Bed_Colission" unique_id=2080403578] transform = Transform3D(0.999866, 0, 0.0163991, 0, 1, 0, -0.016399, 0, 0.999865, -1.30004, 0.523912, 0.0332471) shape = SubResource("BoxShape3D_qck8u") -[node name="shelf2" type="CollisionShape3D" parent="logic/Collision/Bed_Colission"] +[node name="shelf2" type="CollisionShape3D" parent="logic/Collision/Bed_Colission" unique_id=862517724] transform = Transform3D(0.999463, 0, 0.0327938, 0, 1, 0, -0.0327936, 0, 0.999461, -1.46453, 0.719302, -0.377773) shape = SubResource("BoxShape3D_cdjmm") -[node name="beanbag" type="CollisionShape3D" parent="logic/Collision/Bed_Colission"] +[node name="beanbag" type="CollisionShape3D" parent="logic/Collision/Bed_Colission" unique_id=1762887550] transform = Transform3D(1, 0, 0, 0, 1, 0, 2.98023e-08, 0, 1, -1.02669, 0.222592, 1.01232) shape = SubResource("SphereShape3D_srxfv") -[node name="ladder" type="CollisionShape3D" parent="logic/Collision/Bed_Colission"] +[node name="ladder" type="CollisionShape3D" parent="logic/Collision/Bed_Colission" unique_id=995066601] transform = Transform3D(0.903933, 0.427674, 0, -0.427674, 0.903933, 0, 2.98023e-08, 0, 1, -1.27755, 0.47535, 1.08849) shape = SubResource("BoxShape3D_16r57") -[node name="seat" type="StaticBody3D" parent="logic/Collision"] +[node name="seat" type="StaticBody3D" parent="logic/Collision" unique_id=480291411] transform = Transform3D(0.915582, 0, -0.402131, 0, 1, 0, 0.402131, 0, 0.915582, 1.393, 0, -0.762) -[node name="rest" type="CollisionShape3D" parent="logic/Collision/seat"] +[node name="rest" type="CollisionShape3D" parent="logic/Collision/seat" unique_id=621243946] transform = Transform3D(1, 0, -3.74434e-08, 0, 1, 0, 3.74434e-08, 0, 1, -4.94719e-06, 0.266536, -0.000100613) shape = SubResource("BoxShape3D_qmnj2") -[node name="seat" type="CollisionShape3D" parent="logic/Collision/seat"] +[node name="seat" type="CollisionShape3D" parent="logic/Collision/seat" unique_id=1891571122] transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 0.246583, -0.1835, 0.392215) shape = SubResource("BoxShape3D_qmnj2") -[node name="step" type="CollisionShape3D" parent="logic/Collision/seat"] +[node name="step" type="CollisionShape3D" parent="logic/Collision/seat" unique_id=494505140] transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 0.124096, -0.746043, 0.388092) shape = SubResource("SphereShape3D_4ckrq") -[node name="Room_Colission" type="StaticBody3D" parent="logic/Collision"] +[node name="Room_Colission" type="StaticBody3D" parent="logic/Collision" unique_id=2103515292] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.811571, 0, 0) -[node name="WorldBoundary (Floor)" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="WorldBoundary (Floor)" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=1837358568] shape = SubResource("WorldBoundaryShape3D_dqyng") -[node name="Wall1" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Wall1" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=1433458518] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.02419, 1.06708, 2.75985) shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall3" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Wall3" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=461970628] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.254488, 1.06708, 3.24245) shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall4" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Wall4" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=1483136786] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.34814, 1.06708, 1.83013) shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall5" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Wall5" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=2031420436] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.93595, 1.06708, -0.147208) shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall7" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Wall7" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=1378411564] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 2.62379, 2.06427, -0.010276) shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall6" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Wall6" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=1649064893] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1011, 1.06708, -1.5887897) shape = SubResource("BoxShape3D_1nque") -[node name="Pillar" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Pillar" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=1066677459] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.27524, 1.07009, 1.26831) shape = SubResource("BoxShape3D_eq1fk") -[node name="shelf3" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="shelf3" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=179183995] transform = Transform3D(0.98956, 0, -0.144121, 0, 1, 0, 0.144121, 0, 0.98956, 2.60628, 0.308069, 1.91136) shape = SubResource("BoxShape3D_js8wo") -[node name="Crate" type="CollisionShape3D" parent="logic/Collision/Room_Colission"] +[node name="Crate" type="CollisionShape3D" parent="logic/Collision/Room_Colission" unique_id=1825480100] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.04802, -0.30081803, -0.711172) shape = SubResource("BoxShape3D_ychlh") -[node name="Bed and Ladders" type="Node3D" parent="logic"] +[node name="Bed and Ladders" type="Node3D" parent="logic" unique_id=2040890938] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.84538, 0, 0.803611) -[node name="ladder_trigger" type="Area3D" parent="logic/Bed and Ladders"] +[node name="ladder_trigger" type="Area3D" parent="logic/Bed and Ladders" unique_id=1301656435] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3045067, 0) collision_layer = 2 collision_mask = 2 script = ExtResource("3_x3dlb") -[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder_trigger"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder_trigger" unique_id=907047548] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.17002809, 0.508749, -0.045577526) shape = SubResource("CapsuleShape3D_f1g8m") -[node name="bed_duck" type="Area3D" parent="logic/Bed and Ladders"] +[node name="bed_duck" type="Area3D" parent="logic/Bed and Ladders" unique_id=1249996484] collision_layer = 2 collision_mask = 2 script = ExtResource("3_x3dlb") -[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/bed_duck"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/bed_duck" unique_id=81471288] transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0.096419, 0.995341, -4.37114e-08, 0.9784893, 1.2551697, -1.14479) shape = SubResource("CapsuleShape3D_kewqg") -[node name="bed_enter" type="Area3D" parent="logic/Bed and Ladders"] +[node name="bed_enter" type="Area3D" parent="logic/Bed and Ladders" unique_id=1822432673] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.35717, 0, -0.255744) collision_layer = 2 collision_mask = 2 -[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/bed_enter"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/bed_enter" unique_id=1566799420] transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0.096419, 0.995341, -4.37114e-08, 0, 0, 0) shape = SubResource("CapsuleShape3D_k4x40") -[node name="bed_crouch" type="Area3D" parent="logic/Bed and Ladders"] +[node name="bed_crouch" type="Area3D" parent="logic/Bed and Ladders" unique_id=1239184262] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.24356, 0, -0.796765) collision_layer = 2 collision_mask = 2 script = ExtResource("3_x3dlb") -[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/bed_crouch"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/bed_crouch" unique_id=28247311] transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0.096419, 0.995341, -4.37114e-08, 0.107988, 1.56575e-08, -0.358201) shape = SubResource("CapsuleShape3D_4q8vc") -[node name="reset_failover" type="Area3D" parent="logic/Bed and Ladders"] +[node name="reset_failover" type="Area3D" parent="logic/Bed and Ladders" unique_id=545247939] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.24356, 0, -0.531366) collision_layer = 2 collision_mask = 2 -[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/reset_failover"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/reset_failover" unique_id=1849813286] transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0.096419, 0.995341, -4.37114e-08, 0, 0, 0) shape = SubResource("CapsuleShape3D_n20ff") -[node name="ladder" type="AnimatableBody3D" parent="logic/Bed and Ladders"] +[node name="ladder" type="AnimatableBody3D" parent="logic/Bed and Ladders" unique_id=1610992028] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0699199, 0, -0.082733) script = ExtResource("4_dqyng") -[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder" unique_id=1231740790] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.336261, -0.199846, 0.0549462) shape = SubResource("BoxShape3D_gim5a") -[node name="CollisionShape3D2" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder"] +[node name="CollisionShape3D2" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder" unique_id=1158510319] transform = Transform3D(0.833085, 0, -0.553144, 0, 1, 0, 0.553144, 0, 0.833085, 0.0114179, 0, -0.412249) shape = SubResource("BoxShape3D_bq15k") -[node name="CollisionShape3D3" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder"] +[node name="CollisionShape3D3" type="CollisionShape3D" parent="logic/Bed and Ladders/ladder" unique_id=377291040] transform = Transform3D(0.707304, 0, 0.706909, 0, 1, 0, -0.706909, 0, 0.707304, 0.240986, 0, 0.539403) shape = SubResource("BoxShape3D_bq15k") -[node name="UI" type="Control" parent="logic"] +[node name="UI" type="Control" parent="logic" unique_id=1162293317] unique_name_in_owner = true layout_mode = 3 anchors_preset = 15 @@ -1694,7 +1693,7 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -[node name="ending_button" type="Button" parent="logic/UI"] +[node name="ending_button" type="Button" parent="logic/UI" unique_id=94244802] visible = false top_level = true layout_mode = 0 @@ -1708,18 +1707,18 @@ ordering your thoughts. This is as far as the demo goes. Press x or [ ] to wrap up." -[node name="Picker" parent="logic/UI" groups=["scene_actors"] instance=ExtResource("19_a4n1o")] +[node name="Picker" parent="logic/UI" unique_id=340771691 groups=["scene_actors"] instance=ExtResource("19_a4n1o")] unique_name_in_owner = true visible = false layout_mode = 1 -[node name="ending" parent="logic/UI" instance=ExtResource("5_kts6y")] +[node name="ending" parent="logic/UI" unique_id=1355201927 instance=ExtResource("5_kts6y")] visible = false layout_mode = 1 mouse_filter = 2 script = SubResource("GDScript_uy50s") -[node name="Opening" type="CenterContainer" parent="logic/UI"] +[node name="Opening" type="CenterContainer" parent="logic/UI" unique_id=1277722783] visible = false layout_mode = 1 anchors_preset = 15 @@ -1730,7 +1729,7 @@ grow_vertical = 2 mouse_filter = 2 script = SubResource("GDScript_dqyng") -[node name="Label" type="Label" parent="logic/UI/Opening"] +[node name="Label" type="Label" parent="logic/UI/Opening" unique_id=523551989] modulate = Color(1, 1, 1, 0) layout_mode = 2 theme_override_constants/line_spacing = -11 @@ -1742,7 +1741,7 @@ It's an aquired taste, but trust me: all of it has a reason. And if you ever had to make this lemonade, you will understand my recipie. Don't be bitter if you don't. Just be happy that you didn't taste it for real." -[node name="StartBottom" type="TextureRect" parent="logic/UI/Opening/Label"] +[node name="StartBottom" type="TextureRect" parent="logic/UI/Opening/Label" unique_id=17242341] custom_minimum_size = Vector2(0, 64) layout_mode = 0 offset_left = -53.0 @@ -1754,54 +1753,50 @@ texture = ExtResource("8_e5y1q") expand_mode = 2 stretch_mode = 4 -[node name="AnimationPlayer" type="AnimationPlayer" parent="logic/UI/Opening"] -libraries = { -&"": SubResource("AnimationLibrary_xbjb2") -} +[node name="AnimationPlayer" type="AnimationPlayer" parent="logic/UI/Opening" unique_id=1960341586] +libraries/ = SubResource("AnimationLibrary_xbjb2") -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="logic/UI/Opening/AnimationPlayer"] +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="logic/UI/Opening/AnimationPlayer" unique_id=1461967662] volume_db = -5.0 mix_target = 2 bus = &"text" script = ExtResource("10_ypa88") -[node name="ScenePlayer" type="AnimationPlayer" parent="logic" groups=["scene_actors"]] +[node name="ScenePlayer" type="AnimationPlayer" parent="logic" unique_id=1876562176 groups=["scene_actors"]] unique_name_in_owner = true -libraries = { -&"": SubResource("AnimationLibrary_ilekd") -} -autoplay = "RESET" +libraries/ = SubResource("AnimationLibrary_ilekd") +autoplay = &"RESET" script = ExtResource("13_5bsh1") -[node name="Lisa" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Lisa" type="AudioStreamPlayer" parent="logic/ScenePlayer" unique_id=227609418] mix_target = 2 bus = &"text" -[node name="Moving" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Moving" type="AudioStreamPlayer" parent="logic/ScenePlayer" unique_id=1653546103] stream = ExtResource("8_egnow") bus = &"music" -[node name="Childhood" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Childhood" type="AudioStreamPlayer" parent="logic/ScenePlayer" unique_id=1212464138] stream = ExtResource("9_i8mqk") volume_db = -80.0 bus = &"music" -[node name="VoiceTraining" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="VoiceTraining" type="AudioStreamPlayer" parent="logic/ScenePlayer" unique_id=1091978868] stream = ExtResource("10_wwwdq") volume_db = -80.0 bus = &"music" -[node name="Jui_Jutsu" type="AudioStreamPlayer" parent="logic/ScenePlayer"] +[node name="Jui_Jutsu" type="AudioStreamPlayer" parent="logic/ScenePlayer" unique_id=128771998] bus = &"music" -[node name="starlight_mesh" type="MeshInstance3D" parent="logic/ScenePlayer"] +[node name="starlight_mesh" type="MeshInstance3D" parent="logic/ScenePlayer" unique_id=1914325340] transform = Transform3D(0.999, 0, 0, 0, 0.999, 0, 0, 0, 0.999, 0, 0, 0) layers = 2 gi_mode = 0 mesh = SubResource("ArrayMesh_bgk6f") skeleton = NodePath("../../..") -[node name="starlight_ambient" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh"] +[node name="starlight_ambient" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh" unique_id=1999745756] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0.644969, 2.70318, -0.247641) light_color = Color(0.0313726, 0, 1, 1) light_energy = 0.2 @@ -1813,7 +1808,7 @@ shadow_blur = 1.277 spot_angle = 85.9425 spot_angle_attenuation = 0.57435 -[node name="starlight_lamp_dynamic" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh"] +[node name="starlight_lamp_dynamic" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh" unique_id=390841911] transform = Transform3D(0.55069, -0.676558, 0.488887, 0.695251, 0.0476608, -0.717185, 0.461917, 0.734845, 0.496624, 1.76541, 0.251864, 0.941618) light_color = Color(0, 1, 1, 1) light_energy = 2.0 @@ -1825,7 +1820,7 @@ spot_attenuation = 0.732044 spot_angle = 35.0 spot_angle_attenuation = 2.9742036 -[node name="starlight_lamp_static" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh"] +[node name="starlight_lamp_static" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh" unique_id=1019852034] transform = Transform3D(0.55069, -0.676558, 0.488887, 0.695251, 0.0476608, -0.717185, 0.461917, 0.734845, 0.496624, 1.76541, 0.251864, 0.941618) light_color = Color(0, 0.078431375, 1, 1) light_specular = 0.0 @@ -1836,13 +1831,13 @@ spot_attenuation = 0.732044 spot_angle = 27.6108 spot_angle_attenuation = 1.18921 -[node name="material_handle" type="CSGBox3D" parent="logic/ScenePlayer"] +[node name="material_handle" type="CSGBox3D" parent="logic/ScenePlayer" unique_id=383298296] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.70325, -1.08521, 0.0348804) visible = false size = Vector3(2.1502, 1.34648, 2.12063) material = ExtResource("28_oiweb") -[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer"] +[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer" unique_id=2016739930] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.12436, -0.521364) visible = false light_color = Color(0.741176, 0.211765, 0.698039, 1) @@ -1850,29 +1845,29 @@ light_energy = 0.0 light_size = 1.0 light_cull_mask = 4294967293 -[node name="Luna_frame-of-mind" parent="logic/ScenePlayer" instance=ExtResource("27_pb1jl")] +[node name="Luna_frame-of-mind" parent="logic/ScenePlayer" unique_id=698721442 instance=ExtResource("27_pb1jl")] transform = Transform3D(0.95889795, 0, 0.28374717, 0, 1, 0, -0.28374717, 0, 0.95889795, -10.1552, 14.9384, -16.2182) visible = false -[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer/Luna_frame-of-mind"] +[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer/Luna_frame-of-mind" unique_id=1495498261] transform = Transform3D(1, 0, 5.96046e-08, 0, 1, 0, -5.96046e-08, 0, 1, 0.0190229, 10.6551, -6.76412) light_color = Color(0.219608, 0.862745, 0.721569, 1) light_energy = 20.0 light_size = 10.0 omni_range = 14.8804 -[node name="OmniLight3D2" type="OmniLight3D" parent="logic/ScenePlayer/Luna_frame-of-mind"] +[node name="OmniLight3D2" type="OmniLight3D" parent="logic/ScenePlayer/Luna_frame-of-mind" unique_id=714325659] transform = Transform3D(0.999848, 0, -0.0174256, 0, 1, 0, 0.0174256, 0, 0.999848, 9.36941, 2.05006, -6.94176) light_color = Color(0.921569, 0.360784, 0.580392, 1) light_energy = 100.0 light_size = 20.0 omni_range = 16.8518 -[node name="MaskInteractable" parent="logic" instance=ExtResource("22_ks23q")] +[node name="MaskInteractable" parent="logic" unique_id=370154197 instance=ExtResource("22_ks23q")] transform = Transform3D(-0.8827416, 0, 0.4698562, 0, 1, 0, -0.4698562, 0, -0.8827416, -0.032227404, 0.58693635, 2.5655098) interaction = ExtResource("12_viwxf") -[node name="MindBoardInteractable" parent="logic" instance=ExtResource("22_ks23q")] +[node name="MindBoardInteractable" parent="logic" unique_id=1561685712 instance=ExtResource("22_ks23q")] transform = Transform3D(-4.371126e-08, 0, -0.9999984, 0, 1, 0, 0.9999984, 0, -4.371126e-08, -0.907206, 1.17661, 1.74337) interaction = ExtResource("4_gyjxx") billboard = false @@ -1883,18 +1878,18 @@ transform = Transform3D(0.99999994, 0, 3.5527137e-15, 0, 1, 0, -3.5527137e-15, 0 [node name="View" parent="logic/MindBoardInteractable" index="1"] transform = Transform3D(-0.9999999, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -0.9999999, -0.08611119, 0.040526867, -0.06492537) -[node name="CeilingInteractable" parent="logic" instance=ExtResource("22_ks23q")] +[node name="CeilingInteractable" parent="logic" unique_id=1502016499 instance=ExtResource("22_ks23q")] transform = Transform3D(0.78626597, 0, 0.6178859, 0, 1, 0, -0.6178859, 0, 0.78626597, -0.13478619, 2.0720484, -0.42032808) interaction = ExtResource("19_d3c7p") -[node name="ComicInteractable" parent="logic" instance=ExtResource("22_ks23q")] +[node name="ComicInteractable" parent="logic" unique_id=1577230030 instance=ExtResource("22_ks23q")] transform = Transform3D(0.9797145, 0, 0.20039362, 0, 1, 0, -0.20039362, 0, 0.9797145, 2.8945682, 0.2537475, -0.88938636) interaction = ExtResource("13_v3447") [node name="View" parent="logic/ComicInteractable" index="1"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.36574292, 0.099999994, 0.032779038) -[node name="ClothesInteractable" parent="logic" instance=ExtResource("22_ks23q")] +[node name="ClothesInteractable" parent="logic" unique_id=1930175170 instance=ExtResource("22_ks23q")] transform = Transform3D(0.7935111, 0, -0.60855323, 0, 1, 0, 0.60855323, 0, 0.7935111, 1.6334484, 1.1331886, -0.8914416) interaction = ExtResource("12_x3dlb") @@ -1904,7 +1899,7 @@ transform = Transform3D(1, 0, 2.9802322e-08, 0, 1, 0, -2.9802322e-08, 0, 1, -0.0 [node name="collectable_particles" parent="logic/ClothesInteractable" index="3"] transform = Transform3D(0.99999976, 0, 0, 0, 1, 0, 0, 0, 0.99999976, 0.10009599, -0.040801764, -0.19775379) -[node name="DoorInteractable" parent="logic" instance=ExtResource("22_ks23q")] +[node name="DoorInteractable" parent="logic" unique_id=679774715 instance=ExtResource("22_ks23q")] unique_name_in_owner = true transform = Transform3D(-0.9999984, 0, 8.7422585e-08, 0, 1, 0, -8.7422585e-08, 0, -0.9999984, 0.42437345, 0.9173807, -0.95442796) visible = false @@ -1921,14 +1916,12 @@ transform = Transform3D(0.9999998, 0, 2.1316282e-14, 0, 1, 0, -2.1316282e-14, 0, transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, -0.2322388, 0, 0) shape = SubResource("CapsuleShape3D_dqyng") -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -libraries = { -&"": SubResource("AnimationLibrary_vwrt1") -} +[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1118506993] +libraries/ = SubResource("AnimationLibrary_vwrt1") -[node name="sfx" type="Node3D" parent="."] +[node name="sfx" type="Node3D" parent="." unique_id=876893811] -[node name="rain on window" type="AudioStreamPlayer3D" parent="sfx"] +[node name="rain on window" type="AudioStreamPlayer3D" parent="sfx" unique_id=1933244634] transform = Transform3D(-0.410985, -0.460061, 0.787042, -0.904759, 0.311726, -0.290238, -0.111814, -0.831367, -0.544359, 3.06375, 1.7366, -0.735096) stream = ExtResource("2_3haaq") attenuation_model = 1 @@ -1940,13 +1933,13 @@ emission_angle_enabled = true emission_angle_degrees = 57.0 emission_angle_filter_attenuation_db = -19.6 -[node name="thunder" type="AudioStreamPlayer3D" parent="sfx"] +[node name="thunder" type="AudioStreamPlayer3D" parent="sfx" unique_id=1994145476] transform = Transform3D(-0.410985, -0.460061, 0.787042, -0.904759, 0.311726, -0.290238, -0.111814, -0.831367, -0.544359, -0.248397, 4.34956, 8.85405) unit_size = 100.0 panning_strength = 0.3 bus = &"sfx" -[node name="distant_rain" type="AudioStreamPlayer3D" parent="sfx"] +[node name="distant_rain" type="AudioStreamPlayer3D" parent="sfx" unique_id=615291023] stream = ExtResource("22_xrkbj") attenuation_model = 3 pitch_scale = 0.8 @@ -1954,41 +1947,41 @@ autoplay = true panning_strength = 0.2 bus = &"outside-rain" -[node name="visuals" parent="." instance=ExtResource("30_dqyng")] +[node name="visuals" parent="." unique_id=1014500524 instance=ExtResource("30_dqyng")] -[node name="Shadow" type="CSGCombiner3D" parent="visuals"] +[node name="Shadow" type="CSGCombiner3D" parent="visuals" unique_id=263392639] cast_shadow = 3 calculate_tangents = false -[node name="CSGBox3D" type="CSGBox3D" parent="visuals/Shadow"] +[node name="CSGBox3D" type="CSGBox3D" parent="visuals/Shadow" unique_id=2086424661] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.34613, 1.23087, 2.97923) size = Vector3(5.26758, 2.69583, 0.137207) -[node name="CSGBox3D2" type="CSGBox3D" parent="visuals/Shadow"] +[node name="CSGBox3D2" type="CSGBox3D" parent="visuals/Shadow" unique_id=1725523292] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.441227, 2.48778, 0.766643) size = Vector3(3.47876, 0.182022, 4.56238) -[node name="CSGBox3D6" type="CSGBox3D" parent="visuals/Shadow"] +[node name="CSGBox3D6" type="CSGBox3D" parent="visuals/Shadow" unique_id=754257885] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.21313, 1.23861, 0.766643) size = Vector3(0.170044, 2.68037, 4.56238) -[node name="CSGBox3D4" type="CSGBox3D" parent="visuals/Shadow"] +[node name="CSGBox3D4" type="CSGBox3D" parent="visuals/Shadow" unique_id=1136736033] transform = Transform3D(0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 0, 0, 1, 3.1589, 1.73312, 0.766643) size = Vector3(2.57013, 0.182022, 4.56238) -[node name="CSGBox3D5" type="CSGBox3D" parent="visuals/Shadow"] +[node name="CSGBox3D5" type="CSGBox3D" parent="visuals/Shadow" unique_id=1012511383] transform = Transform3D(0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 0, 0, 1, 3.09781, 1.7764, -0.332882) operation = 2 size = Vector3(1.25306, 0.312046, 0.893661) -[node name="CSGBox3D3" type="CSGBox3D" parent="visuals/Shadow"] +[node name="CSGBox3D3" type="CSGBox3D" parent="visuals/Shadow" unique_id=1706983710] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.977913, 1.52551, 2.97298) operation = 2 calculate_tangents = false flip_faces = true size = Vector3(1.74371, 1.18614, 0.271545) -[node name="OmniLight3D" type="OmniLight3D" parent="visuals"] +[node name="OmniLight3D" type="OmniLight3D" parent="visuals" unique_id=1094473302] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.73188, 2.33544, 4.04756) visible = false light_energy = 3.0 @@ -1998,7 +1991,7 @@ light_bake_mode = 0 shadow_enabled = true shadow_caster_mask = 4293918721 -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="visuals"] +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="visuals" unique_id=1850797620] transform = Transform3D(0.82167387, 0.44718716, -0.35337743, -0.41379577, 0.8944143, 0.16969286, 0.3919504, 0.0067938846, 0.9199613, 0.866179, 2.88055, 4.51936) visible = false light_color = Color(0.81982, 0.935491, 0.980381, 1) @@ -2009,9 +2002,9 @@ shadow_enabled = true directional_shadow_mode = 1 sky_mode = 1 -[node name="lights" type="Node3D" parent="visuals"] +[node name="lights" type="Node3D" parent="visuals" unique_id=1468999060] -[node name="desk_light" type="SpotLight3D" parent="visuals/lights"] +[node name="desk_light" type="SpotLight3D" parent="visuals/lights" unique_id=1200941341] transform = Transform3D(1, 0, 0, 0, 0.30009, 0.953911, 0, -0.953911, 0.30009, -0.599038, 1.39757, 1.64821) layers = 2 light_color = Color(0.94902, 0.737255, 0.627451, 1) @@ -2024,7 +2017,7 @@ spot_angle = 58.1539 spot_angle_attenuation = 0.812252 script = SubResource("GDScript_35dmj") -[node name="desk_secondary" type="OmniLight3D" parent="visuals/lights/desk_light"] +[node name="desk_secondary" type="OmniLight3D" parent="visuals/lights/desk_light" unique_id=128118146] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 2.98023e-08, 1, 0.221273, 0.0654936, -0.292101) light_color = Color(0.952941, 0.662745, 0.54902, 1) light_energy = 0.5 @@ -2036,13 +2029,13 @@ shadow_bias = 0.01 shadow_normal_bias = 5.78 omni_attenuation = 1.51572 -[node name="shade_light" type="OmniLight3D" parent="visuals/lights/desk_light"] +[node name="shade_light" type="OmniLight3D" parent="visuals/lights/desk_light" unique_id=1350881179] light_color = Color(0.94902, 0.737255, 0.627451, 1) light_energy = 0.5 light_cull_mask = 4293918721 omni_range = 0.147682 -[node name="OmniLight3D2" type="OmniLight3D" parent="visuals/lights"] +[node name="OmniLight3D2" type="OmniLight3D" parent="visuals/lights" unique_id=1519659723] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.10614, 0.582081, 0.161548) light_color = Color(0.894118, 0.87451, 0.686275, 1) light_size = 0.2 @@ -2053,7 +2046,7 @@ shadow_enabled = true omni_range = 2.0 omni_attenuation = 0.450626 -[node name="OmniLight3D4" type="OmniLight3D" parent="visuals/lights"] +[node name="OmniLight3D4" type="OmniLight3D" parent="visuals/lights" unique_id=700922327] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.47143, 1.6968, -0.548992) layers = 32769 light_color = Color(0.894118, 0.87451, 0.686275, 1) @@ -2065,26 +2058,24 @@ shadow_enabled = true omni_range = 1.3534 omni_attenuation = 1.41421 -[node name="LightAnimation" type="AnimationPlayer" parent="visuals/lights" groups=["scene_actors"]] +[node name="LightAnimation" type="AnimationPlayer" parent="visuals/lights" unique_id=1474829342 groups=["scene_actors"]] unique_name_in_owner = true -libraries = { -&"": SubResource("AnimationLibrary_k8op5") -} -autoplay = "menu" +libraries/ = SubResource("AnimationLibrary_k8op5") +autoplay = &"menu" script = SubResource("GDScript_5ot1o") -[node name="vfx" type="Node3D" parent="visuals"] +[node name="vfx" type="Node3D" parent="visuals" unique_id=27963161] -[node name="lava-lamp" parent="visuals/vfx" instance=ExtResource("21_0k2gr")] +[node name="lava-lamp" parent="visuals/vfx" unique_id=19503867 instance=ExtResource("21_0k2gr")] transform = Transform3D(0.488743, 0, -0.872428, 0, 1, 0, 0.872428, 0, 0.488743, 3.1041, 0.962981, 2.21157) skeleton = NodePath("") -[node name="ReflectionProbe" type="ReflectionProbe" parent="visuals/vfx/lava-lamp"] +[node name="ReflectionProbe" type="ReflectionProbe" parent="visuals/vfx/lava-lamp" unique_id=1464433977] transform = Transform3D(0.866853, 0, -0.498563, 0, 1, 0, 0.498563, 0, 0.866853, -0.0356357, 0.0416123, 0.020328) max_distance = 7.0 size = Vector3(2, 2, 2) -[node name="OmniLight3D" type="SpotLight3D" parent="visuals/vfx/lava-lamp"] +[node name="OmniLight3D" type="SpotLight3D" parent="visuals/vfx/lava-lamp" unique_id=485645144] transform = Transform3D(0.9999999, 0, 0, 0, -4.3711395e-08, -1, 0, 0.9999999, -4.3711385e-08, 0.011304617, 0.187006, -0.0021249056) light_color = Color(0.21945003, 0.45, 0.189, 1) light_size = 0.05 @@ -2097,40 +2088,40 @@ spot_angle = 137.58 spot_angle_attenuation = 1.6358016 script = SubResource("GDScript_yn0pl") -[node name="WorldEnvironment" type="WorldEnvironment" parent="." groups=["scene_actors"]] +[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1939173027 groups=["scene_actors"]] environment = SubResource("Environment_pllnm") camera_attributes = SubResource("CameraAttributesPractical_26mp0") compositor = SubResource("Compositor_bgk6f") script = ExtResource("38_ypa88") -[node name="window_frames" type="MeshInstance3D" parent="WorldEnvironment"] +[node name="window_frames" type="MeshInstance3D" parent="WorldEnvironment" unique_id=1940422221] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.013145) lod_bias = 15.0 mesh = ExtResource("32_w6oa5") skeleton = NodePath("") -[node name="window_glass" type="MeshInstance3D" parent="WorldEnvironment"] +[node name="window_glass" type="MeshInstance3D" parent="WorldEnvironment" unique_id=312878124] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.013145) material_override = SubResource("ShaderMaterial_ea6x8") gi_mode = 0 mesh = SubResource("ArrayMesh_o1lpn") skeleton = NodePath("") -[node name="SubViewport" type="SubViewport" parent="WorldEnvironment/window_glass"] +[node name="SubViewport" type="SubViewport" parent="WorldEnvironment/window_glass" unique_id=686353505] own_world_3d = true handle_input_locally = false size = Vector2i(1920, 1080) -[node name="Camera3D" type="Camera3D" parent="WorldEnvironment/window_glass/SubViewport"] +[node name="Camera3D" type="Camera3D" parent="WorldEnvironment/window_glass/SubViewport" unique_id=34879078] transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.906618, 1.33684, 2.65628) current = true script = SubResource("GDScript_rfgs6") -[node name="outside" parent="WorldEnvironment/window_glass/SubViewport" instance=ExtResource("32_2vgep")] +[node name="outside" parent="WorldEnvironment/window_glass/SubViewport" unique_id=714140624 instance=ExtResource("32_2vgep")] transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.906618, 1.33684, 2.65628) light_energy = 0.0 -[node name="SceneUI" type="Control" parent="."] +[node name="SceneUI" type="Control" parent="." unique_id=278477630] visible = false layout_mode = 3 anchors_preset = 15 @@ -2141,7 +2132,7 @@ grow_vertical = 2 mouse_filter = 1 script = SubResource("GDScript_icgq0") -[node name="Mouse" type="CenterContainer" parent="SceneUI"] +[node name="Mouse" type="CenterContainer" parent="SceneUI" unique_id=148540419] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -2149,22 +2140,22 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="TextureRect" type="TextureRect" parent="SceneUI/Mouse"] +[node name="TextureRect" type="TextureRect" parent="SceneUI/Mouse" unique_id=27154207] layout_mode = 2 texture = ExtResource("13_lqj71") -[node name="old-mask" type="Node3D" parent="."] +[node name="old-mask" type="Node3D" parent="." unique_id=1733112017] -[node name="old_mask" type="MeshInstance3D" parent="old-mask"] +[node name="old_mask" type="MeshInstance3D" parent="old-mask" unique_id=1273659179] transform = Transform3D(-0.51156, -0.746323, -0.425804, 0.144568, -0.563249, 0.813542, -0.846999, 0.354618, 0.396029, -0.0221631, 0.492276, 2.56703) mesh = ExtResource("19_jr2bb") skeleton = NodePath("") -[node name="fairylights" parent="." instance=ExtResource("39_q6rov")] +[node name="fairylights" parent="." unique_id=438715454 instance=ExtResource("39_q6rov")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.89212, 5.96046e-08, -0.143107) light_array = Array[Vector3]([Vector3(-0.545, 0.915, 1.035), Vector3(-0.47, 0.855, 0.905), Vector3(-0.44, 0.871, 0.78), Vector3(-0.385, 0.91, 0.69), Vector3(-0.38, 0.995, 0.595), Vector3(-0.39, 0.925, 0.465), Vector3(-0.364, 0.86, 0.211), Vector3(-0.295, 0.82, 0.06), Vector3(-0.255, 0.805, -0.15), Vector3(-0.175, 0.83, -0.355), Vector3(-0.135, 0.955, -0.515), Vector3(-0.025, 0.78, -0.615), Vector3(0.115, 0.63, -0.695), Vector3(0.245, 0.555, -0.745), Vector3(0.37, 0.595, -0.805), Vector3(0.455, 0.745, -0.84), Vector3(0.505, 0.89, -0.87), Vector3(0.445, 1.175, -0.87), Vector3(0.26, 1.28, -0.815), Vector3(0.125, 1.35, -0.8), Vector3(-0.037, 1.479, -0.834), Vector3(-0.2, 1.601, -0.851), Vector3(-0.359, 1.769, -0.85), Vector3(-0.5, 1.949, -0.85), Vector3(-0.594, 2.126, -0.85), Vector3(-0.634, 2.238, -0.85), Vector3(-0.634, 2.035, -0.85), Vector3(-0.614, 1.875, -0.85), Vector3(-0.65, 1.655, -0.85), Vector3(-0.65, 1.475, -0.87)]) -[node name="VoxelGI" type="VoxelGI" parent="."] +[node name="VoxelGI" type="VoxelGI" parent="." unique_id=2087506568] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.6709186, 1.184079, 0.941082) subdiv = 2 size = Vector3(6.1783752, 2.4035423, 4.126381) diff --git a/src/base-environments/youth_room/youth_room_environment.gd b/src/base-environments/youth_room/youth_room_environment.gd index afd8bed..5a04131 100644 --- a/src/base-environments/youth_room/youth_room_environment.gd +++ b/src/base-environments/youth_room/youth_room_environment.gd @@ -1,5 +1,6 @@ extends WorldEnvironment +var dof_strength_tween : Tween = null func _ready(): State.environment_settings_changed.connect(_on_environment_settings_update) Scenes.scene_starting.connect(scene_starting) @@ -7,21 +8,22 @@ func _ready(): _on_environment_settings_update() func focus_env(): - var dof_strength_tween: Tween = create_tween() + if dof_strength_tween: dof_strength_tween.kill() dof_strength_tween.tween_property(camera_attributes, "dof_blur_amount", 0, 1) await(dof_strength_tween.finished) camera_attributes.dof_blur_near_enabled = false -func focus_object(): +func focus_object(delay: float): + if dof_strength_tween: dof_strength_tween.kill() camera_attributes.dof_blur_near_enabled = true - var dof_strength_tween: Tween = create_tween() - dof_strength_tween.tween_property(camera_attributes, "dof_blur_amount", 0.4, 1) + dof_strength_tween = create_tween() + dof_strength_tween.tween_property(camera_attributes, "dof_blur_amount", 0.4, 1).set_delay(delay) func scene_starting(id: int, _repeat: bool): if id == Scenes.id.YOUTH_VOICE_TRAINING: - #BUG: This await is dangerous and can lead to focus when the user has already moved on - await get_tree().create_timer(10).timeout - focus_object() + focus_object(10.0) + else: + focus_object(0.0) func scene_finished(_id: int, _repeat: bool): focus_env() diff --git a/src/default_bus_layout.tres b/src/default_bus_layout.tres index 72de730..ec2aacf 100644 --- a/src/default_bus_layout.tres +++ b/src/default_bus_layout.tres @@ -1,4 +1,4 @@ -[gd_resource type="AudioBusLayout" load_steps=10 format=3 uid="uid://djkwd76o033io"] +[gd_resource type="AudioBusLayout" format=3 uid="uid://djkwd76o033io"] [sub_resource type="AudioEffectLowPassFilter" id="AudioEffectLowPassFilter_ijm2o"] resource_name = "LowPassFilter" diff --git a/src/dev-util/debug_save.tres b/src/dev-util/debug_save.tres index 42a81a7..5cffe08 100644 --- a/src/dev-util/debug_save.tres +++ b/src/dev-util/debug_save.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SaveGame" load_steps=2 format=3 uid="uid://pndvrrytubnr"] +[gd_resource type="Resource" script_class="SaveGame" format=3 uid="uid://pndvrrytubnr"] [ext_resource type="Script" uid="uid://d06gpwuxmkxkt" path="res://dev-util/savegame.gd" id="1_jr18u"] @@ -8,26 +8,4 @@ unique_save_name = "DEBUG" current_room = 3 mementos_complete = 1669 sequences_enabled = 255 -board_positions = Dictionary[StringName, Vector2]({ -&"@Area2D@365": Vector2(1217, 714), -&"@Area2D@366": Vector2(133.33331, 769.9999), -&"c_adoption": Vector2(361, 853), -&"c_creating_support": Vector2(1282, 248), -&"c_doing_right": Vector2(501, 180), -&"c_mom": Vector2(1356, 462), -&"c_no_eating": Vector2(966, 165), -&"c_peer_therapy": Vector2(171, 576), -&"c_work_piling": Vector2(1280, 920), -&"p_coping": Vector2(133.33331, 879.9999), -&"p_flawed_help": Vector2(133.33333, 330), -&"p_getting_right": Vector2(133.33333, 660), -&"p_good_intensions": Vector2(133.33333, 440), -&"p_great_therapy": Vector2(133.33333, 220), -&"p_improve_myself": Vector2(133.33333, 550), -&"p_self_taught": Vector2(133.33333, 110) -}) -player_position = Vector3(-0.5078903, -0.0027222226, 3.5303586) -player_yaw = 2.187351 -player_pitch = -0.18250465 -last_saved = 1768821079 metadata/_custom_type_script = "uid://d06gpwuxmkxkt" diff --git a/src/dev-util/hardcoded_cards.gd b/src/dev-util/hardcoded_cards.gd index 7603dcb..c575710 100644 --- a/src/dev-util/hardcoded_cards.gd +++ b/src/dev-util/hardcoded_cards.gd @@ -250,4 +250,3 @@ func create_dev_board(parent: Control, _rect: Rect2) -> void: func _ready() -> void: create_dev_board(self, get_viewport().get_visible_rect()) - TranslationServer.set_locale("en") diff --git a/src/dev-util/savegame.gd b/src/dev-util/savegame.gd index 47cb25e..547b5b3 100644 --- a/src/dev-util/savegame.gd +++ b/src/dev-util/savegame.gd @@ -129,7 +129,7 @@ func capture_player_state() -> void: ## Saves to disk with thumbnail func save_to_file(screen_shot: Texture2D) -> void: - if file_name == "DEBUG": + if unique_save_name == "DEBUG": push_warning("SaveGame: DEBUG save skipped (intentional).") return diff --git a/src/import/fonts/title_handwriting.tres b/src/import/fonts/title_handwriting.tres index 4db8333..8a30d9d 100644 --- a/src/import/fonts/title_handwriting.tres +++ b/src/import/fonts/title_handwriting.tres @@ -1,4 +1,4 @@ -[gd_resource type="FontFile" load_steps=11 format=4 uid="uid://cb66e4mqysgf8"] +[gd_resource type="FontFile" format=4 uid="uid://cb66e4mqysgf8"] [sub_resource type="Image" id="Image_2g64l"] data = { @@ -95,6 +95,15 @@ data = PackedByteArray("AAEAAAAOAIAAAwBgT1MvMjZDFt8AAAF8AAAAYGNtYXDfxMwUAAAB3AAA font_name = "Annie Use Your Telescope" style_name = "Regular" msdf_pixel_range = 8 +cache/0/variation_coordinates = {} +cache/0/face_index = 0 +cache/0/embolden = 0.0 +cache/0/transform = Transform2D(1, 0, 0, 1, 0, 0) +cache/0/spacing_top = 0 +cache/0/spacing_bottom = 0 +cache/0/spacing_space = 0 +cache/0/spacing_glyph = 0 +cache/0/baseline_offset = 0.0 cache/0/16/0/ascent = 17.0 cache/0/16/0/descent = 7.0 cache/0/16/0/underline_position = 1.59375 diff --git a/src/logic-scenes/board/card-textures/card-sprites.tres b/src/logic-scenes/board/card-textures/card-sprites.tres index 9f0ddd0..c0c334e 100644 --- a/src/logic-scenes/board/card-textures/card-sprites.tres +++ b/src/logic-scenes/board/card-textures/card-sprites.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=7 format=3 uid="uid://j7e7me3hl6xt"] +[gd_resource type="SpriteFrames" format=3 uid="uid://j7e7me3hl6xt"] [ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="1_l4v2i"] diff --git a/src/logic-scenes/board/card-textures/sticky-note_sprites.tres b/src/logic-scenes/board/card-textures/sticky-note_sprites.tres index c9fa1ad..6647991 100644 --- a/src/logic-scenes/board/card-textures/sticky-note_sprites.tres +++ b/src/logic-scenes/board/card-textures/sticky-note_sprites.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=14 format=3 uid="uid://bixem613olfie"] +[gd_resource type="SpriteFrames" format=3 uid="uid://bixem613olfie"] [ext_resource type="Texture2D" uid="uid://c8ckkjmdegyis" path="res://logic-scenes/board/card-textures/postitsheet.png" id="1_c6eib"] diff --git a/src/logic-scenes/interactable/interactable.gd b/src/logic-scenes/interactable/interactable.gd index 0d1ef30..cea4bc3 100644 --- a/src/logic-scenes/interactable/interactable.gd +++ b/src/logic-scenes/interactable/interactable.gd @@ -159,12 +159,15 @@ func play_burner() -> void: func interact() -> void: Scenes.player_enable.emit(false) + var repeat := collected + var scene : Scenes.id = playable.scene_id if playable is StoryPlayable else Scenes.id.NONE + + Scenes.scene_starting.emit(scene, repeat) await collapse() # collapse other interactables BEFORE showing canvas get_tree().call_group("interactables", "collapse") - if playable is StoryPlayable: await play_story() @@ -174,6 +177,8 @@ func interact() -> void: if playable is CardBurner: await play_burner() + Scenes.scene_finished.emit(scene, repeat) + ## Updates caption label based on the instantiated interaction_ui diff --git a/src/logic-scenes/player_controller/player_controller.gd b/src/logic-scenes/player_controller/player_controller.gd index 15c546e..232d4c1 100644 --- a/src/logic-scenes/player_controller/player_controller.gd +++ b/src/logic-scenes/player_controller/player_controller.gd @@ -5,8 +5,7 @@ class_name PlayerController extends RigidBody3D if enabled == value: return enabled = value - if is_node_ready(): - _apply_enabled_state() + _apply_enabled_state() func _apply_enabled_state() -> void: @@ -180,7 +179,7 @@ func _on_ray_entered(_area : Area3D): var parent := _area.get_parent() as Interactable if not parent.visible: return assert(parent != null, "Ray entered non-interactable area!") - printt("ray entered", parent.name, parent) + #printt("ray entered", parent.name, parent) parent.hover = true # Switch to pointing hand cursor when hovering over interactable if hand_cursor: @@ -189,7 +188,7 @@ func _on_ray_entered(_area : Area3D): func _on_ray_exited(_area): var parent := _area.get_parent() as Interactable if not parent.visible: return - printt("ray exited", parent.name, parent) + #printt("ray exited", parent.name, parent) parent.hover = false # Switch back to default cursor when not hovering if hand_cursor: diff --git a/src/project.godot b/src/project.godot index 66f62c3..1e89070 100644 --- a/src/project.godot +++ b/src/project.godot @@ -8,23 +8,31 @@ config_version=5 +[animation] + +compatibility/default_parent_skeleton_in_mesh_instance_3d=true + [application] config/name="Frame of Mind" run/main_scene="uid://ccdfkvtu6sb36" config/use_custom_user_dir=true -config/features=PackedStringArray("4.5", "Forward Plus") +config/features=PackedStringArray("4.6", "Forward Plus") boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1) -boot_splash/fullsize=false +boot_splash/stretch_mode=0 boot_splash/image="res://splash.png" config/icon="res://icon.png" +[audio] + +buses/default_bus_layout="uid://djkwd76o033io" + [autoload] State="*res://singletons/global_state.gd" Scenes="*res://singletons/scene_reference.gd" Steamworks="*res://dev-util/steamworks.gd" -PromptManager="*res://addons/input_prompts/input_prompt_manager.gd" +PromptManager="*uid://7tdmg25cjdqd" Steam="*res://dev-util/steam.gd" Main="*res://singletons/main/main.tscn" HardCards="*res://dev-util/hardcoded_cards.tscn" @@ -219,5 +227,5 @@ textures/vram_compression/import_etc2_astc=true lights_and_shadows/directional_shadow/size=2048 viewport/hdr_2d=true anti_aliasing/quality/msaa_3d=2 -environment/screen_space_reflection/roughness_quality=2 anti_aliasing/quality/screen_space_aa=1 +environment/screen_space_reflection/roughness_quality=2