From 449479791c7b51e35ede23e6cb5a1f64a742c8f4 Mon Sep 17 00:00:00 2001 From: MarcEricMartel Date: Wed, 12 Oct 2022 08:45:13 -0400 Subject: [PATCH] HandAnim + corr sliders --- HUD.tscn | 6 +++--- Player.gd | 2 +- Player.tscn | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HUD.tscn b/HUD.tscn index b9960b6..e365f1b 100644 --- a/HUD.tscn +++ b/HUD.tscn @@ -183,7 +183,7 @@ margin_top = 572.0 margin_right = 1755.0 margin_bottom = 604.0 rect_pivot_offset = Vector2( 199, 32 ) -max_value = 1.0 +max_value = 1.2 step = 0.05 [node name="SFXSlider" type="Label" parent="MenuLayer/Start/Options/SFXSlider"] @@ -199,7 +199,7 @@ margin_top = 612.0 margin_right = 1755.0 margin_bottom = 644.0 rect_pivot_offset = Vector2( -414, 50 ) -max_value = 1.0 +max_value = 1.2 step = 0.05 [node name="MusicLbl" type="Label" parent="MenuLayer/Start/Options/MusicSlider"] @@ -215,7 +215,7 @@ margin_top = 654.0 margin_right = 1755.0 margin_bottom = 686.0 rect_pivot_offset = Vector2( -414, 50 ) -max_value = 1.0 +max_value = 1.2 step = 0.05 [node name="MasterLbl" type="Label" parent="MenuLayer/Start/Options/MasterVolSlider"] diff --git a/Player.gd b/Player.gd index 4638469..f87d5c1 100644 --- a/Player.gd +++ b/Player.gd @@ -44,6 +44,7 @@ var rng = RandomNumberGenerator.new() func _ready(): rng.randomize() slap_animator.current_animation = "basic_slap" + slap_animator.playback_speed = 30 func _input(event): @@ -125,7 +126,6 @@ func _physics_process(delta): if !isSlap and can_slap: slap_animator.seek(slap, true) if isSlap: - slap_animator.playback_speed = 20 slap_animator.play() slap_gauge.fill = slap; slap_gauge.kill = slapkill; diff --git a/Player.tscn b/Player.tscn index 6af3023..22a946c 100644 --- a/Player.tscn +++ b/Player.tscn @@ -80,7 +80,7 @@ tracks/0/keys = { "times": PoolRealArray( 0, 1, 2, 3 ), "transitions": PoolRealArray( 1, 1, 1, 1 ), "update": 0, -"values": [ Vector3( 0, 0, 0 ), Vector3( -0.103, 2.756, 0 ), Vector3( -2, -5, 0 ), Vector3( 0, 0, 0 ) ] +"values": [ Vector3( 0, 0, 0 ), Vector3( -0.103, 2.756, -0.5 ), Vector3( 0, -3, -3 ), Vector3( 0, 0, 0 ) ] } tracks/1/type = "value" tracks/1/path = NodePath("Head/HandParent/Hand:rotation_degrees") @@ -92,7 +92,7 @@ tracks/1/keys = { "times": PoolRealArray( 0, 1, 2, 3 ), "transitions": PoolRealArray( 1, 1, 1, 1 ), "update": 0, -"values": [ Vector3( 0, 0, 0 ), Vector3( -36.146, -1.281, 0 ), Vector3( 90.146, -1.281, 0 ), Vector3( 0, 0, 0 ) ] +"values": [ Vector3( 0, 0, 0 ), Vector3( -56.146, -1.281, 0 ), Vector3( 110.146, -1.281, 0 ), Vector3( 0, 0, 0 ) ] } [node name="Player" type="KinematicBody"]