From c4ceeca1d49ec3cd485e1f64ea2e380e94c73712 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Mon, 2 Jan 2023 22:01:36 -0700 Subject: [PATCH] subtle bugfixes --- godot/3DCursor.gd | 8 +------- godot/world.tscn | 7 +++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/godot/3DCursor.gd b/godot/3DCursor.gd index a63bcc1..c40d019 100644 --- a/godot/3DCursor.gd +++ b/godot/3DCursor.gd @@ -104,10 +104,9 @@ func _process(_delta): set_color() -var locked = false func _physics_process(delta): inc_time_buffer(delta) - if locked: + if GlobalCursorState.is_frozen: return var dir = input_direction() var speed = input_speed() @@ -117,8 +116,3 @@ func _physics_process(delta): sound_bump() elif speed != 0.0: sound_click() - - - -func _on_AnimationTree_motion_status(value): - locked = value diff --git a/godot/world.tscn b/godot/world.tscn index 5b5f6c8..0d9a033 100644 --- a/godot/world.tscn +++ b/godot/world.tscn @@ -241,14 +241,14 @@ on_leave_func = "_on_Cursor_set_camera" call_string = "camera_outer_attic" [node name="SecretEnter" parent="CameraMoveZones" instance=ExtResource( 6 )] -transform = Transform( 8.71637, 0, 0, 0, 13.8749, 0, 0, 0, 5.83956, 0, 0, 15.4817 ) +transform = Transform( 8.71637, 0, 0, 0, 13.8749, 0, 0, 0, 6.0468, 0, 0, 15.4817 ) on_enter_func = "_on_Cursor_set_camera" call_string = "camera_bookshelf_secret" [node name="SecretLeave" parent="CameraMoveZones" instance=ExtResource( 6 )] -transform = Transform( 8.71637, 0, 0, 0, 13.8749, 0, 0, 0, 9.43964, 0, 0, 15.4817 ) +transform = Transform( 8.71637, 0, 0, 0, 13.8749, 0, 0, 0, 7.8447, 0, 0, 15.4817 ) on_leave_func = "_on_Cursor_set_camera" -call_string = "camera_bookshelf_secret" +call_string = "camera_pos_corner" [node name="AmbientSound" parent="." instance=ExtResource( 7 )] @@ -330,7 +330,6 @@ hop = true transform = Transform( -0.23556, 0, -0.0837355, 0, 0.25, 0, 0.0837355, 0, -0.23556, 1.2157, -3.69864, 14.5479 ) hop = true -[connection signal="motion_status" from="AnimationTree" to="3DCursor" method="_on_AnimationTree_motion_status"] [connection signal="motion_status" from="AnimationTree" to="AmbientSound" method="_on_AnimationTree_motion_status"] [connection signal="motion_status" from="AnimationTree" to="Attic/AtticAmberLight" method="_on_AnimationTree_motion_status"]