fogwaves/revo-jailbreak
1
0
Fork 0
forked from team-sg/hero-mark-2
Code Pull requests Activity

fix tiny weirdness of ladder

Browse source
This commit is contained in:
Haze Weathers 2023-05-24 18:03:26 -04:00
parent 18f1eca8ed
commit 2caa329418
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
objects/environment/ladder/ladder.gd
View file

@ -3,3 +3,6 @@ extends Area2D
onready var left_snap: float = $LeftSnap.global_position.x onready var left_snap: float = $LeftSnap.global_position.x
onready var right_snap: float = $RightSnap.global_position.x onready var right_snap: float = $RightSnap.global_position.x
onready var middle: float = global_position.x + 4.0 onready var middle: float = global_position.x + 4.0
func _ready() -> void:
$CollisionShape2D.global_position.y -= 1.0

2
objects/player/player_scholar.gd
View file

@ -191,7 +191,7 @@ func _on_Climbing_state_entered() -> void:
snap = Vector2.ZERO snap = Vector2.ZERO
var input_dir = sign(Input.get_axis("ui_left", "ui_right")) var input_dir = sign(Input.get_axis("ui_left", "ui_right"))
var ladder_dir = sign(_attached_ladder.middle - global_position.x) 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(ladder_dir)
print(flip) print(flip)
if ladder_dir >= 0.0 != flip: if ladder_dir >= 0.0 != flip:

2
objects/player/player_scholar.tscn
View file

@ -1165,8 +1165,8 @@ script = ExtResource( 8 )
[connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [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_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" 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_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/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/Walking" to="." method="_on_Walking_state_entered"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"]