betalars
/
frame-of-mind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolving event passing issues

This commit is contained in:
betalars 2023-07-18 18:27:30 +02:00
parent 6f8ceeed25
commit 2ae99f087b
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/base-environments/youth_room/Collectable.gd
View File

@ -26,7 +26,14 @@ func _on_mouse_entered():
has_mouse = true has_mouse = true
func _on_mouse_exited(): func _on_mouse_exited():
assert(false) print("mouse_exited")
input_ray_pickable = true
ui.collapsed = true
has_mouse = false
func reveal(): func reveal():
revealed = true revealed = true
func collapse():
_on_mouse_exited()
revealed = false

11
src/base-environments/youth_room/youth_room.tscn
View File

@ -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) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.02419, 1.06708, 2.75985)
shape = SubResource("BoxShape3D_3lwkl") 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"] [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) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.254488, 1.06708, 3.24245)
shape = SubResource("BoxShape3D_3lwkl") shape = SubResource("BoxShape3D_3lwkl")
@ -2680,7 +2676,7 @@ light_size = 1.0
light_cull_mask = 4294967293 light_cull_mask = 4294967293
[node name="Luna_frame-of-mind" parent="logic/ScenePlayer/draeven" instance=ExtResource("27_pb1jl")] [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 visible = false
[node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer/draeven/Luna_frame-of-mind"] [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")] [node name="Collectable_ui" parent="logic/Draeven-interaction/UiWrapper/UiSprite/SubViewport" instance=ExtResource("11_jxai0")]
visible = false visible = false
scene = 3 item_name = "Mind Board"
is_story = true
item_name = "Starlight"
content_notes = "Alienation"
[node name="HoverDetect" type="CollisionShape3D" parent="logic/Draeven-interaction"] [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) transform = Transform3D(1, 0, 2.98023e-08, 0, 1, 0, -2.98023e-08, 0, 1, 0, -0.237872, 0)

1
src/logic-scenes/card_picker/card_picker.tscn
View File

@ -1589,5 +1589,6 @@ libraries = {
text = "Post 4" text = "Post 4"
[node name="board of devs" parent="." instance=ExtResource("4_1kvte")] [node name="board of devs" parent="." instance=ExtResource("4_1kvte")]
process_mode = 4
visible = false visible = false
layout_mode = 2 layout_mode = 2

1
src/logic-scenes/player_controller/player_controller.gd
View File

@ -162,6 +162,7 @@ func _input(event:InputEvent):
if event.button_index == MOUSE_BUTTON_RIGHT and event.pressed: if event.button_index == MOUSE_BUTTON_RIGHT and event.pressed:
if !Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): if !Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT):
State.take_stage(self, true) State.take_stage(self, true)
get_tree().call_group("interactables", "collapse")
func play_scene(id: int): func play_scene(id: int):
if id == Scenes.id.YOUTH_DRAEVEN: if id == Scenes.id.YOUTH_DRAEVEN:

2
src/main.tscn
View File

@ -29,7 +29,6 @@ grow_vertical = 2
texture = ExtResource("1_0oiki") texture = ExtResource("1_0oiki")
[node name="youth room" parent="." instance=ExtResource("2_23ia3")] [node name="youth room" parent="." instance=ExtResource("2_23ia3")]
visible = false
[node name="Main Menu" type="Panel" parent="."] [node name="Main Menu" type="Panel" parent="."]
anchors_preset = 15 anchors_preset = 15
@ -77,6 +76,7 @@ offset_bottom = 35.0
script = SubResource("GDScript_8sq0u") script = SubResource("GDScript_8sq0u")
[node name="Startup Menu" parent="." instance=ExtResource("1_v5rpm")] [node name="Startup Menu" parent="." instance=ExtResource("1_v5rpm")]
visible = false
[node name="Disclaimer" parent="." instance=ExtResource("7_t45fc")] [node name="Disclaimer" parent="." instance=ExtResource("7_t45fc")]