sjkillen/goodnight_jellybean
sjkillen/goodnight_jellybean
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 1 Packages Wiki Activity

subtle bugfixes

Browse source
This commit is contained in:
Spencer Killen 2023-01-02 22:01:36 -07:00
parent b468dac283
commit c4ceeca1d4
Signed by: sjkillen
GPG key ID: F307025B65C860BA
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
godot/3DCursor.gd
View file

@ -104,10 +104,9 @@ func _process(_delta):
set_color() set_color()
var locked = false
func _physics_process(delta): func _physics_process(delta):
inc_time_buffer(delta) inc_time_buffer(delta)
if locked: if GlobalCursorState.is_frozen:
return return
var dir = input_direction() var dir = input_direction()
var speed = input_speed() var speed = input_speed()
@ -117,8 +116,3 @@ func _physics_process(delta):
sound_bump() sound_bump()
elif speed != 0.0: elif speed != 0.0:
sound_click() sound_click()
func _on_AnimationTree_motion_status(value):
locked = value

7
godot/world.tscn
View file

@ -241,14 +241,14 @@ on_leave_func = "_on_Cursor_set_camera"
call_string = "camera_outer_attic" call_string = "camera_outer_attic"
[node name="SecretEnter" parent="CameraMoveZones" instance=ExtResource( 6 )] [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" on_enter_func = "_on_Cursor_set_camera"
call_string = "camera_bookshelf_secret" call_string = "camera_bookshelf_secret"
[node name="SecretLeave" parent="CameraMoveZones" instance=ExtResource( 6 )] [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" on_leave_func = "_on_Cursor_set_camera"
call_string = "camera_bookshelf_secret" call_string = "camera_pos_corner"
[node name="AmbientSound" parent="." instance=ExtResource( 7 )] [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 ) transform = Transform( -0.23556, 0, -0.0837355, 0, 0.25, 0, 0.0837355, 0, -0.23556, 1.2157, -3.69864, 14.5479 )
hop = true 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="AmbientSound" method="_on_AnimationTree_motion_status"]
[connection signal="motion_status" from="AnimationTree" to="Attic/AtticAmberLight" method="_on_AnimationTree_motion_status"] [connection signal="motion_status" from="AnimationTree" to="Attic/AtticAmberLight" method="_on_AnimationTree_motion_status"]