diff --git a/src/base-environments/youth_room/room_handle.gd b/src/base-environments/youth_room/room_handle.gd index 656773d..ecb44c2 100644 --- a/src/base-environments/youth_room/room_handle.gd +++ b/src/base-environments/youth_room/room_handle.gd @@ -30,9 +30,3 @@ func _update_scene(new_mode) -> int: emit_signal("freeze") return new_mode - -func _unhandled_input(event): - if event is InputEventMouseButton: - if event.pressed: - print("passed") - #State.pass_stage_to($PlayerController) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 64d1b5f..22a63f8 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=84 format=3 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=92 format=3 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" path="res://base-environments/youth_room/room_handle.gd" id="1_aitp0"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"] @@ -7,6 +7,7 @@ [ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="3_foj4y"] [ext_resource type="AudioStream" uid="uid://bbpo1hu35yer8" path="res://base-environments/youth_room/import/sounds/thunder.mp3" id="3_wcypa"] [ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://import/interface-elements/bottom.png" id="3_xqd4w"] +[ext_resource type="PackedScene" uid="uid://bnskiyx1sksww" path="res://logic-scenes/board/physics-board.tscn" id="4_gyjxx"] [ext_resource type="AudioStream" uid="uid://1tvopjmo6dp2" path="res://base-environments/youth_room/audio/Azure Studios - mgd-723687677.mp3" id="5_fe1yj"] [ext_resource type="ArrayMesh" uid="uid://wuxbl6u3s8yo" path="res://base-environments/youth_room/shaders/starlight-mesh.res" id="6_gy6jv"] [ext_resource type="AudioStream" uid="uid://cudna8k7fw06t" path="res://base-environments/youth_room/audio/Moving Loop.wav" id="8_egnow"] @@ -438,6 +439,18 @@ tracks/26/keys = { "update": 1, "values": [0] } +tracks/27/type = "value" +tracks/27/imported = false +tracks/27/enabled = true +tracks/27/path = NodePath("ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport:render_target_update_mode") +tracks/27/interp = 1 +tracks/27/loop_wrap = true +tracks/27/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0] +} [sub_resource type="Animation" id="Animation_g5l1m"] resource_name = "childhood" @@ -553,32 +566,44 @@ tracks/8/keys = { "update": 0, "values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)] } -tracks/9/type = "method" +tracks/9/type = "value" tracks/9/imported = false tracks/9/enabled = true -tracks/9/path = NodePath(".") +tracks/9/path = NodePath("ScenePlayer/childhood:visible") tracks/9/interp = 1 tracks/9/loop_wrap = true tracks/9/keys = { -"times": PackedFloat32Array(91.9), -"transitions": PackedFloat32Array(1), -"values": [{ -"args": [], -"method": &"_on_childhood_done" -}] -} -tracks/10/type = "value" -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/path = NodePath("ScenePlayer/childhood:visible") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/keys = { "times": PackedFloat32Array(0, 93.1), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [true, false] } +tracks/10/type = "value" +tracks/10/imported = false +tracks/10/enabled = true +tracks/10/path = NodePath("ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport:render_target_update_mode") +tracks/10/interp = 1 +tracks/10/loop_wrap = true +tracks/10/keys = { +"times": PackedFloat32Array(0, 93.5), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [4, 0] +} +tracks/11/type = "method" +tracks/11/imported = false +tracks/11/enabled = true +tracks/11/path = NodePath("ScenePlayer") +tracks/11/interp = 1 +tracks/11/loop_wrap = true +tracks/11/keys = { +"times": PackedFloat32Array(92.8), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [], +"method": &"on_childhood_done" +}] +} [sub_resource type="Animation" id="Animation_1pmhi"] resource_name = "intro" @@ -1052,8 +1077,66 @@ func play_scene(id: int): func _on_ini_room(): play(\"intro\") + +func on_childhood_done(): + get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_CHILDHOOD) + +func scene_finished(_id): + play(\"RESET\") " +[sub_resource type="ViewportTexture" id="ViewportTexture_2cudi"] +viewport_path = NodePath("logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport") + +[sub_resource type="Environment" id="Environment_ndogw"] +ambient_light_color = Color(0.494118, 0.654902, 0.752941, 1) +tonemap_mode = 2 +tonemap_exposure = 1.55 +ssao_enabled = true +adjustment_enabled = true +adjustment_saturation = 0.9 + +[sub_resource type="World3D" id="World3D_4m36g"] +environment = SubResource("Environment_ndogw") + +[sub_resource type="Animation" id="Animation_rp0q6"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:rotation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0, 0, 0)] +} + +[sub_resource type="Animation" id="Animation_cml7w"] +resource_name = "idle" +length = 20.0 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:rotation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 20), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector3(-0.349066, -1.5708, -0.349066), Vector3(-0.349066, 4.71239, -0.349066)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_3td8t"] +_data = { +"RESET": SubResource("Animation_rp0q6"), +"idle": SubResource("Animation_cml7w") +} + [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_foovg"] radius = 110.0 height = 336.0 @@ -1180,13 +1263,16 @@ attractor_interaction_enabled = false [sub_resource type="BoxShape3D" id="BoxShape3D_cb3g8"] size = Vector3(1.81843, 2.13395, 0.0774798) -[sub_resource type="ViewportTexture" id="ViewportTexture_7hana"] -viewport_path = NodePath("logic/clothes_interaction/UiWrapper/UiSprite/SubViewport") +[sub_resource type="ViewportTexture" id="ViewportTexture_3mgqk"] +viewport_path = NodePath("logic/Mask-interaction/UiWrapper/UiSprite/SubViewport") [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_72g2i"] radius = 0.342951 height = 1.08154 +[sub_resource type="ViewportTexture" id="ViewportTexture_7hana"] +viewport_path = NodePath("logic/clothes_interaction/UiWrapper/UiSprite/SubViewport") + [sub_resource type="GDScript" id="GDScript_35dmj"] script/source = "extends SpotLight3D @@ -1324,7 +1410,10 @@ func _on_ini_room(): play(\"light_up\") func play_scene(_id: int): - play(\"lights_out\") + queue(\"lights_out\") + +func scene_finished(_id: int): + queue(\"light_up\") " [sub_resource type="GDScript" id="GDScript_yn0pl"] @@ -1413,6 +1502,9 @@ func focus_object(): func play_scene(_id: int): focus_object() + +func scene_finished(_id: int): + focus_env() " [node name="youth room" type="Node3D"] @@ -1581,12 +1673,19 @@ shape = SubResource("BoxShape3D_bq15k") [node name="UI" type="Control" parent="logic"] layout_mode = 3 -anchors_preset = 0 -offset_right = 40.0 -offset_bottom = 40.0 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 1 -[node name="picker" parent="logic/UI" instance=ExtResource("19_a4n1o")] +[node name="picker" parent="logic/UI" groups=["animation_player"] instance=ExtResource("19_a4n1o")] +unique_name_in_owner = true +visible = false +layout_mode = 1 + +[node name="board" parent="logic/UI" instance=ExtResource("4_gyjxx")] visible = false layout_mode = 1 @@ -1642,6 +1741,65 @@ offset_bottom = 697.0 rotation = 0.459022 mouse_filter = 1 +[node name="TextureRect" type="TextureRect" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame"] +layout_mode = 2 +offset_left = 904.0 +offset_top = 225.0 +offset_right = 1416.0 +offset_bottom = 737.0 +texture = SubResource("ViewportTexture_2cudi") + +[node name="SubViewport" type="SubViewport" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect"] +own_world_3d = true +world_3d = SubResource("World3D_4m36g") +transparent_bg = true +msaa_3d = 1 +canvas_cull_mask = 4293918724 +render_target_update_mode = 0 + +[node name="Node3D" type="Node3D" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.21953, 3.52719, 0) + +[node name="old_mask" type="MeshInstance3D" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 0.999999, 0, 0, 0) +layers = 4 +mesh = ExtResource("19_jr2bb") +skeleton = NodePath("") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport/Node3D/old_mask"] +autoplay = "idle" +libraries = { +"": SubResource("AnimationLibrary_3td8t") +} + +[node name="Camera3D" type="Camera3D" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +transform = Transform3D(1, -4.88994e-09, 1.82221e-11, 4.88232e-09, 0.998636, 0.052214, -2.7352e-10, -0.052214, 0.998636, 0.0198479, 0.0554118, 0.529937) +fov = 33.0 + +[node name="SpotLight3D" type="SpotLight3D" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +transform = Transform3D(0.302014, 0.249491, -0.920077, 0.207638, 0.924758, 0.318918, 0.930416, -0.287361, 0.227486, -0.620115, 0.241349, 0.172426) +layers = 4 +light_color = Color(0.992157, 0.917647, 0.835294, 1) +light_size = 0.1 +shadow_enabled = true +shadow_bias = 0.02 +shadow_normal_bias = 2.171 +spot_range = 0.846959 +spot_angle = 23.1819 + +[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.23127, 0.892279, -0.650658) +light_color = Color(0.266667, 0.286275, 1, 1) +light_size = 0.5 +omni_range = 2.5227 + +[node name="OmniLight3D2" type="OmniLight3D" parent="logic/ScenePlayer/childhood/PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.424841, -0.45505, 0.00432622) +light_color = Color(0.607843, 0.34902, 0.203922, 1) +light_energy = 0.1 +light_size = 0.5 +omni_range = 1.00639 + [node name="VBoxContainer" type="VBoxContainer" parent="logic/ScenePlayer/childhood/PanelContainer"] layout_mode = 2 @@ -1904,7 +2062,7 @@ scale = Vector2(0.4, 0.4) texture = ExtResource("12_xnele") [node name="Mask-interaction" type="Area3D" parent="logic" groups=["interactables"]] -transform = Transform3D(-0.863025, 0, 0.50516, 0, 1, 0, -0.50516, 0, -0.863025, 0.121309, 0.803665, 2.4765) +transform = Transform3D(-0.863025, 0, 0.50516, 0, 1, 0, -0.50516, 0, -0.863025, 0.0754588, 0.948372, 2.42068) collision_layer = 16 script = ExtResource("11_6fwv8") @@ -1913,8 +2071,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00898492, -0.14171, 0.15275 visible = false [node name="UiWrapper" type="Area3D" parent="logic/Mask-interaction"] -transform = Transform3D(0.1, -1.86265e-09, 0, 0, 0.0906676, 0.0421827, 0, -0.0421827, 0.0906676, -2.38419e-07, 0, 0.0718942) -visible = false +transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, -2.38419e-07, 0, 0.0718942) script = ExtResource("11_7uxd8") [node name="UI_click_collider" type="CollisionShape3D" parent="logic/Mask-interaction/UiWrapper"] @@ -1922,10 +2079,10 @@ transform = Transform3D(2.56, -5.96046e-08, 4.76837e-07, 1.78814e-07, 2.56, -4.1 shape = SubResource("BoxShape3D_cb3g8") [node name="UiSprite" type="Sprite3D" parent="logic/Mask-interaction/UiWrapper"] -transform = Transform3D(1, 0, 2.4869e-14, 0, 1, 0, -2.4869e-14, 0, 1, 0, 0, 0.610758) +transform = Transform3D(1, 0, 2.98023e-08, 0, 1, 0, -2.98023e-08, 0, 1, -9.53674e-07, 0, 0.61076) pixel_size = 0.015 no_depth_test = true -texture = SubResource("ViewportTexture_7hana") +texture = SubResource("ViewportTexture_3mgqk") [node name="SubViewport" type="SubViewport" parent="logic/Mask-interaction/UiWrapper/UiSprite"] transparent_bg = true @@ -1936,7 +2093,7 @@ render_target_update_mode = 4 visible = false scene = 0 is_story = true -item_name = "Sport Clothes" +item_name = "my old Mask" content_notes = "CN: testing testing 123" [node name="HoverDetect" type="CollisionShape3D" parent="logic/Mask-interaction"] @@ -1968,13 +2125,13 @@ texture = SubResource("ViewportTexture_7hana") [node name="SubViewport" type="SubViewport" parent="logic/clothes_interaction/UiWrapper/UiSprite"] transparent_bg = true size = Vector2i(300, 350) -render_target_update_mode = 1 +render_target_update_mode = 4 [node name="Collectable_ui" parent="logic/clothes_interaction/UiWrapper/UiSprite/SubViewport" instance=ExtResource("11_jxai0")] visible = false scene = 2 is_story = true -item_name = "my old Mask" +item_name = "Sport Clothes" content_notes = "CN: testing testing 123" [node name="HoverDetect" type="CollisionShape3D" parent="logic/clothes_interaction"] @@ -2193,6 +2350,7 @@ omni_attenuation = 0.659754 [connection signal="body_entered" from="logic/Bed and Ladders/bed_enter" to="logic/PlayerController" method="_on_bed_enter"] [connection signal="body_exited" from="logic/Bed and Ladders/bed_reset" to="logic/PlayerController" method="_on_bed_exit"] [connection signal="body_exited" from="logic/Bed and Ladders/reset_failover" to="logic/PlayerController" method="_on_bed_exit"] +[connection signal="cards_picked" from="logic/UI/picker" to="logic/UI/board" method="populate_board"] [connection signal="input_event" from="logic/ScenePlayer/jui_jutsu/PanelContainer/card" to="logic/ScenePlayer/jui_jutsu/PanelContainer/card" method="_on_input_event" flags=18] [connection signal="mouse_entered" from="logic/ScenePlayer/jui_jutsu/PanelContainer/card" to="logic/ScenePlayer/jui_jutsu/PanelContainer/card" method="_on_mouse_entered" flags=18] [connection signal="mouse_exited" from="logic/ScenePlayer/jui_jutsu/PanelContainer/card" to="logic/ScenePlayer/jui_jutsu/PanelContainer/card" method="_on_mouse_exited" flags=18]