From fb362e10adecf6664937744b2302d85b64a6edaa Mon Sep 17 00:00:00 2001 From: cblech Date: Thu, 17 Apr 2025 03:24:31 +0200 Subject: [PATCH] item count WIP --- resources/items/axe.tres | 1 + resources/items/bucket.tres | 1 + resources/items/hoe.tres | 1 + resources/items/pickaxe.tres | 1 + resources/items/tomato_seed.tres | 10 ++++++++++ scenes/testing/Babushka_scene_item_pickup_testing.tscn | 6 +++--- scripts/CSharp/Common/Inventory/ItemInstance.cs | 1 + scripts/CSharp/Common/Inventory/ItemResource.cs | 8 ++++++-- 8 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 resources/items/tomato_seed.tres diff --git a/resources/items/axe.tres b/resources/items/axe.tres index 0770130..cbac4ae 100644 --- a/resources/items/axe.tres +++ b/resources/items/axe.tres @@ -6,4 +6,5 @@ script = ExtResource("1_t485b") name = "Axe Deo" color = Color(0.643898, 0.4587, 0.294335, 1) +maxStack = 1 metadata/_custom_type_script = "uid://cbskymrxs6ksu" diff --git a/resources/items/bucket.tres b/resources/items/bucket.tres index b323f49..2005ad5 100644 --- a/resources/items/bucket.tres +++ b/resources/items/bucket.tres @@ -6,4 +6,5 @@ script = ExtResource("1_8k5aa") name = "Buck the Bucket" color = Color(0.336269, 0.489145, 0.825324, 1) +maxStack = 1 metadata/_custom_type_script = "uid://cbskymrxs6ksu" diff --git a/resources/items/hoe.tres b/resources/items/hoe.tres index e7c0e27..a7960d7 100644 --- a/resources/items/hoe.tres +++ b/resources/items/hoe.tres @@ -6,4 +6,5 @@ script = ExtResource("1_06nef") name = "Your Mom" color = Color(0.751421, 0.329615, 0.570911, 1) +maxStack = 1 metadata/_custom_type_script = "uid://cbskymrxs6ksu" diff --git a/resources/items/pickaxe.tres b/resources/items/pickaxe.tres index afc788d..31870c8 100644 --- a/resources/items/pickaxe.tres +++ b/resources/items/pickaxe.tres @@ -6,4 +6,5 @@ script = ExtResource("1_07aya") name = "Pick Axe" color = Color(0.589014, 0.823353, 0.998475, 1) +maxStack = 1 metadata/_custom_type_script = "uid://cbskymrxs6ksu" diff --git a/resources/items/tomato_seed.tres b/resources/items/tomato_seed.tres new file mode 100644 index 0000000..79abe3e --- /dev/null +++ b/resources/items/tomato_seed.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="ItemResource" load_steps=2 format=3 uid="uid://d1uuxp1lp4aro"] + +[ext_resource type="Script" uid="uid://cbskymrxs6ksu" path="res://scripts/CSharp/Common/Inventory/ItemResource.cs" id="1_dustj"] + +[resource] +script = ExtResource("1_dustj") +name = "Tomato Seed" +color = Color(0.135039, 0.307214, 0.333128, 1) +maxStack = 20 +metadata/_custom_type_script = "uid://cbskymrxs6ksu" diff --git a/scenes/testing/Babushka_scene_item_pickup_testing.tscn b/scenes/testing/Babushka_scene_item_pickup_testing.tscn index 7b0fa00..f3efd13 100644 --- a/scenes/testing/Babushka_scene_item_pickup_testing.tscn +++ b/scenes/testing/Babushka_scene_item_pickup_testing.tscn @@ -5,9 +5,9 @@ [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="Script" uid="uid://cywyym5l7ymhr" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"] +[ext_resource type="Script" uid="uid://dbkkeo3gw2xgy" 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://datee0flk1e84" path="res://resources/items/pickaxe.tres" id="8_hae25"] +[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="8_hv2km"] [sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"] @@ -67,7 +67,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.1678, -4.76837e-07, -3.9497 _infiniteSupply = true [node name="SpawnWithItem" parent="GenericItemOnGround4" index="1"] -_blueprint = ExtResource("8_hae25") +_blueprint = ExtResource("8_hv2km") [editable path="GenericItemOnGround"] [editable path="GenericItemOnGround2"] diff --git a/scripts/CSharp/Common/Inventory/ItemInstance.cs b/scripts/CSharp/Common/Inventory/ItemInstance.cs index 83eed75..abf6e4f 100644 --- a/scripts/CSharp/Common/Inventory/ItemInstance.cs +++ b/scripts/CSharp/Common/Inventory/ItemInstance.cs @@ -3,4 +3,5 @@ public class ItemInstance { public ItemResource blueprint; + public int amount = 1; } diff --git a/scripts/CSharp/Common/Inventory/ItemResource.cs b/scripts/CSharp/Common/Inventory/ItemResource.cs index f696046..c6c8b88 100644 --- a/scripts/CSharp/Common/Inventory/ItemResource.cs +++ b/scripts/CSharp/Common/Inventory/ItemResource.cs @@ -2,17 +2,21 @@ namespace Babushka.scripts.CSharp.Common.Inventory; [GlobalClass] -public partial class ItemResource: Resource +public partial class ItemResource : Resource { [Export] public string name; [Export] public Color color; - + + [Export] + public int maxStack; + public ItemResource() { name = ""; color = Colors.Red; + maxStack = 1; } }