From 2caa329418610090cc1afd7fcb204bb56212da11 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Wed, 24 May 2023 18:03:26 -0400 Subject: [PATCH] fix tiny weirdness of ladder --- objects/environment/ladder/ladder.gd | 3 +++ objects/player/player_scholar.gd | 2 +- objects/player/player_scholar.tscn | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/objects/environment/ladder/ladder.gd b/objects/environment/ladder/ladder.gd index 51af051..7cfe490 100644 --- a/objects/environment/ladder/ladder.gd +++ b/objects/environment/ladder/ladder.gd @@ -3,3 +3,6 @@ extends Area2D onready var left_snap: float = $LeftSnap.global_position.x onready var right_snap: float = $RightSnap.global_position.x onready var middle: float = global_position.x + 4.0 + +func _ready() -> void: + $CollisionShape2D.global_position.y -= 1.0 diff --git a/objects/player/player_scholar.gd b/objects/player/player_scholar.gd index 503950c..ac27d2f 100644 --- a/objects/player/player_scholar.gd +++ b/objects/player/player_scholar.gd @@ -191,7 +191,7 @@ func _on_Climbing_state_entered() -> void: snap = Vector2.ZERO var input_dir = sign(Input.get_axis("ui_left", "ui_right")) var ladder_dir = sign(_attached_ladder.middle - global_position.x) - var flip = global_position.y - 1.0 <= _attached_ladder.global_position.y and input_dir == ladder_dir + var flip = global_position.y - 1.0 <= _attached_ladder.global_position.y and input_dir == ladder_dir and is_on_floor() print(ladder_dir) print(flip) if ladder_dir >= 0.0 != flip: diff --git a/objects/player/player_scholar.tscn b/objects/player/player_scholar.tscn index 28505d5..459c4c9 100644 --- a/objects/player/player_scholar.tscn +++ b/objects/player/player_scholar.tscn @@ -1165,8 +1165,8 @@ script = ExtResource( 8 ) [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"]