diff --git a/common/inventory/scripts/generic_item.gd.uid b/common/inventory/scripts/generic_item.gd.uid deleted file mode 100644 index a477ac1..0000000 --- a/common/inventory/scripts/generic_item.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://do1a37cqva05e diff --git a/common/inventory/scripts/inventory.gd b/common/inventory/scripts/inventory.gd index ebf0752..31d8185 100644 --- a/common/inventory/scripts/inventory.gd +++ b/common/inventory/scripts/inventory.gd @@ -3,10 +3,10 @@ class_name Inventory signal inventory_changed(inventory: Inventory) -@export var items: Array[GenericItem] = [] -@export var max_items: int = 10 +@export var items: Array[Item] = [] +@export var max_items: int = 1 -func add_item(item: GenericItem): +func add_item(item: Item): if items.size() < max_items: items.append(item) emit_signal("inventory_changed", self) @@ -14,7 +14,7 @@ func add_item(item: GenericItem): else: return false -func add_items(items_to_add: Array[GenericItem], fillup: bool = false): +func add_items(items_to_add: Array[Item], fillup: bool = false): if fillup: var has_changed := false for i in min(items_to_add.size(), max_items - items.size()): @@ -33,11 +33,11 @@ func get_item(ind: int = 0): return items[ind] func get_and_remove_item(ind: int = 0): - var item_removed: GenericItem = items.pop_at(ind) + var item_removed: Item = items.pop_at(ind) emit_signal("inventory_changed", self) return item_removed -func swap_items(item_to_add: GenericItem, ind_to_get: int = 0): +func swap_items(item_to_add: Item, ind_to_get: int = 0): var item_to_get := items[ind_to_get] items[ind_to_get] = item_to_add emit_signal("inventory_changed", self) diff --git a/common/inventory/scripts/generic_item.gd b/common/inventory/scripts/item.gd similarity index 75% rename from common/inventory/scripts/generic_item.gd rename to common/inventory/scripts/item.gd index 5bb6030..cb7b290 100644 --- a/common/inventory/scripts/generic_item.gd +++ b/common/inventory/scripts/item.gd @@ -1,5 +1,5 @@ extends Resource -class_name GenericItem +class_name Item @export var name: String @export var icon: Texture2D diff --git a/common/inventory/scripts/item.gd.uid b/common/inventory/scripts/item.gd.uid new file mode 100644 index 0000000..0ab93d5 --- /dev/null +++ b/common/inventory/scripts/item.gd.uid @@ -0,0 +1 @@ +uid://bq7admu4ahs5r diff --git a/common/inventory/scripts/items/seed_item.gd b/common/inventory/scripts/items/seed_item.gd index f8f28e4..9e059c4 100644 --- a/common/inventory/scripts/items/seed_item.gd +++ b/common/inventory/scripts/items/seed_item.gd @@ -1,4 +1,4 @@ -extends GenericItem +extends Item class_name SeedItem @export var plant_type: String