Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Implemented field creation and wateringcan fill up animation

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-05-24 21:47:25 +02:00
parent b917fb5fbd
commit a477f9ef4f
7 changed files with 40 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
+1 -1
View File
@@ -8,7 +8,7 @@ public partial class InteractionArea2D : Node2D
[Export] private Label _label;
[Export] private SpriteSwitcher2D _sprites; // TODO: remove
[Export] private bool _showLabel = true;
[Export] private int _id; // TODO: remove
[Export] private int _id = -1; // TODO: remove
[Signal] public delegate void InteractedToolEventHandler(int id); // TODO: remove
[Signal] public delegate void InteractedEventHandler();
scripts/CSharp/Common/CharacterControls/Player2D.cs
+20 -23
View File
@@ -15,9 +15,7 @@ public partial class Player2D : CharacterBody2D
private int _toolID = -1;
private string _toolString;
private bool anyActionPressed;
private bool _wateringInProgress;
private bool _pickupAnimationInProgress;
private bool _farmingAnimationInProgress;
private bool _canHandleInput = true;
private Vector2 _lastDirection = Vector2.Zero;
private InventoryManager _inventoryManager;
@@ -36,8 +34,8 @@ public partial class Player2D : CharacterBody2D
public override void _Process(double delta)
{
anyActionPressed = false;
if (_pickupAnimationInProgress || _wateringInProgress || _farmingAnimationInProgress)
if (!_canHandleInput)
return;
if (Input.IsActionPressed("move_right"))
@@ -135,47 +133,46 @@ public partial class Player2D : CharacterBody2D
/// </summary>
public void PlayWateringAnimation()
{
if (_toolID == 1 && !_wateringInProgress)
if (_toolID == 1 && _canHandleInput)
{
_sprite.Animation = "diagonal wateringcan";
_sprite.Play();
_wateringInProgress = true;
Task.Run(DelayedWateringCanReset);
_canHandleInput = false;
Task.Run(DelayedInputHandlerReset);
}
}
private async Task DelayedWateringCanReset()
private async Task DelayedInputHandlerReset()
{
await Task.Delay(1000);
_wateringInProgress = false;
_canHandleInput = true;
}
public void PlayPickUpAnimation()
{
_sprite.Animation = "side pickup";
_sprite.Play();
_pickupAnimationInProgress = true;
Task.Run(DelayedPickUpReset);
}
private async Task DelayedPickUpReset()
{
await Task.Delay(1000);
_pickupAnimationInProgress = false;
_canHandleInput = false;
Task.Run(DelayedInputHandlerReset);
}
public void PlayFarmingAnimation()
{
_sprite.Animation = "diagonal farming";
_sprite.Play();
_farmingAnimationInProgress = true;
Task.Run(DelayedFarmingReset);
_canHandleInput = false;
Task.Run(DelayedInputHandlerReset);
}
private async Task DelayedFarmingReset()
public void PlayWateringCanFillupAnimation()
{
await Task.Delay(1000);
_farmingAnimationInProgress = false;
_sprite.Animation = "back interact";
_sprite.Play();
_canHandleInput = false;
_lastDirection = Vector2.Up;
Task.Run(DelayedInputHandlerReset);
}
}