Test merchants

squirrelbattle/entities/friendly.py

@@ -16,7 +16,7 @@ class Merchant(FriendlyEntity):
         """
         Returns a friendly entitie's specific attributes
         """
-        return ["maxhealth", "health", "inventory", "hazel"]
+        return super().keys() + ["inventory", "hazel"]
 
     def __init__(self, name: str = "merchant", inventory: list = None,
                  hazel: int = 75, *args, **kwargs):

squirrelbattle/entities/items.py

@@ -50,7 +50,7 @@ class Item(Entity):
         self.held = True
         self.held_by = player
         self.map.remove_entity(self)
-        player.inventory.append(self)
+        player.add_to_inventory(self)
 
     def save_state(self) -> dict:
         """