Merchant inventory is working!

squirrelbattle/entities/friendly.py

@@ -18,12 +18,12 @@ class Merchant(FriendlyEntity) :
         """
         return ["maxhealth", "health", "inventory", "hazel"]
 
-    def __init__(self, name : str = "merchant", hazel : int = 75):
-        super().__init__(name = name)
+    def __init__(self, name: str = "merchant", inventory: list = None,
+                 hazel: int = 75, *args, **kwargs):
+        super().__init__(name=name, *args, **kwargs)
+        self.inventory = inventory or []
         self.hazel = hazel
-        self.name = name
-        self.inventory = []
-        for i in range(5) :
+        for i in range(5):
             self.inventory.append(choice(Item.get_all_items())())
 
     def talk_to(self, player : Player) -> str:
@@ -32,6 +32,7 @@ class Merchant(FriendlyEntity) :
         and allow the player to buy/sell objects
         """
         # TODO
+        return _("I don't sell any squirrel")
         
 class Sunflower(FriendlyEntity) :
     """

squirrelbattle/entities/items.py

@@ -59,9 +59,10 @@ class Item(Entity):
         d = super().save_state()
         d["held"] = self.held
         return d
-    
+
+    @staticmethod
     def get_all_items() -> list:
-        return [BodySnatchPotion, Bomb, Heart, Weapon, Sword]
+        return [BodySnatchPotion, Bomb, Heart, Sword]
 
 
 class Heart(Item):