From 8f208f7d516214c91ef95c3239f866c6702dafa7 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Wed, 10 May 2023 20:18:23 -0400 Subject: [PATCH] adjusted blink duration and changed push sprite --- graphics/player/sg_push.png | Bin 347 -> 353 bytes objects/player/player_scholar.gd | 2 +- objects/player/player_scholar.tscn | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/player/sg_push.png b/graphics/player/sg_push.png index 74f6a0f06ae54ed1423f53ed643ac389df1fd5b1..425cd076119615580c28d92c88ffe4ed54aaddce 100644 GIT binary patch delta 211 zcmV;^04)F80^tIXmVdTML_t(IPqmNR5`!QNL{q{o|Np~{u*N8DXPVLTfZ?#LN^&#L z719Rgortq1y_RIi?T_hB$(XZ3Ft-DkKizYMDKYChw}Y5NEfKTYSwG)^>-MYYSW7gH$NzNgbh*|9xUQRlkOsj;!q{BL$ z{&^ToI-HPD*>_#7o#dRK6qP8Qj0=Ix`k^y2Ze8H6pmZKwMMmkwx$uYeHh6cf40j!j zbH4&hk={ERLjy%>Jxgh=`DG7OdAU3kD#yfiQ1O>N@Et_Ha{Vhq{?+p&00000NkvXX Hu0mjfzL{Xb diff --git a/objects/player/player_scholar.gd b/objects/player/player_scholar.gd index e85dbab..dbe69f4 100644 --- a/objects/player/player_scholar.gd +++ b/objects/player/player_scholar.gd @@ -122,7 +122,7 @@ func _on_Walking_state_entered() -> void: func _on_Blinking_state_entered() -> void: if $"%Blinking".active: animation_player.play("blink") - var blink_timer = get_tree().create_timer(rand_range(0.2, 1.0), false) + var blink_timer = get_tree().create_timer(rand_range(1.0, 2.0), false) blink_timer.connect("timeout", self,"_on_Blinking_state_entered") func _on_Stimming_state_entered() -> void: diff --git a/objects/player/player_scholar.tscn b/objects/player/player_scholar.tscn index bc030af..8f83382 100644 --- a/objects/player/player_scholar.tscn +++ b/objects/player/player_scholar.tscn @@ -937,7 +937,7 @@ event = "walk_start" [node name="On Timeout" type="Node" parent="StateChart/Root/Movement/Grounded/CanWalk/Still"] script = ExtResource( 10 ) to = NodePath("../../Blinking") -delay = 10.0 +delay = 1.0 [node name="Walking" type="Node" parent="StateChart/Root/Movement/Grounded/CanWalk"] script = ExtResource( 11 ) @@ -1156,8 +1156,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_can_walk"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [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"] @@ -1167,8 +1167,8 @@ script = ExtResource( 8 ) [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_process_pushing"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="_on_Airborne_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne" to="." method="_process_gravity"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_jump"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_exited"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/LadderJump" to="." method="_on_LadderJump_state_entered"]