From ad070514d77cfbc1cce76ece26245fdd67debcdb Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Mon, 19 May 2025 22:50:28 +0200 Subject: [PATCH] Added item and interact animations --- prefabs/Player2D.tscn | 7 ++++--- project.godot | 10 ++++++++++ .../CSharp/Common/CharacterControls/Player2D.cs | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/prefabs/Player2D.tscn b/prefabs/Player2D.tscn index 5f3aa27..776b0cc 100644 --- a/prefabs/Player2D.tscn +++ b/prefabs/Player2D.tscn @@ -3150,7 +3150,7 @@ animations = [{ }], "loop": true, "name": &"side pickup", -"speed": 11.0 +"speed": 13.0 }, { "frames": [{ "duration": 1.0, @@ -3523,8 +3523,9 @@ position = Vector2(0, -374) [node name="Animated Sprites" type="AnimatedSprite2D" parent="CharacterBody2D/visuals"] position = Vector2(0, 450) sprite_frames = SubResource("SpriteFrames_4yiyq") -animation = &"diagonal wateringcan" -frame_progress = 0.234463 +animation = &"side pickup" +frame = 6 +frame_progress = 0.00476268 offset = Vector2(0, -450) [node name="Hoe" type="Sprite2D" parent="CharacterBody2D/visuals"] diff --git a/project.godot b/project.godot index 94f36a8..5e96817 100644 --- a/project.godot +++ b/project.godot @@ -147,6 +147,16 @@ ui_inventory_disadvance={ "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } +interact2={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":72,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} +item={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} [internationalization] diff --git a/scripts/CSharp/Common/CharacterControls/Player2D.cs b/scripts/CSharp/Common/CharacterControls/Player2D.cs index b2e3550..e773300 100644 --- a/scripts/CSharp/Common/CharacterControls/Player2D.cs +++ b/scripts/CSharp/Common/CharacterControls/Player2D.cs @@ -62,6 +62,20 @@ public partial class Player2D : CharacterBody2D _lastDirection = Vector2.Down; } + if (Input.IsActionPressed("interact2")) + { + _sprite.Animation = "back interact"; + anyActionPressed = true; + _lastDirection = Vector2.Up; + } + + if (Input.IsActionPressed("item")) + { + _sprite.Animation = "diagonal item"; + anyActionPressed = true; + _lastDirection = Vector2.Right; + } + if (anyActionPressed) { _sprite.Play();