From 465b00cbd4d5a97b0d8989b4add5d25afbdab2fd Mon Sep 17 00:00:00 2001 From: Tiger Jove Date: Mon, 5 Jan 2026 16:11:16 +0100 Subject: [PATCH] chore: re-added new playable child scenes to their actual mementoes --- .../youth_room/youth_room.tscn | 72 ++++++++++++++++++- .../interactive_sprite.tscn | 1 + 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index ab628ea..27e91d3 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=120 format=4 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=128 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"] @@ -926,6 +926,42 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_lag5h") +[sub_resource type="ViewportTexture" id="ViewportTexture_dqyng"] +viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_xbjb2"] +resource_local_to_scene = true +render_priority = 0 +shader = ExtResource("25_dqyng") +shader_parameter/default_texture = SubResource("ViewportTexture_dqyng") + +[sub_resource type="ViewportTexture" id="ViewportTexture_e5y1q"] +viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_5bsh1"] +resource_local_to_scene = true +render_priority = 0 +shader = ExtResource("25_dqyng") +shader_parameter/default_texture = SubResource("ViewportTexture_e5y1q") + +[sub_resource type="ViewportTexture" id="ViewportTexture_ks23q"] +viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_e5y1q"] +resource_local_to_scene = true +render_priority = 0 +shader = ExtResource("25_dqyng") +shader_parameter/default_texture = SubResource("ViewportTexture_ks23q") + +[sub_resource type="ViewportTexture" id="ViewportTexture_5bsh1"] +viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ypa88"] +resource_local_to_scene = true +render_priority = 0 +shader = ExtResource("25_dqyng") +shader_parameter/default_texture = SubResource("ViewportTexture_5bsh1") + [sub_resource type="ViewportTexture" id="ViewportTexture_ypa88"] viewport_path = NodePath("logic/MaskMemento/UiWrapper/UiSprite/SubViewport") @@ -1972,15 +2008,43 @@ omni_range = 16.8518 [node name="MaskMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(-0.8630245, 0, 0.5051597, 0, 1, 0, -0.5051597, 0, -0.8630245, 0.0754588, 0.948372, 2.42068) +[node name="UiSprite" parent="logic/MaskMemento/UiWrapper" index="1"] +material_override = SubResource("ShaderMaterial_xbjb2") +texture = SubResource("ViewportTexture_dqyng") + +[node name="childhood" parent="logic/MaskMemento/CanvasLayer" index="0" instance=ExtResource("12_viwxf")] + [node name="ClothesMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.8604294, 0, -0.5095667, 0, 1, 0, 0.5095667, 0, 0.8604294, 1.3658599, 1.17096, -0.6365988) +[node name="UiSprite" parent="logic/ClothesMemento/UiWrapper" index="1"] +material_override = SubResource("ShaderMaterial_5bsh1") +texture = SubResource("ViewportTexture_e5y1q") + +[node name="JuiJutsu" parent="logic/ClothesMemento/CanvasLayer" index="0" instance=ExtResource("12_x3dlb")] + [node name="ComicMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.9699434, 0, 0.24332686, 0, 1, 0, -0.24332686, 0, 0.9699434, 2.91664, 0.595014, -0.75655603) +[node name="UiSprite" parent="logic/ComicMemento/UiWrapper" index="1"] +material_override = SubResource("ShaderMaterial_e5y1q") +texture = SubResource("ViewportTexture_ks23q") + +[node name="voice_training" parent="logic/ComicMemento/CanvasLayer" index="0" instance=ExtResource("13_v3447")] +story_array = [] +paragraph_lengths = [1] + [node name="CeilingMemento" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.71489924, 0, 0.6992255, 0, 1, 0, -0.6992255, 0, 0.71489924, -0.13478619, 2.0720484, -0.42032808) +[node name="UiSprite" parent="logic/CeilingMemento/UiWrapper" index="1"] +material_override = SubResource("ShaderMaterial_ypa88") +texture = SubResource("ViewportTexture_5bsh1") + +[node name="draven" parent="logic/CeilingMemento/CanvasLayer" index="0" instance=ExtResource("19_d3c7p")] +story_array = [] +paragraph_lengths = [1] + [node name="MindBoard" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(-4.3711374e-08, 0, 0.9999984, 0, 1, 0, -0.9999984, 0, -4.3711374e-08, -0.907206, 1.17661, 1.74337) @@ -1988,6 +2052,8 @@ transform = Transform3D(-4.3711374e-08, 0, 0.9999984, 0, 1, 0, -0.9999984, 0, -4 material_override = SubResource("ShaderMaterial_mhuct") texture = SubResource("ViewportTexture_ypa88") +[node name="board" parent="logic/MindBoard/CanvasLayer" index="0" instance=ExtResource("4_gyjxx")] + [node name="Door" parent="logic" instance=ExtResource("30_ypa88")] transform = Transform3D(0.9999984, 0, 4.973797e-14, 0, 1, 0, -4.973797e-14, 0, 0.9999984, 0.115203, 1.3931, -0.954428) @@ -2251,4 +2317,8 @@ data = ExtResource("40_ea6x8") [connection signal="pressed" from="logic/UI/ending_button" to="logic/UI/ending" method="show"] [connection signal="emit_thunder" from="logic/ScenePlayer/JuiJutsu" to="AnimationPlayer" method="play" binds= ["lighting_and_thunder"]] +[editable path="logic/MaskMemento"] +[editable path="logic/ClothesMemento"] +[editable path="logic/ComicMemento"] +[editable path="logic/CeilingMemento"] [editable path="logic/MindBoard"] diff --git a/src/logic-scenes/interactive_sprite/interactive_sprite.tscn b/src/logic-scenes/interactive_sprite/interactive_sprite.tscn index 53fe377..9721068 100644 --- a/src/logic-scenes/interactive_sprite/interactive_sprite.tscn +++ b/src/logic-scenes/interactive_sprite/interactive_sprite.tscn @@ -70,5 +70,6 @@ shape = SubResource("CapsuleShape3D_v8gd7") [node name="CanvasLayer" type="CanvasLayer" parent="."] unique_name_in_owner = true +visible = false [connection signal="input_event" from="UiWrapper" to="UiWrapper" method="_on_input_event"]