Added tool animations to player

scenes/Babushka_scene_farm_outside_2d.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=51 format=3 uid="uid://gigb28qk8t12"]
+[gd_scene load_steps=55 format=3 uid="uid://gigb28qk8t12"]
 
 [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/Player2D.tscn" id="1_7wfwe"]
 [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
@@ -28,7 +28,10 @@
 [ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field_2d.tscn" id="26_vbdb2"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="27_klb81"]
 [ext_resource type="PackedScene" uid="uid://ce0mc0ddijmyi" path="res://prefabs/interactions/sprite_switcher_2d.tscn" id="28_p6n74"]
+[ext_resource type="Script" uid="uid://btusf04xnywhm" path="res://scripts/CSharp/Common/Inventory/ItemOnGround2D.cs" id="29_hukxv"]
 [ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="29_p6n74"]
+[ext_resource type="Script" uid="uid://bdsel2amlbnuq" path="res://scripts/CSharp/Common/Inventory/ItemOnGroundSpawnWith2D.cs" id="30_2nee2"]
+[ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="31_r0vdg"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_xy0kg"]
 shader = ExtResource("13_7p0hq")
@@ -93,8 +96,12 @@ shader_parameter/value_mult = 1.068
 shader_parameter/brightness_add = 0.0
 shader_parameter/contrast_mult = 0.913
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"]
+size = Vector2(14208, 1176)
+
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_p6n74"]
-size = Vector2(7632, 1192)
+resource_local_to_scene = true
+size = Vector2(7048, 1192)
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"]
 shader = ExtResource("13_7p0hq")
@@ -124,7 +131,7 @@ radius = 300.0
 [node name="ParallaxBackground" type="ParallaxBackground" parent="."]
 
 [node name="background color layer" type="ParallaxLayer" parent="ParallaxBackground"]
-position = Vector2(0, -296)
+position = Vector2(0, -552)
 motion_scale = Vector2(0.1, 0.1)
 motion_mirroring = Vector2(2048, 0)
 
@@ -144,7 +151,7 @@ centered = false
 offset = Vector2(0, -100)
 
 [node name="clouds layer" type="ParallaxLayer" parent="ParallaxBackground"]
-position = Vector2(0, -296)
+position = Vector2(0, -552)
 motion_scale = Vector2(0.2, 0.2)
 motion_mirroring = Vector2(4096, 0)
 
@@ -170,7 +177,7 @@ centered = false
 offset = Vector2(0, -100)
 
 [node name="background layer 3" type="ParallaxLayer" parent="ParallaxBackground"]
-position = Vector2(0, -296)
+position = Vector2(0, -552)
 motion_scale = Vector2(0.3, 0.3)
 motion_mirroring = Vector2(7274, 0)
 
@@ -265,6 +272,7 @@ scale = Vector2(1.7404, 1.77563)
 texture = ExtResource("11_vbdb2")
 
 [node name="background layer 4" type="ParallaxLayer" parent="ParallaxBackground"]
+position = Vector2(0, -256)
 motion_scale = Vector2(0.5, 0.5)
 motion_mirroring = Vector2(7998, 0)
 
@@ -387,6 +395,7 @@ scale = Vector2(1.7, 1.7)
 texture = ExtResource("13_0qu0h")
 
 [node name="back back trees layer" type="ParallaxLayer" parent="ParallaxBackground"]
+position = Vector2(0, -256)
 motion_scale = Vector2(0.7, 0.7)
 motion_mirroring = Vector2(4968, 0)
 
@@ -571,19 +580,20 @@ region_enabled = true
 region_rect = Rect2(1834, -5, 733, 1360)
 
 [node name="ground layer" type="ParallaxLayer" parent="ParallaxBackground"]
-position = Vector2(72, 208)
+position = Vector2(80, 208)
-motion_mirroring = Vector2(7998, 0)
+motion_mirroring = Vector2(8192, 0)
 
 [node name="floortile00" type="Sprite2D" parent="ParallaxBackground/ground layer"]
 texture_repeat = 2
 material = SubResource("ShaderMaterial_ubx8m")
-position = Vector2(3880, 2716)
+position = Vector2(3888, 2688)
-scale = Vector2(15.625, 6)
+scale = Vector2(16, 5.48)
 texture = SubResource("NoiseTexture2D_e5alv")
 
 [node name="Fence" type="Node2D" parent="."]
 
 [node name="Fence" type="Sprite2D" parent="Fence"]
+visible = false
 texture_repeat = 2
 material = SubResource("ShaderMaterial_0sfl7")
 position = Vector2(5032, 1680)
@@ -660,16 +670,19 @@ shape = SubResource("RectangleShape2D_klb81")
 [node name="Static" type="Node2D" parent="Farm visuals"]
 
 [node name="House Mockup" type="Sprite2D" parent="Farm visuals/Static"]
+visible = false
 material = SubResource("ShaderMaterial_lhtpe")
 position = Vector2(5280, 1600)
 scale = Vector2(5, 5)
 texture = ExtResource("2_lhtpe")
 
 [node name="StaticBody2D" type="StaticBody2D" parent="Farm visuals/Static/House Mockup"]
+visible = false
 collision_layer = 2
 collision_mask = 6
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Farm visuals/Static/House Mockup/StaticBody2D"]
+visible = false
 position = Vector2(-257.6, 236.8)
 polygon = PackedVector2Array(232, -4.80005, 0, 0, 0, -96, -262.4, -97.6, -265.6, -260.8, -310.4, -260.8, -235.2, -321.6, -124.8, -323.2, -57.6, -424, 84.8, -436.8, 118.4, -452.8, 136, -436.8, 726.4, -452.8, 817.6, -299.2, 785.6, -291.2, 785.6, -108.8, 241.6, -94.4)
 
@@ -683,7 +696,11 @@ position = Vector2(-48, -16)
 collision_mask = 5
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Farm visuals/FieldParent/Area2D"]
-position = Vector2(-1264, 2980)
+position = Vector2(1536, 2964)
+shape = SubResource("RectangleShape2D_2nee2")
+
+[node name="CollisionShape2D2" type="CollisionShape2D" parent="Farm visuals/FieldParent/Area2D"]
+position = Vector2(13772, 2960)
 shape = SubResource("RectangleShape2D_p6n74")
 
 [node name="YSorted" type="Node2D" parent="."]
@@ -718,31 +735,35 @@ position = Vector2(80, -368)
 shape = SubResource("CircleShape2D_p6n74")
 
 [node name="BaseField" parent="." instance=ExtResource("26_vbdb2")]
+visible = false
 position = Vector2(11280, 2560)
 
 [node name="FieldBehaviour" parent="BaseField" index="1"]
 FieldState = 3
 
 [node name="BaseField2" parent="." instance=ExtResource("26_vbdb2")]
+visible = false
 position = Vector2(11280, 3304)
 
 [node name="FieldBehaviour" parent="BaseField2" index="1"]
 FieldState = 3
 
 [node name="BaseField3" parent="." instance=ExtResource("26_vbdb2")]
+visible = false
 position = Vector2(12080, 3296)
 
 [node name="FieldBehaviour" parent="BaseField3" index="1"]
 FieldState = 3
 
 [node name="BaseField4" parent="." instance=ExtResource("26_vbdb2")]
+visible = false
 position = Vector2(12080, 2544)
 
 [node name="FieldBehaviour" parent="BaseField4" index="1"]
 FieldState = 3
 
 [node name="Hoe Pickup" parent="." node_paths=PackedStringArray("_sprites") instance=ExtResource("27_klb81")]
-position = Vector2(3264, 2120)
+position = Vector2(7728, 2000)
 rotation = 3.3074
 _sprites = NodePath("SpriteSwitcher2d")
 
@@ -755,8 +776,15 @@ shape = SubResource("CircleShape2D_kxdmn")
 [node name="SpriteSwitcher2d" parent="Hoe Pickup" instance=ExtResource("28_p6n74")]
 scale = Vector2(0.5, 0.5)
 
+[node name="ItemOnGround" type="Node" parent="Hoe Pickup"]
+script = ExtResource("29_hukxv")
+
+[node name="Node" type="Node" parent="Hoe Pickup/ItemOnGround"]
+script = ExtResource("30_2nee2")
+_blueprint = ExtResource("31_r0vdg")
+
 [node name="Watercan Pickup" parent="." node_paths=PackedStringArray("_sprites") instance=ExtResource("27_klb81")]
-position = Vector2(6216, 2248)
+position = Vector2(8400, 2024)
 _sprites = NodePath("ActiveInactive")
 _id = 1
 
@@ -784,6 +812,7 @@ region_rect = Rect2(1, 1138, 418, 288)
 [connection signal="PickedUpTool" from="YSorted/Player2d" to="Hoe Pickup" method="SetSpriteActiveState"]
 [connection signal="PickedUpTool" from="YSorted/Player2d" to="Watercan Pickup" method="SetSpriteActiveState"]
 [connection signal="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Player2d" method="TryFillWateringCan"]
+[connection signal="Interacted" from="Hoe Pickup" to="Hoe Pickup/ItemOnGround" method="TryPickUp"]
 [connection signal="InteractedTool" from="Hoe Pickup" to="YSorted/Player2d" method="ActivateTool"]
 [connection signal="InteractedTool" from="Watercan Pickup" to="YSorted/Player2d" method="ActivateTool"]
 

scripts/CSharp/Common/CharacterControls/Player2D.cs

@@ -7,7 +7,11 @@ public partial class Player2D : CharacterBody2D
 	[Export] private float _speed = 100f;
 	[Export] private AnimatedSprite2D _sprite;
 
+	// -1 means no tool.
+	private int _toolID = -1;
+	private string _toolString;
 	private bool anyActionPressed;
+	private Vector2 _lastDirection = Vector2.Zero;
 
 	public override void _Process(double delta)
 	{
@@ -18,8 +22,9 @@ public partial class Player2D : CharacterBody2D
 			Velocity = new Vector2(_speed, 0);
 			MoveAndSlide();
 			_sprite.FlipH = false;
-			_sprite.Animation = "side_walking";
+			_sprite.Animation = "side walking" + _toolString;
 			anyActionPressed = true;
+			_lastDirection = Vector2.Right;
 		}
 
 		if (Input.IsActionPressed("move_left"))
@@ -27,24 +32,27 @@ public partial class Player2D : CharacterBody2D
 			Velocity = new Vector2(-_speed, 0);
 			MoveAndSlide();
 			_sprite.FlipH = true;
-			_sprite.Animation = "side_walking";
+			_sprite.Animation = "side walking" + _toolString;
 			anyActionPressed = true;
+			_lastDirection = Vector2.Left;
 		}
 
 		if (Input.IsActionPressed("move_up"))
 		{
 			Velocity = new Vector2(0, -_speed);
 			MoveAndSlide();
-			_sprite.Animation = "back walking";
+			_sprite.Animation = "back walking" + _toolString;
 			anyActionPressed = true;
+			_lastDirection = Vector2.Up;
 		}
 
 		if (Input.IsActionPressed("move_down"))
 		{
 			Velocity = new Vector2(0, _speed);
 			MoveAndSlide();
-			_sprite.Animation = "front walking";
+			_sprite.Animation = "front walking" + _toolString;
 			anyActionPressed = true;
+			_lastDirection = Vector2.Down;
 		}
 
 		if (anyActionPressed)
@@ -53,8 +61,33 @@ public partial class Player2D : CharacterBody2D
 		}
 		else
 		{
-			_sprite.Animation = "front idle";
+			//idle
+			if(_lastDirection == Vector2.Zero || _lastDirection == Vector2.Down)
+				_sprite.Animation = "front idle" + _toolString;
+			else if(_lastDirection == Vector2.Left || _lastDirection == Vector2.Right)
+				_sprite.Animation = "side idle" + _toolString;
+			else if(_lastDirection == Vector2.Up)
+				_sprite.Animation = "back idle" + _toolString;
+		}
+	}
+
+	public void ActivateTool(bool success, int id)
+	{
+		if (success)
+			_toolID = id;
+		else _toolID = -1;
+
+		switch (_toolID)
+		{
+			case 0:
+				_toolString = " rake";
+				break;
+			case 1:
+				_toolString = " wateringcan";
+				break;
+			default:
+				_toolString = "";
+				break;
 		}
-		
 	}
 }

scripts/CSharp/Common/Farming/FarmingControls2D.cs

@@ -1,3 +1,4 @@
+using Babushka.scripts.CSharp.Common.Inventory;
 using Godot;
 using Godot.Collections;