Skip to content

Commit 5a63d6b

Browse files
committed
Fixed player camera position on respawn at checkpoints
1 parent b402d16 commit 5a63d6b

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Levels/Playable/Level4/Floor1.tscn

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

Scripts/FrameworkScripts/SaveLoadFramework.gd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,18 @@ func start_game(slot, player_type, graphics_efficiency, player_spawn_pos = null,
8989
level_loaded.get_node("Player").get_node("Player").position = player_spawn_pos
9090
level_loaded.get_node("Player").get_node("Player").current_ability = player_respawn_ability
9191
level_loaded.get_node("Player").get_node("Camera").position = player_spawn_pos
92+
level_loaded.get_node("Player").get_node("Camera").get_node("CameraCollider").position = player_spawn_pos
9293

9394
if player_respawn_ability == "Weapon":
94-
level_loaded.get_node("Player").get_node("Camera").get_node("Control").get_node("AbilityManager").ability_index = 0
95+
level_loaded.get_node("Player").get_node("Camera").get_node("AbilityManager").ability_index = 0
9596
if player_respawn_ability == "RocketBoost":
96-
level_loaded.get_node("Player").get_node("Camera").get_node("Control").get_node("AbilityManager").ability_index = 1
97+
level_loaded.get_node("Player").get_node("Camera").get_node("AbilityManager").ability_index = 1
9798
if player_respawn_ability == "ArmGun":
98-
level_loaded.get_node("Player").get_node("Camera").get_node("Control").get_node("AbilityManager").ability_index = 2
99+
level_loaded.get_node("Player").get_node("Camera").get_node("AbilityManager").ability_index = 2
99100
if player_respawn_ability == "Grapple":
100-
level_loaded.get_node("Player").get_node("Camera").get_node("Control").get_node("AbilityManager").ability_index = 3
101+
level_loaded.get_node("Player").get_node("Camera").get_node("AbilityManager").ability_index = 3
101102

102-
level_loaded.get_node("Player").get_node("Camera").get_node("Control").get_node("AbilityManager")._on_fadin_half_wait_timer_timeout()
103+
level_loaded.get_node("Player").get_node("Camera").get_node("AbilityManager")._on_fadin_half_wait_timer_timeout()
103104
get_node("Menu").queue_free()
104105
get_parent().get_node("Level").call_deferred("add_child", level_loaded)
105106

Scripts/ObjectScripts/GrappleManager.gd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ func _physics_process(delta):
3333
get_parent().disable_speed_cap = false
3434
get_parent().low_gravity = false
3535

36+
if !hooked && !air_grapling && get_parent().get_node("PlayerAnimation").animation == "GrappleHang":
37+
get_parent().get_node("PlayerAnimation").play("Idle")
38+
3639
if active && grapling:
3740
if hooked && hook && air_grapling:
3841
if !was_hooked:

0 commit comments

Comments
 (0)