Merging master into village, conflicts were solved

squirrelbattle/entities/items.py

@@ -1,10 +1,12 @@
 # Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from random import choice, randint
 from typing import Optional
 
 from .player import Player
 from ..interfaces import Entity, FightingEntity, Map
+from ..translations import gettext as _
 
 
 class Item(Entity):
@@ -20,16 +22,26 @@ class Item(Entity):
         self.held = held
         self.held_by = held_by
 
-    def drop(self, y: int, x: int) -> None:
+    def drop(self) -> None:
         """
         The item is dropped from the inventory onto the floor
         """
         if self.held:
             self.held_by.inventory.remove(self)
+            self.map.add_entity(self)
+            self.move(self.held_by.y, self.held_by.x)
             self.held = False
             self.held_by = None
-        self.map.add_entity(self)
-        self.move(y, x)
+
+    def use(self) -> None:
+        """
+        Indicates what should be done when the item is used.
+        """
+
+    def equip(self) -> None:
+        """
+        Indicates what should be done when the item is equipped.
+        """
 
     def hold(self, player: "Player") -> None:
         """
@@ -55,8 +67,8 @@ class Heart(Item):
     """
     healing: int
 
-    def __init__(self, healing: int = 5, *args, **kwargs):
-        super().__init__(name="heart", *args, **kwargs)
+    def __init__(self, name: str = "heart", healing: int = 5, *args, **kwargs):
+        super().__init__(name=name, *args, **kwargs)
         self.healing = healing
 
     def hold(self, player: "Player") -> None:
@@ -81,26 +93,47 @@ class Bomb(Item):
     """
     damage: int = 5
     exploding: bool
+    owner: Optional["Player"]
+    tick: int
 
-    def __init__(self, damage: int = 5, exploding: bool = False,
-                 *args, **kwargs):
-        super().__init__(name="bomb", *args, **kwargs)
+    def __init__(self, name: str = "bomb", damage: int = 5,
+                 exploding: bool = False, *args, **kwargs):
+        super().__init__(name=name, *args, **kwargs)
         self.damage = damage
         self.exploding = exploding
+        self.tick = 4
+        self.owner = None
 
-    def drop(self, x: int, y: int) -> None:
-        super().drop(x, y)
-        self.exploding = True
+    def use(self) -> None:
+        """
+        When the bomb is used, throw it and explodes it.
+        """
+        if self.held:
+            self.owner = self.held_by
+            super().drop()
+            self.exploding = True
 
     def act(self, m: Map) -> None:
         """
         Special exploding action of the bomb
         """
         if self.exploding:
-            for e in m.entities.copy():
-                if abs(e.x - self.x) + abs(e.y - self.y) <= 1 and \
-                        isinstance(e, FightingEntity):
-                    e.take_damage(self, self.damage)
+            if self.tick > 0:
+                # The bomb will explode in <tick> moves
+                self.tick -= 1
+            else:
+                # The bomb is exploding.
+                # Each entity that is close to the bomb takes damages.
+                # The player earn XP if the entity was killed.
+                log_message = _("Bomb is exploding.")
+                for e in m.entities.copy():
+                    if abs(e.x - self.x) + abs(e.y - self.y) <= 3 and \
+                            isinstance(e, FightingEntity):
+                        log_message += " " + e.take_damage(self, self.damage)
+                        if e.dead:
+                            self.owner.add_xp(randint(3, 7))
+                m.logs.add_message(log_message)
+                m.entities.remove(self)
 
     def save_state(self) -> dict:
         """
@@ -110,7 +143,7 @@ class Bomb(Item):
         d["exploding"] = self.exploding
         d["damage"] = self.damage
         return d
-
+    
 class Weapon(Item):
     """
     Non-throwable items that improve player damage
@@ -136,4 +169,35 @@ class Sword(Weapon) :
     def __init__(self, name: int, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.name = "sword"
-    
+        
+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 use(self) -> None:
+        """
+        Find a valid random entity, then exchange characteristics.
+        """
+        valid_entities = self.held_by.map.find_entities(FightingEntity)
+        valid_entities.remove(self.held_by)
+        entity = choice(valid_entities)
+        entity_state = entity.save_state()
+        player_state = self.held_by.save_state()
+        self.held_by.__dict__.update(entity_state)
+        entity.__dict__.update(player_state)
+        self.held_by.map.currenty, self.held_by.map.currentx = self.held_by.y,\
+            self.held_by.x
+
+        self.held_by.map.logs.add_message(
+            _("{player} exchanged its body with {entity}.").format(
+                player=self.held_by.translated_name.capitalize(),
+                entity=entity.translated_name))
+
+        self.held_by.recalculate_paths()
+
+        self.held_by.inventory.remove(self)