Refactor conversation stuff

item/Inventory.gd

@@ -9,12 +9,12 @@ enum InventorySortType {
   ITEM_KEY
 }
 
-signal itemAdded(item:Item)
-signal itemRemoved(item:Item)
-signal itemQuantityChanged(item:Item, quantity:int)
+signal itemAdded(item:Item.ItemId)
+signal itemRemoved(item:Item.ItemId)
+signal itemQuantityChanged(item:Item.ItemId, quantity:int)
 signal inventorySorted(sortBy:InventorySortType, reverse:bool)
 
-func setItem(item:Item, quantity:int) -> void:
+func setItem(item:Item.ItemId, quantity:int) -> void:
   if quantity < 0:
     push_error("Cannot set item quantity to negative value, using 0")
     quantity = 0
@@ -42,20 +42,23 @@ func setItem(item:Item, quantity:int) -> void:
   itemAdded.emit(item)
   itemQuantityChanged.emit(item, quantity)
 
-func getItemQuantity(item:Item) -> int:
+func getItemQuantity(item:Item.ItemId) -> int:
   for itemStack in items:
     if itemStack.item == item:
       return itemStack.quantity
   return 0
 
-func addItem(item:Item, quantity:int = 1) -> void:
+func addItem(item:Item.ItemId, quantity:int = 1) -> void:
   # Add can only take positive quantities, otherwise use set or remove
   if quantity <= 0:
     push_error("Cannot add non-positive item quantity")
     return
   self.setItem(item, self.getItemQuantity(item) + quantity)
 
-func removeItem(item:Item) -> void:
+func addStack(stack:ItemStack) -> void:
+  self.addItem(stack.item, stack.quantity)
+
+func removeItem(item:Item.ItemId) -> void:
   self.setItem(item, 0)
 
 func sort(sortBy:InventorySortType, reverse:bool = false) -> void:
@@ -72,7 +75,7 @@ func sort(sortBy:InventorySortType, reverse:bool = false) -> void:
 
 # Sorters
 func _sortByItemType(a:ItemStack, b:ItemStack) -> int:
-  return int(a.item.itemType) - int(b.item.itemType)
+  return int(Item.getItemById(a.item).itemType) - int(Item.getItemById(b.item).itemType)
 
 func _sortByItemKey(a:ItemStack, b:ItemStack) -> int:
-  return a.item.key.casecmp_to(b.item.key)
+  return Item.getItemById(a.item).key.casecmp_to(Item.getItemById(b.item).key)

item/Item.gd

@@ -8,6 +8,11 @@ enum ItemType {
   KEY_ITEM,
 }
 
+enum ItemId {
+  NULL,
+  POTION,
+}
+
 # Properties
 var itemType:ItemType
 var key:String
@@ -22,5 +27,11 @@ func getName() -> String:
   return self.key
 
 # Item Table
-static var NULL:Item = Item.new("NULL", ItemType.NULL)
-static var POTION:Item = Item.new("POTION", ItemType.MEDICINE)
+static var ITEM_DEFINITIONS = {
+  [ItemId.NULL]: Item.new("NULL", ItemType.NULL),
+  [ItemId.POTION]: Item.new("POTION", ItemType.MEDICINE),
+}
+
+static func getItemById(itemId:ItemId) -> Item:
+  assert(ITEM_DEFINITIONS.has(itemId))
+  return ITEM_DEFINITIONS[itemId]

item/ItemResource.gd

@@ -0,0 +1,13 @@
+extends Resource
+class_name ItemResource
+const Item = preload("res://item/Item.gd")
+const ItemStack = preload("res://item/ItemStack.gd")
+
+@export var item:Item.ItemId = Item.ItemId.NULL
+@export var quantity:int = 0
+
+func toItemStack() -> ItemStack:
+  var stack = ItemStack.new()
+  stack.item = item
+  stack.quantity = quantity
+  return stack

item/ItemResource.gd.uid

@@ -0,0 +1 @@
+uid://38ya6vphm5bu

item/ItemStack.gd

@@ -1,6 +1,5 @@
 class_name ItemStack
-
 const Item = preload("res://item/Item.gd")
 
-var item:Item = Item.NULL
+var item:Item.ItemId = Item.ItemId.NULL
 var quantity:int = 0