From 2ae99f087b1ca000fe6ae467618391d74cbd3e6e Mon Sep 17 00:00:00 2001 From: betalars Date: Tue, 18 Jul 2023 18:27:30 +0200 Subject: [PATCH] resolving event passing issues --- src/base-environments/youth_room/Collectable.gd | 9 ++++++++- src/base-environments/youth_room/youth_room.tscn | 11 ++--------- src/logic-scenes/card_picker/card_picker.tscn | 1 + .../player_controller/player_controller.gd | 1 + src/main.tscn | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/base-environments/youth_room/Collectable.gd b/src/base-environments/youth_room/Collectable.gd index 997d54d..8d82b84 100644 --- a/src/base-environments/youth_room/Collectable.gd +++ b/src/base-environments/youth_room/Collectable.gd @@ -26,7 +26,14 @@ func _on_mouse_entered(): has_mouse = true func _on_mouse_exited(): - assert(false) + print("mouse_exited") + input_ray_pickable = true + ui.collapsed = true + has_mouse = false func reveal(): revealed = true + +func collapse(): + _on_mouse_exited() + revealed = false diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index d7231eb..d74657b 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -2081,10 +2081,6 @@ shape = SubResource("BoxShape3D_wdkxn") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.02419, 1.06708, 2.75985) shape = SubResource("BoxShape3D_3lwkl") -[node name="Wall2" type="CollisionShape3D" parent="logic/colission/Room_Colission"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.64826, 1.06708, 2.75985) -shape = SubResource("BoxShape3D_3lwkl") - [node name="Wall3" type="CollisionShape3D" parent="logic/colission/Room_Colission"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.254488, 1.06708, 3.24245) shape = SubResource("BoxShape3D_3lwkl") @@ -2680,7 +2676,7 @@ light_size = 1.0 light_cull_mask = 4294967293 [node name="Luna_frame-of-mind" parent="logic/ScenePlayer/draeven" instance=ExtResource("27_pb1jl")] -transform = Transform3D(0.958899, 0, 0.283747, 0, 1, 0, -0.283747, 0, 0.958899, -10.1552, 14.9384, -16.2182) +transform = Transform3D(0.958898, 0, 0.283747, 0, 1, 0, -0.283747, 0, 0.958898, -10.1552, 14.9384, -16.2182) visible = false [node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer/draeven/Luna_frame-of-mind"] @@ -2843,10 +2839,7 @@ render_target_update_mode = 4 [node name="Collectable_ui" parent="logic/Draeven-interaction/UiWrapper/UiSprite/SubViewport" instance=ExtResource("11_jxai0")] visible = false -scene = 3 -is_story = true -item_name = "Starlight" -content_notes = "Alienation" +item_name = "Mind Board" [node name="HoverDetect" type="CollisionShape3D" parent="logic/Draeven-interaction"] transform = Transform3D(1, 0, 2.98023e-08, 0, 1, 0, -2.98023e-08, 0, 1, 0, -0.237872, 0) diff --git a/src/logic-scenes/card_picker/card_picker.tscn b/src/logic-scenes/card_picker/card_picker.tscn index dc35a96..0a3a238 100644 --- a/src/logic-scenes/card_picker/card_picker.tscn +++ b/src/logic-scenes/card_picker/card_picker.tscn @@ -1589,5 +1589,6 @@ 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/player_controller/player_controller.gd b/src/logic-scenes/player_controller/player_controller.gd index f40f0a4..76a721c 100644 --- a/src/logic-scenes/player_controller/player_controller.gd +++ b/src/logic-scenes/player_controller/player_controller.gd @@ -162,6 +162,7 @@ func _input(event:InputEvent): if event.button_index == MOUSE_BUTTON_RIGHT and event.pressed: if !Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): State.take_stage(self, true) + get_tree().call_group("interactables", "collapse") func play_scene(id: int): if id == Scenes.id.YOUTH_DRAEVEN: diff --git a/src/main.tscn b/src/main.tscn index 9343a7c..9511942 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -29,7 +29,6 @@ grow_vertical = 2 texture = ExtResource("1_0oiki") [node name="youth room" parent="." instance=ExtResource("2_23ia3")] -visible = false [node name="Main Menu" type="Panel" parent="."] anchors_preset = 15 @@ -77,6 +76,7 @@ offset_bottom = 35.0 script = SubResource("GDScript_8sq0u") [node name="Startup Menu" parent="." instance=ExtResource("1_v5rpm")] +visible = false [node name="Disclaimer" parent="." instance=ExtResource("7_t45fc")]