team-sg/capri
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some script errors

Browse source
This commit is contained in:
Haze Weathers 2025-03-08 16:59:19 -05:00
parent af4bece554
commit b19ee682d1
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
autoloads/scene_manager.gd
View file

@ -39,12 +39,12 @@ var current_scene: Node:
return return
# remove current scene # remove current scene
if current_scene: if current_scene:
viewport.remove_child(current_scene) viewport.remove_child.call_deferred(current_scene)
current_scene.queue_free() current_scene.queue_free()
# add new scene # add new scene
if new_scene.is_inside_tree(): if new_scene.is_inside_tree():
new_scene.get_parent().remove_child(new_scene) new_scene.get_parent().remove_child.call_deferred(new_scene)
viewport.add_child(new_scene) viewport.add_child.call_deferred(new_scene)
current_scene = new_scene current_scene = new_scene

6
objects/player/player.tscn
View file

@ -364,7 +364,7 @@ script = ExtResource("10_mvu25")
script = ExtResource("7_rgjdc") script = ExtResource("7_rgjdc")
to = NodePath("..") to = NodePath("..")
event = &"jump_pressed" event = &"jump_pressed"
delay_in_seconds = "" delay_in_seconds = "0.0"
[node name="on TimeOut" type="Node" parent="StateChart/Root/Floating/Splat"] [node name="on TimeOut" type="Node" parent="StateChart/Root/Floating/Splat"]
script = ExtResource("7_rgjdc") script = ExtResource("7_rgjdc")
@ -378,7 +378,7 @@ script = ExtResource("10_mvu25")
[node name="on TimeOut" type="Node" parent="StateChart/Root/Floating/UnSplat"] [node name="on TimeOut" type="Node" parent="StateChart/Root/Floating/UnSplat"]
script = ExtResource("7_rgjdc") script = ExtResource("7_rgjdc")
to = NodePath("../../../Airborne/Falling") to = NodePath("../../../Airborne/Falling")
delay_in_seconds = ".25" delay_in_seconds = "0.25"
[connection signal="taken" from="StateChart/Root/on Killed" to="." method="_reset_position"] [connection signal="taken" from="StateChart/Root/on Killed" to="." method="_reset_position"]
[connection signal="taken" from="StateChart/Root/on Killed" to="Sounds/Death" method="play"] [connection signal="taken" from="StateChart/Root/on Killed" to="Sounds/Death" method="play"]
@ -400,8 +400,8 @@ delay_in_seconds = ".25"
[connection signal="state_entered" from="StateChart/Root/Airborne/Missile" to="Sounds/Whee" method="play"] [connection signal="state_entered" from="StateChart/Root/Airborne/Missile" to="Sounds/Whee" method="play"]
[connection signal="state_entered" from="StateChart/Root/Airborne/Missile" to="Sounds/Wallkick" method="play"] [connection signal="state_entered" from="StateChart/Root/Airborne/Missile" to="Sounds/Wallkick" method="play"]
[connection signal="state_exited" from="StateChart/Root/Airborne/Missile" to="." method="_restore_graphics_rotation"] [connection signal="state_exited" from="StateChart/Root/Airborne/Missile" to="." method="_restore_graphics_rotation"]
[connection signal="state_physics_processing" from="StateChart/Root/Airborne/Missile" to="." method="_face_towards_velocity"]
[connection signal="state_physics_processing" from="StateChart/Root/Airborne/Missile" to="." method="_check_for_splat"] [connection signal="state_physics_processing" from="StateChart/Root/Airborne/Missile" to="." method="_check_for_splat"]
[connection signal="state_physics_processing" from="StateChart/Root/Airborne/Missile" to="." method="_face_towards_velocity"]
[connection signal="taken" from="StateChart/Root/Airborne/Missile/on Splatted" to="Sounds/HitWall" method="play"] [connection signal="taken" from="StateChart/Root/Airborne/Missile/on Splatted" to="Sounds/HitWall" method="play"]
[connection signal="state_entered" from="StateChart/Root/Floating/Splat" to="Graphics/Sprite/Splat" method="play"] [connection signal="state_entered" from="StateChart/Root/Floating/Splat" to="Graphics/Sprite/Splat" method="play"]
[connection signal="taken" from="StateChart/Root/Floating/Splat/on JumpPressed" to="." method="_do_splat_launch"] [connection signal="taken" from="StateChart/Root/Floating/Splat/on JumpPressed" to="." method="_do_splat_launch"]