Merge branch 'master' into 'mouse_interaction'

# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/entities/items.py

squirrelbattle/entities/items.py

@@ -5,7 +5,7 @@ from random import choice, randint
 from typing import Optional
 
 from .player import Player
-from ..interfaces import Entity, FightingEntity, Map
+from ..interfaces import Entity, FightingEntity, Map, InventoryHolder
 from ..translations import gettext as _
 
 
@@ -14,13 +14,16 @@ class Item(Entity):
     A class for items
     """
     held: bool
-    held_by: Optional[Player]
+    held_by: Optional[InventoryHolder]
+    price: int
 
-    def __init__(self, held: bool = False, held_by: Optional[Player] = None,
-                 *args, **kwargs):
+    def __init__(self, held: bool = False,
+                 held_by: Optional[InventoryHolder] = None,
+                 price: int = 2, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.held = held
         self.held_by = held_by
+        self.price = price
 
     def drop(self) -> None:
         """
@@ -43,14 +46,14 @@ class Item(Entity):
         Indicates what should be done when the item is equipped.
         """
 
-    def hold(self, player: "Player") -> None:
+    def hold(self, player: InventoryHolder) -> None:
         """
         The item is taken from the floor and put into the inventory
         """
         self.held = True
         self.held_by = player
         self.held_by.map.remove_entity(self)
-        player.inventory.append(self)
+        player.add_to_inventory(self)
 
     def save_state(self) -> dict:
         """
@@ -60,6 +63,25 @@ class Item(Entity):
         d["held"] = self.held
         return d
 
+    @staticmethod
+    def get_all_items() -> list:
+        return [BodySnatchPotion, Bomb, Heart, Sword]
+
+    def be_sold(self, buyer: InventoryHolder, seller: InventoryHolder) -> bool:
+        """
+        Does all necessary actions when an object is to be sold.
+        Is overwritten by some classes that cannot exist in the player's
+        inventory
+        """
+        if buyer.hazel >= self.price:
+            self.hold(buyer)
+            seller.remove_from_inventory(self)
+            buyer.change_hazel_balance(-self.price)
+            seller.change_hazel_balance(self.price)
+            return True
+        else:
+            return False
+
 
 class Heart(Item):
     """
@@ -67,16 +89,17 @@ class Heart(Item):
     """
     healing: int
 
-    def __init__(self, name: str = "heart", healing: int = 5, *args, **kwargs):
-        super().__init__(name=name, *args, **kwargs)
+    def __init__(self, name: str = "heart", healing: int = 5, price: int = 3,
+                 *args, **kwargs):
+        super().__init__(name=name, price=price, *args, **kwargs)
         self.healing = healing
 
-    def hold(self, player: "Player") -> None:
+    def hold(self, entity: InventoryHolder) -> None:
         """
         When holding a heart, heal the player and don't put item in inventory.
         """
-        player.health = min(player.maxhealth, player.health + self.healing)
-        self.map.remove_entity(self)
+        entity.health = min(entity.maxhealth, entity.health + self.healing)
+        entity.map.remove_entity(self)
 
     def save_state(self) -> dict:
         """
@@ -97,8 +120,8 @@ class Bomb(Item):
     tick: int
 
     def __init__(self, name: str = "bomb", damage: int = 5,
-                 exploding: bool = False, *args, **kwargs):
-        super().__init__(name=name, *args, **kwargs)
+                 exploding: bool = False, price: int = 4, *args, **kwargs):
+        super().__init__(name=name, price=price, *args, **kwargs)
         self.damage = damage
         self.exploding = exploding
         self.tick = 4
@@ -145,14 +168,43 @@ class Bomb(Item):
         return d
 
 
+class Weapon(Item):
+    """
+    Non-throwable items that improve player damage
+    """
+    damage: int
+
+    def __init__(self, damage: int = 3, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.damage = damage
+
+    def save_state(self) -> dict:
+        """
+        Saves the state of the weapon into a dictionary
+        """
+        d = super().save_state()
+        d["damage"] = self.damage
+        return d
+
+
+class Sword(Weapon):
+    """
+    A basic weapon
+    """
+    def __init__(self, name: str = "sword", price: int = 20, *args, **kwargs):
+        super().__init__(name=name, price=price, *args, **kwargs)
+        self.name = name
+
+
 class BodySnatchPotion(Item):
     """
     The body-snatch potion allows to exchange all characteristics with a random
     other entity.
     """
 
-    def __init__(self, name: str = "body_snatch_potion", *args, **kwargs):
-        super().__init__(name=name, *args, **kwargs)
+    def __init__(self, name: str = "body_snatch_potion", price: int = 14,
+                 *args, **kwargs):
+        super().__init__(name=name, price=price, *args, **kwargs)
 
     def use(self) -> None:
         """