From f021e3cea41e2cc72e05971f61e470a9e8391ea6 Mon Sep 17 00:00:00 2001 From: derek Date: Wed, 2 Oct 2024 10:11:01 -0500 Subject: [PATCH] fixed camera lock bug and item steps are mostly working --- assets/health_pickup.tscn | 5 ----- assets/money_pickup.tscn | 3 --- assets/stamina_pickup.tscn | 4 ---- scripts/item_pickup.gd | 11 ++++------- scripts/player.gd | 7 +++---- 5 files changed, 7 insertions(+), 23 deletions(-) diff --git a/assets/health_pickup.tscn b/assets/health_pickup.tscn index f17610a..c041c72 100644 --- a/assets/health_pickup.tscn +++ b/assets/health_pickup.tscn @@ -75,8 +75,3 @@ attenuation_model = 1 autoplay = true [node name="Timer" type="Timer" parent="."] - -[node name="PickupTimer" type="Timer" parent="."] -wait_time = 3.0 - -[connection signal="timeout" from="PickupTimer" to="." method="_on_pickup_timer_timeout"] diff --git a/assets/money_pickup.tscn b/assets/money_pickup.tscn index e4ae4b4..ab14e34 100644 --- a/assets/money_pickup.tscn +++ b/assets/money_pickup.tscn @@ -125,6 +125,3 @@ collision_mask = 16 shape = SubResource("CapsuleShape3D_ms2qn") [node name="Timer" type="Timer" parent="."] - -[node name="PickupTimer" type="Timer" parent="."] -wait_time = 3.0 diff --git a/assets/stamina_pickup.tscn b/assets/stamina_pickup.tscn index f0185f7..b3c1f10 100644 --- a/assets/stamina_pickup.tscn +++ b/assets/stamina_pickup.tscn @@ -78,10 +78,6 @@ shape = SubResource("CapsuleShape3D_om0ey") [node name="Timer" type="Timer" parent="."] -[node name="PickupTimer" type="Timer" parent="."] -wait_time = 3.0 -one_shot = true - [connection signal="body_entered" from="." to="." method="_on_body_entered"] [connection signal="area_entered" from="Area3D" to="." method="_on_area_3d_area_entered"] [connection signal="body_entered" from="Area3D" to="." method="_on_area_3d_body_entered"] diff --git a/scripts/item_pickup.gd b/scripts/item_pickup.gd index 72faebf..cff8057 100644 --- a/scripts/item_pickup.gd +++ b/scripts/item_pickup.gd @@ -32,14 +32,11 @@ func _physics_process(delta): position = lerp(position, player.item_holder.global_position, 25 * delta) if abs(position - player.item_holder.global_position) < Vector3(.5,.5,.5): - await get_tree().create_timer(3).timeout - pick_up = true + await get_tree().create_timer(2).timeout + position = lerp(position, player.camera.global_position, .01 * delta) + await get_tree().create_timer(.01).timeout + picked_up() - if pick_up: - position = lerp(position, player.camera.global_position, 5 * delta) - if abs(global_position - player.camera.global_position) < Vector3(.5,.5,.5): - pickupable = true - func picked_up(): player.pickup_sound.pitch_scale = 1 + randf_range(-.3,.3) diff --git a/scripts/player.gd b/scripts/player.gd index 6e6ad07..35e012a 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -109,14 +109,13 @@ func _ready(): if AUDIO == false: AudioServer.set_bus_volume_db(0,-80) -func _unhandled_input(event) -> void: +func _input(event) -> void: if event is InputEventMouseMotion: self.rotate_y(-event.relative.x * SENSITIVITY) head.rotate_x(-event.relative.y * SENSITIVITY) head.rotation.x = clamp(head.rotation.x, deg_to_rad(-90), deg_to_rad(85)) mouse_input = event.relative - - + func _physics_process(delta): if !dead: @@ -306,7 +305,7 @@ func ladder_collide(is_climbing): func _on_pick_up_magnet_body_entered(body): if body.is_in_group("pickup") and body.is_in_group("magnet"): body.player_follow = self - #body.collision_shape.disabled = true + body.collision_shape.disabled = true func weapon_tilt(input_x, delta): if weapon_holder: