From 68cc589bff26f785db39298e87fd351d80d226d6 Mon Sep 17 00:00:00 2001 From: betalars Date: Tue, 1 Aug 2023 11:01:52 +0200 Subject: [PATCH] celaning up error sources --- .../youth_room/youth_room.tscn | 118 ++++++++++++++---- src/logic-scenes/card_picker/card_picker.tscn | 1 - .../collectable/collectable_ui.tscn | 4 +- src/logic-scenes/luna/luna_imported.tscn | 1 + src/main.tscn | 2 +- src/project.godot | 9 ++ 6 files changed, 106 insertions(+), 29 deletions(-) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 34f6600..657dd54 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=108 format=3 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=113 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"] @@ -25,6 +25,7 @@ [ext_resource type="PackedScene" uid="uid://bdnesuqroi7ss" path="res://vfx/collectable_particles.tscn" id="12_qxx2k"] [ext_resource type="Texture2D" uid="uid://bqilajx05t0eb" path="res://logic-scenes/board/particle_textures/void_nomotion.png" id="12_xnele"] [ext_resource type="Texture2D" uid="uid://d005qvnbnishb" path="res://import/interface-elements/cursor_grab.png" id="13_lqj71"] +[ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://logic-scenes/misc/skip_control.tscn" id="15_7nc4e"] [ext_resource type="PackedScene" uid="uid://brk4hjdf2x81a" path="res://logic-scenes/card_picker/card_picker.tscn" id="19_a4n1o"] [ext_resource type="ArrayMesh" uid="uid://bfc3d4g40n0wy" path="res://logic-scenes/collectable/import/old-mask.res" id="19_jr2bb"] [ext_resource type="PackedScene" uid="uid://dwtxjvprjyx8p" path="res://base-environments/youth_room/lava-lamp.tscn" id="21_0k2gr"] @@ -119,6 +120,27 @@ size = Vector3(1.63347, 0.305693, 0.775269) [sub_resource type="BoxShape3D" id="BoxShape3D_bq15k"] size = Vector3(0.244565, 1, 0.245859) +[sub_resource type="InputEventKey" id="InputEventKey_p2hyr"] +device = -1 +keycode = 88 +unicode = 120 + +[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_e2vy5"] +button_index = 2 +pressed = true + +[sub_resource type="Shortcut" id="Shortcut_b3maf"] +events = [SubResource("InputEventKey_p2hyr"), SubResource("InputEventJoypadButton_e2vy5")] + +[sub_resource type="GDScript" id="GDScript_uy50s"] +script/source = "extends Panel + + +func show(): + mouse_filter = MOUSE_FILTER_STOP + visible = true +" + [sub_resource type="Animation" id="Animation_nwry8"] length = 0.001 tracks/0/type = "value" @@ -143,7 +165,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [-80.0] +"values": [0.0] } tracks/2/type = "value" tracks/2/imported = false @@ -155,7 +177,7 @@ tracks/2/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [0.0] +"values": [-80.0] } tracks/3/type = "value" tracks/3/imported = false @@ -167,7 +189,7 @@ tracks/3/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [0.0] +"values": [-80.0] } tracks/4/type = "value" tracks/4/imported = false @@ -637,6 +659,18 @@ tracks/42/keys = { "update": 0, "values": [Color(1, 1, 1, 1)] } +tracks/43/type = "value" +tracks/43/imported = false +tracks/43/enabled = true +tracks/43/path = NodePath("ScenePlayer/Jui_Jutsu:volume_db") +tracks/43/interp = 1 +tracks/43/loop_wrap = true +tracks/43/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} [sub_resource type="Animation" id="Animation_g5l1m"] resource_name = "childhood" @@ -783,7 +817,7 @@ tracks/11/path = NodePath("ScenePlayer") tracks/11/interp = 1 tracks/11/loop_wrap = true tracks/11/keys = { -"times": PackedFloat32Array(5.1), +"times": PackedFloat32Array(93.7), "transitions": PackedFloat32Array(1), "values": [{ "args": [], @@ -1035,7 +1069,7 @@ tracks/19/path = NodePath("ScenePlayer") tracks/19/interp = 1 tracks/19/loop_wrap = true tracks/19/keys = { -"times": PackedFloat32Array(2.9), +"times": PackedFloat32Array(140.5), "transitions": PackedFloat32Array(1), "values": [{ "args": [], @@ -1347,7 +1381,7 @@ tracks/19/path = NodePath("ScenePlayer") tracks/19/interp = 1 tracks/19/loop_wrap = true tracks/19/keys = { -"times": PackedFloat32Array(5.3), +"times": PackedFloat32Array(204.5), "transitions": PackedFloat32Array(1), "values": [{ "args": [], @@ -1464,7 +1498,7 @@ tracks/8/path = NodePath("ScenePlayer") tracks/8/interp = 1 tracks/8/loop_wrap = true tracks/8/keys = { -"times": PackedFloat32Array(2.9), +"times": PackedFloat32Array(95.1), "transitions": PackedFloat32Array(1), "values": [{ "args": [], @@ -1524,8 +1558,9 @@ func start_soundtrack(): func play_scene(id: int, repeat = false): get_tree().call_group(\"interactables\", \"collapse\") - is_repeating = repeat State.pass_stage_to(self) + State.lock_focus = true + is_repeating = repeat Input.mouse_mode = Input.MOUSE_MODE_HIDDEN match id: Scenes.id.YOUTH_CHILDHOOD: @@ -1543,21 +1578,25 @@ func _on_ini_room(): func on_childhood_done(): get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_CHILDHOOD, is_repeating) $childhood.hide() + State.lock_focus = is_repeating func on_voice_training_done(): get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_VOICE_TRAINING, is_repeating) $\"Voice Training\".hide() + State.lock_focus = is_repeating func on_jui_jutsu_done(): get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_JUI_JUTSU, is_repeating) $jui_jutsu.hide() + State.lock_focus = is_repeating func on_draeven_done(): get_tree().call_group(\"animation_player\", \"scene_finished\", Scenes.id.YOUTH_DRAEVEN, is_repeating) $draeven.hide() + State.lock_focus = is_repeating func scene_finished(_id): - play(\"RESET\") + queue(\"RESET\") " [sub_resource type="ViewportTexture" id="ViewportTexture_2cudi"] @@ -2190,25 +2229,34 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 1 +[node name="ending_button" type="Button" parent="logic/UI"] +visible = false +top_level = true +layout_mode = 0 +offset_left = 16.0 +offset_top = 12.0 +offset_right = 400.0 +offset_bottom = 100.0 +shortcut = SubResource("Shortcut_b3maf") +text = "You have completed +ordering your thoughts. +This is as far as the alpha goes. +Press x or [ ] to wrap up." + [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 [node name="ending" parent="logic/UI" instance=ExtResource("5_kts6y")] visible = false layout_mode = 1 - -[node name="Button" type="Button" parent="logic/UI"] -layout_mode = 0 -offset_left = 16.0 -offset_top = 12.0 -offset_right = 342.0 -offset_bottom = 55.0 -text = " click here to finish the alpha " +mouse_filter = 2 +script = SubResource("GDScript_uy50s") [node name="ScenePlayer" type="AnimationPlayer" parent="logic" groups=["animation_player"]] autoplay = "RESET" @@ -2222,11 +2270,11 @@ bus = &"text" [node name="Moving" type="AudioStreamPlayer" parent="logic/ScenePlayer"] stream = ExtResource("8_egnow") -volume_db = -80.0 bus = &"music" [node name="Childhood" type="AudioStreamPlayer" parent="logic/ScenePlayer"] stream = ExtResource("9_i8mqk") +volume_db = -80.0 bus = &"music" [node name="childhood" type="CenterContainer" parent="logic/ScenePlayer"] @@ -2363,8 +2411,12 @@ texture = ExtResource("3_xqd4w") expand_mode = 2 stretch_mode = 4 +[node name="skip_control" parent="logic/ScenePlayer/childhood/PanelContainer" instance=ExtResource("15_7nc4e")] +layout_mode = 2 + [node name="VoiceTraining" type="AudioStreamPlayer" parent="logic/ScenePlayer"] stream = ExtResource("10_wwwdq") +volume_db = -80.0 bus = &"music" [node name="Voice Training" type="CenterContainer" parent="logic/ScenePlayer"] @@ -2448,13 +2500,14 @@ texture = ExtResource("3_xqd4w") expand_mode = 2 stretch_mode = 4 +[node name="skip_control2" parent="logic/ScenePlayer/Voice Training/PanelContainer" instance=ExtResource("15_7nc4e")] +layout_mode = 2 + [node name="Jui_Jutsu" type="AudioStreamPlayer" parent="logic/ScenePlayer"] -volume_db = -10.0 bus = &"music" [node name="jui_jutsu" type="CenterContainer" parent="logic/ScenePlayer"] visible = false -modulate = Color(1, 1, 1, 0) self_modulate = Color(1, 1, 1, 0.923078) anchors_preset = 15 anchor_right = 1.0 @@ -2582,6 +2635,9 @@ visible = false scale = Vector2(0.4, 0.4) texture = ExtResource("12_xnele") +[node name="skip_control3" parent="logic/ScenePlayer/jui_jutsu/PanelContainer" instance=ExtResource("15_7nc4e")] +layout_mode = 2 + [node name="draeven" type="CenterContainer" parent="logic/ScenePlayer"] visible = false modulate = Color(1, 1, 1, 0) @@ -2655,6 +2711,9 @@ texture = ExtResource("3_xqd4w") expand_mode = 2 stretch_mode = 4 +[node name="skip_control4" parent="logic/ScenePlayer/draeven/PanelContainer" instance=ExtResource("15_7nc4e")] +layout_mode = 2 + [node name="starlight_mesh" type="MeshInstance3D" parent="logic/ScenePlayer/draeven"] transform = Transform3D(0.999, 0, 0, 0, 0.999, 0, 0, 0, 0.999, 0, 0, 0) layers = 2 @@ -3118,10 +3177,12 @@ surface_material_override/0 = SubResource("StandardMaterial3D_5u6i4") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.57896, 0) material_override = SubResource("StandardMaterial3D_qifbj") amount = 1000 -visibility_aabb = AABB(-2.68266, -0.69998, -0.431825, 5.36533, 1.39996, 0.86365) +visibility_aabb = AABB(-2.68266, -2.50574, -0.431825, 5.36533, 5.01148, 0.86365) process_material = SubResource("ParticleProcessMaterial_g3ayx") draw_pass_1 = SubResource("QuadMesh_rb6dt") +[node name="VoxelGI" type="VoxelGI" parent="."] + [connection signal="ini_room" from="." to="logic/PlayerController" method="_on_ini_room"] [connection signal="ini_room" from="." to="logic/ScenePlayer" method="_on_ini_room"] [connection signal="ini_room" from="." to="visuals/lights/light_animation" method="_on_ini_room"] @@ -3134,13 +3195,22 @@ draw_pass_1 = SubResource("QuadMesh_rb6dt") [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="pressed" from="logic/UI/ending_button" to="logic/UI/ending_button" method="hide"] +[connection signal="pressed" from="logic/UI/ending_button" to="logic/UI/ending" method="show"] [connection signal="cards_picked" from="logic/UI/picker" to="logic/UI/board" method="populate_board"] [connection signal="cards_picked" from="logic/UI/picker" to="WorldEnvironment" method="_on_picker_cards_picked"] -[connection signal="board_completed" from="logic/UI/board" to="logic/UI/Button" method="show"] -[connection signal="pressed" from="logic/UI/Button" to="logic/UI/ending" method="show"] +[connection signal="board_completed" from="logic/UI/board" to="logic/UI/ending_button" method="show"] +[connection signal="skip" from="logic/ScenePlayer/childhood/PanelContainer/skip_control" to="logic/ScenePlayer" method="on_childhood_done"] +[connection signal="skip" from="logic/ScenePlayer/childhood/PanelContainer/skip_control" to="logic/ScenePlayer" method="play" binds= ["RESET"]] +[connection signal="skip" from="logic/ScenePlayer/Voice Training/PanelContainer/skip_control2" to="logic/ScenePlayer" method="on_voice_training_done"] +[connection signal="skip" from="logic/ScenePlayer/Voice Training/PanelContainer/skip_control2" to="logic/ScenePlayer" method="play" binds= ["RESET"]] [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] +[connection signal="skip" from="logic/ScenePlayer/jui_jutsu/PanelContainer/skip_control3" to="logic/ScenePlayer" method="on_jui_jutsu_done"] +[connection signal="skip" from="logic/ScenePlayer/jui_jutsu/PanelContainer/skip_control3" to="logic/ScenePlayer" method="play" binds= ["RESET"]] +[connection signal="skip" from="logic/ScenePlayer/draeven/PanelContainer/skip_control4" to="logic/ScenePlayer" method="on_draeven_done"] +[connection signal="skip" from="logic/ScenePlayer/draeven/PanelContainer/skip_control4" to="logic/ScenePlayer" method="play" binds= ["RESET"]] [connection signal="input_event" from="logic/Mask-interaction/UiWrapper" to="logic/Mask-interaction/UiWrapper" method="_on_input_event" flags=18] [connection signal="scene_skipped" from="logic/Mask-interaction/UiWrapper/UiSprite/SubViewport/Collectable_ui" to="logic/UI/board" method="on_scene_skipped"] [connection signal="input_event" from="logic/clothes_interaction/UiWrapper" to="logic/clothes_interaction/UiWrapper" method="_on_input_event" flags=18] diff --git a/src/logic-scenes/card_picker/card_picker.tscn b/src/logic-scenes/card_picker/card_picker.tscn index 81e5502..b361fc7 100644 --- a/src/logic-scenes/card_picker/card_picker.tscn +++ b/src/logic-scenes/card_picker/card_picker.tscn @@ -1625,6 +1625,5 @@ libraries = { text = "Post 4" [node name="board of devs" parent="." instance=ExtResource("4_1kvte")] -process_mode = 4 visible = false layout_mode = 2 diff --git a/src/logic-scenes/collectable/collectable_ui.tscn b/src/logic-scenes/collectable/collectable_ui.tscn index 57b30e7..69029f1 100644 --- a/src/logic-scenes/collectable/collectable_ui.tscn +++ b/src/logic-scenes/collectable/collectable_ui.tscn @@ -133,7 +133,7 @@ size_flags_vertical = 3 [node name="collect_or_listen" type="Button" parent="Panel/Content/Buttons/VBoxContainer"] layout_mode = 2 tooltip_text = "Take this with you, and listen to it's story." -text = "Collect" +text = "Order Thoughts" script = SubResource("GDScript_g0qhf") [node name="Summary" type="Button" parent="Panel/Content/Buttons/VBoxContainer"] @@ -169,8 +169,6 @@ libraries = { "": SubResource("AnimationLibrary_jad23") } -[connection signal="resized" from="Panel/Content/Buttons/VBoxContainer" to="Panel/Content/Buttons" method="_on_v_box_container_resized"] -[connection signal="button_up" from="Panel/Content/Buttons/VBoxContainer/collect_or_listen" to="." method="_on_pick_button_released"] [connection signal="focus_entered" from="Panel/Content/Buttons/VBoxContainer/collect_or_listen" to="." method="_yoink_focus"] [connection signal="pressed" from="Panel/Content/Buttons/VBoxContainer/collect_or_listen" to="." method="_on_pick_button_pressed"] [connection signal="focus_entered" from="Panel/Content/Buttons/VBoxContainer/Summary" to="." method="_yoink_focus"] diff --git a/src/logic-scenes/luna/luna_imported.tscn b/src/logic-scenes/luna/luna_imported.tscn index d1352e9..002ad08 100644 --- a/src/logic-scenes/luna/luna_imported.tscn +++ b/src/logic-scenes/luna/luna_imported.tscn @@ -89,6 +89,7 @@ bones/61/rotation = Quaternion(-0.0756927, -0.222034, 0.0605057, 0.970211) bones/62/rotation = Quaternion(-0.139385, -0.0586047, 0.0728769, 0.985813) [node name="Loona_main" parent="Armature/Skeleton3D" index="0"] +gi_mode = 2 surface_material_override/0 = SubResource("StandardMaterial3D_jdvnl") [node name="wings" parent="Armature/Skeleton3D" index="1"] diff --git a/src/main.tscn b/src/main.tscn index 876c12e..47bd02a 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -12,7 +12,7 @@ [sub_resource type="GDScript" id="GDScript_8sq0u"] script/source = "extends Label -func _process(delta): +func _process(_delta): text = str(Engine.get_frames_per_second()) " diff --git a/src/project.godot b/src/project.godot index 670f766..ace50e8 100644 --- a/src/project.godot +++ b/src/project.godot @@ -14,6 +14,9 @@ config/name="Frame of Mind" run/main_scene="res://main.tscn" config/features=PackedStringArray("4.1", "Forward Plus") run/max_fps=60 +boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1) +boot_splash/image="res://splash.png" +boot_splash/fullsize=false config/icon="res://icon.png" [autoload] @@ -100,6 +103,12 @@ look_down={ "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null) ] } +skip={ +"deadzone": 0.5, +"events": [null, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":true,"script":null) +] +} [layer_names]