Inventory resource rework and slot aspect fix

prefabs/Player2D.tscn

@@ -3506,7 +3506,7 @@ position = Vector2(0, 374)
 collision_layer = 4
 collision_mask = 3
 script = ExtResource("1_ssqtd")
-_speed = 500.0
+_speed = 1500.0
 _sprite = NodePath("visuals/Animated Sprites")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]

prefabs/UI/Inventory/Inventory.tscn

@@ -1,15 +1,10 @@
-[gd_scene load_steps=11 format=3 uid="uid://cgjc4wurbgimy"]
+[gd_scene load_steps=6 format=3 uid="uid://cgjc4wurbgimy"]
 
 [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
-[ext_resource type="Script" uid="uid://b2jhdxcrhtm2d" path="res://scripts/CSharp/Common/Inventory/InventoryTestScript.cs" id="3_exrk4"]
 [ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"]
 [ext_resource type="Texture2D" uid="uid://dcidjcsqk12p1" path="res://art/ui/UI/UI_bag_export_02.png" id="4_df8i8"]
 [ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
 [ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
-[ext_resource type="Resource" uid="uid://blr8tine5m0ma" path="res://resources/items/tomato.tres" id="7_l3npx"]
-[ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="7_vvo7l"]
-[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="8_nw1un"]
-[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/axe.tres" id="10_o7h8q"]
 
 [node name="CanvasLayer" type="CanvasLayer"]
 layer = 90
@@ -370,7 +365,3 @@ offset_left = 703.0
 offset_top = 512.0
 offset_right = 803.0
 offset_bottom = 612.0
-
-[node name="InventoryTester" type="Node" parent="Inventory"]
-script = ExtResource("3_exrk4")
-_testItemsToCreate = Array[Object]([ExtResource("7_l3npx"), ExtResource("7_l3npx"), ExtResource("8_nw1un"), ExtResource("7_vvo7l"), ExtResource("10_o7h8q"), ExtResource("7_l3npx"), ExtResource("8_nw1un"), ExtResource("8_nw1un"), ExtResource("8_nw1un"), ExtResource("8_nw1un"), ExtResource("7_vvo7l")])

prefabs/UI/Inventory/Slot.tscn

@@ -70,6 +70,7 @@ offset_bottom = -10.0
 grow_horizontal = 2
 grow_vertical = 2
 texture = ExtResource("3_n5ryf")
-expand_mode = 1
+expand_mode = 4
+stretch_mode = 5
 
 [connection signal="gui_input" from="." to="." method="_on_gui_input"]

prefabs/interactions/generic_item_on_ground.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" uid="uid://udhigottc8rg" path="res://scripts/CSharp/Common/Inventory/ItemOnGround.cs" id="1_mnomu"]
 [ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="2_ue6ub"]
 [ext_resource type="Script" uid="uid://c8suoi3i6kqai" path="res://scripts/CSharp/Common/Inventory/ItemOnGroundSpawnWith.cs" id="3_ue6ub"]
-[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/axe.tres" id="4_sfad0"]
+[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/shovel.tres" id="4_sfad0"]
 
 [node name="GenericItemOnGround" type="Node3D"]
 script = ExtResource("1_mnomu")

resources/items/axe.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://c7viddcd3kywp"]
-
-[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_t485b"]
-
-[resource]
-script = ExtResource("1_t485b")
-name = "Axe Deo"
-color = Color(0.643898, 0.4587, 0.294335, 1)
-maxStack = 1
-metadata/_custom_type_script = "uid://cbskymrxs6ksu"

resources/items/hoe.tres

@@ -1,12 +1,16 @@
-[gd_resource type="Resource" script_class="ItemResource" load_steps=3 format=3 uid="uid://c5yg3lx756v4v"]
+[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://c5yg3lx756v4v"]
 
 [ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_06nef"]
-[ext_resource type="Texture2D" uid="uid://cfxibry711o16" path="res://art/ui/UI/icons/icon-scythe.png" id="1_jd58x"]
+[ext_resource type="Texture2D" uid="uid://3pj2q7wtuion" path="res://art/farm/farming/farmobjekte/hoe.png" id="1_jd58x"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_i5wdx"]
+atlas = ExtResource("1_jd58x")
+region = Rect2(995, 190, 328, 1223)
 
 [resource]
 script = ExtResource("1_06nef")
 name = "Hoe"
 color = Color(0.751421, 0.329615, 0.570911, 1)
-icon = ExtResource("1_jd58x")
+icon = SubResource("AtlasTexture_i5wdx")
 maxStack = 1
 metadata/_custom_type_script = "uid://cbskymrxs6ksu"

resources/items/pickaxe.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://datee0flk1e84"]
-
-[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_07aya"]
-
-[resource]
-script = ExtResource("1_07aya")
-name = "Pick Axe"
-color = Color(0.589014, 0.823353, 0.998475, 1)
-maxStack = 1
-metadata/_custom_type_script = "uid://cbskymrxs6ksu"

resources/items/rake.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://dlcmqfjvgphqu"]
+
+[ext_resource type="Texture2D" uid="uid://c4ggew55w0icj" path="res://art/farm/farming/farmobjekte/harke.png" id="1_imv0i"]
+[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_jplkm"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_i5wdx"]
+atlas = ExtResource("1_imv0i")
+region = Rect2(8, 10, 619, 771)
+
+[resource]
+script = ExtResource("2_jplkm")
+name = "Hoe"
+color = Color(0.751421, 0.329615, 0.570911, 1)
+icon = SubResource("AtlasTexture_i5wdx")
+maxStack = 1
+metadata/_custom_type_script = "uid://cbskymrxs6ksu"

resources/items/scythe.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://datee0flk1e84"]
+
+[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="1_6rw6x"]
+[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_mfb7x"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3wroj"]
+atlas = ExtResource("1_6rw6x")
+region = Rect2(1049, 0, 550, 1332)
+
+[resource]
+script = ExtResource("2_mfb7x")
+name = "rake"
+color = Color(0.589014, 0.823353, 0.998475, 1)
+icon = SubResource("AtlasTexture_3wroj")
+maxStack = 1
+metadata/_custom_type_script = "uid://cbskymrxs6ksu"

resources/items/shovel.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://c7viddcd3kywp"]
+
+[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="1_ih03p"]
+[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_t485b"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_lo7on"]
+atlas = ExtResource("1_ih03p")
+region = Rect2(522, 139, 285, 1333)
+
+[resource]
+script = ExtResource("1_t485b")
+name = "Shovel"
+color = Color(0.424722, 0.266026, 0.108459, 1)
+icon = SubResource("AtlasTexture_lo7on")
+maxStack = 1
+metadata/_custom_type_script = "uid://cbskymrxs6ksu"

resources/items/test.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://ocmg3fxkxugq"]
+
+[ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="1_bqfcn"]
+[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="2_sjbrh"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_i5wdx"]
+atlas = ExtResource("1_bqfcn")
+region = Rect2(418, 854, 630, 794)
+
+[resource]
+script = ExtResource("2_sjbrh")
+name = "Hoe"
+color = Color(0.751421, 0.329615, 0.570911, 1)
+icon = SubResource("AtlasTexture_i5wdx")
+maxStack = 1
+metadata/_custom_type_script = "uid://cbskymrxs6ksu"

resources/items/wateringcan.tres

@@ -1,12 +1,16 @@
-[gd_resource type="Resource" script_class="ItemResource" load_steps=3 format=3 uid="uid://cndd64batns31"]
+[gd_resource type="Resource" script_class="ItemResource" load_steps=4 format=3 uid="uid://cndd64batns31"]
 
 [ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_8k5aa"]
-[ext_resource type="Texture2D" uid="uid://bh7oo5mypstyp" path="res://art/ui/UI/icons/icon-watercan.png" id="1_roi0v"]
+[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="1_roi0v"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tqw18"]
+atlas = ExtResource("1_roi0v")
+region = Rect2(-4, 1137, 428, 283)
 
 [resource]
 script = ExtResource("1_8k5aa")
 name = "Can"
 color = Color(0.336269, 0.489145, 0.825324, 1)
-icon = ExtResource("1_roi0v")
+icon = SubResource("AtlasTexture_tqw18")
 maxStack = 1
 metadata/_custom_type_script = "uid://cbskymrxs6ksu"

scenes/Babushka_scene_farm_outside_2d.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=58 format=3 uid="uid://gigb28qk8t12"]
+[gd_scene load_steps=60 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"]
@@ -26,12 +26,14 @@
 [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="21_ualyd"]
 [ext_resource type="Script" uid="uid://dhxtdhfqx3bte" path="res://scripts/CSharp/Common/Farming/FieldService2D.cs" id="25_0qu0h"]
 [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="25_hukxv"]
-[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/bucket.tres" id="26_2nee2"]
 [ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="26_ipqaa"]
-[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/axe.tres" id="27_ipqaa"]
+[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/shovel.tres" id="27_ipqaa"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="27_klb81"]
-[ext_resource type="PackedScene" path="res://prefabs/interactions/sprite_switcher_2d.tscn" id="28_p6n74"]
+[ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_6b2nr"]
+[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="28_ipqaa"]
+[ext_resource type="PackedScene" uid="uid://ce0mc0ddijmyi" path="res://prefabs/interactions/sprite_switcher_2d.tscn" id="28_p6n74"]
 [ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="29_p6n74"]
+[ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/scythe.tres" id="29_wtdui"]
 [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_xy0kg"]
@@ -602,7 +604,6 @@ 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)
@@ -714,24 +715,42 @@ _blueprint = ExtResource("26_ipqaa")
 [node name="CollisionShape3D" parent="YSorted/HoeGenericPickup/InteractionArea2/Area2D" index="0"]
 shape = SubResource("CircleShape2D_2nee2")
 
-[node name="GenericPickupWithoutIcon" parent="YSorted" instance=ExtResource("25_hukxv")]
-position = Vector2(3657, 1978)
-
-[node name="SpawnWithItem" parent="YSorted/GenericPickupWithoutIcon" index="0"]
-_blueprint = ExtResource("27_ipqaa")
-
-[node name="CollisionShape3D" parent="YSorted/GenericPickupWithoutIcon/InteractionArea2/Area2D" index="0"]
-shape = SubResource("CircleShape2D_2nee2")
-
 [node name="CanGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
-position = Vector2(2795, 2001)
+position = Vector2(8841, 3496)
 
 [node name="SpawnWithItem" parent="YSorted/CanGenericPickup" index="0"]
-_blueprint = ExtResource("26_2nee2")
+_blueprint = ExtResource("28_ipqaa")
 
 [node name="CollisionShape3D" parent="YSorted/CanGenericPickup/InteractionArea2/Area2D" index="0"]
 shape = SubResource("CircleShape2D_ipqaa")
 
+[node name="RakeGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
+position = Vector2(11091, 2060)
+
+[node name="SpawnWithItem" parent="YSorted/RakeGenericPickup" index="0"]
+_blueprint = ExtResource("28_6b2nr")
+
+[node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/InteractionArea2/Area2D" index="0"]
+shape = SubResource("CircleShape2D_ipqaa")
+
+[node name="ScytheGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
+position = Vector2(11890, 2060)
+
+[node name="SpawnWithItem" parent="YSorted/ScytheGenericPickup" index="0"]
+_blueprint = ExtResource("29_wtdui")
+
+[node name="CollisionShape3D" parent="YSorted/ScytheGenericPickup/InteractionArea2/Area2D" index="0"]
+shape = SubResource("CircleShape2D_ipqaa")
+
+[node name="ShovelGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
+position = Vector2(5229, 2038)
+
+[node name="SpawnWithItem" parent="YSorted/ShovelGenericPickup" index="0"]
+_blueprint = ExtResource("27_ipqaa")
+
+[node name="CollisionShape3D" parent="YSorted/ShovelGenericPickup/InteractionArea2/Area2D" index="0"]
+shape = SubResource("CircleShape2D_ipqaa")
+
 [node name="Farm visuals" type="Node2D" parent="YSorted"]
 position = Vector2(-60, 122)
 
@@ -838,10 +857,14 @@ _inventoryOpenedOffset = -600.0
 [editable path="YSorted/Brünnen/InteractionArea"]
 [editable path="YSorted/HoeGenericPickup"]
 [editable path="YSorted/HoeGenericPickup/InteractionArea2"]
-[editable path="YSorted/GenericPickupWithoutIcon"]
-[editable path="YSorted/GenericPickupWithoutIcon/InteractionArea2"]
 [editable path="YSorted/CanGenericPickup"]
 [editable path="YSorted/CanGenericPickup/InteractionArea2"]
+[editable path="YSorted/RakeGenericPickup"]
+[editable path="YSorted/RakeGenericPickup/InteractionArea2"]
+[editable path="YSorted/ScytheGenericPickup"]
+[editable path="YSorted/ScytheGenericPickup/InteractionArea2"]
+[editable path="YSorted/ShovelGenericPickup"]
+[editable path="YSorted/ShovelGenericPickup/InteractionArea2"]
 [editable path="Hoe Pickup"]
 [editable path="Watercan Pickup"]
 [editable path="Watercan Pickup/ActiveInactive"]

scenes/testing/Babushka_scene_item_pickup_testing.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farm/base_field.tscn" id="2_741gk"]
 [ext_resource type="PackedScene" uid="uid://5hltxpdxmqcq" path="res://prefabs/interactions/generic_item_on_ground.tscn" id="5_sjt6k"]
 [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="6_876p1"]
-[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/bucket.tres" id="6_nvnpb"]
+[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="6_nvnpb"]
 [ext_resource type="Script" uid="uid://c6hh7m8wikv04" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
 [ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="7_hv2km"]
 [ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="8_hv2km"]

shader/repeat_texture.gdshader

@@ -7,4 +7,3 @@ void fragment() {
     vec2 uv = vec2(UV.x * tiling_scale.x, UV.y * tiling_scale.y); // Change 10.0 to control tiling scale
     COLOR = texture(TEXTURE, fract(uv));
 }
-