Merging master into village, conflicts were solved

squirrelbattle/entities/monsters.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from random import choice
+from random import shuffle
 
 from .player import Player
 from ..interfaces import FightingEntity, Map
@@ -49,9 +49,13 @@ class Monster(FightingEntity):
             if not moved and self.distance_squared(target) <= 1:
                 self.map.logs.add_message(self.hit(target))
         else:
-            for _ in range(100):
-                if choice([self.move_up, self.move_down,
-                          self.move_left, self.move_right])():
+            # Move in a random direction
+            # If the direction is not available, try another one
+            moves = [self.move_up, self.move_down,
+                     self.move_left, self.move_right]
+            shuffle(moves)
+            for move in moves:
+                if move():
                     break
 
 
@@ -59,9 +63,9 @@ class Tiger(Monster):
     """
     A tiger monster
     """
-    def __init__(self, strength: int = 2, maxhealth: int = 20,
-                 *args, **kwargs) -> None:
-        super().__init__(name="tiger", strength=strength,
+    def __init__(self, name: str = "tiger", strength: int = 2,
+                 maxhealth: int = 20, *args, **kwargs) -> None:
+        super().__init__(name=name, strength=strength,
                          maxhealth=maxhealth, *args, **kwargs)
 
 
@@ -69,9 +73,9 @@ class Hedgehog(Monster):
     """
     A really mean hedgehog monster
     """
-    def __init__(self, strength: int = 3, maxhealth: int = 10,
-                 *args, **kwargs) -> None:
-        super().__init__(name="hedgehog", strength=strength,
+    def __init__(self, name: str = "hedgehog", strength: int = 3,
+                 maxhealth: int = 10, *args, **kwargs) -> None:
+        super().__init__(name=name, strength=strength,
                          maxhealth=maxhealth, *args, **kwargs)
 
 
@@ -79,9 +83,9 @@ class Rabbit(Monster):
     """
     A rabbit monster
     """
-    def __init__(self, strength: int = 1, maxhealth: int = 15,
-                 *args, **kwargs) -> None:
-        super().__init__(name="rabbit", strength=strength,
+    def __init__(self, name: str = "rabbit", strength: int = 1,
+                 maxhealth: int = 15, *args, **kwargs) -> None:
+        super().__init__(name=name, strength=strength,
                          maxhealth=maxhealth, *args, **kwargs)
 
 
@@ -89,7 +93,7 @@ class TeddyBear(Monster):
     """
     A cute teddybear monster
     """
-    def __init__(self, strength: int = 0, maxhealth: int = 50,
-                 *args, **kwargs) -> None:
-        super().__init__(name="teddy_bear", strength=strength,
+    def __init__(self, name: str = "teddy_bear", strength: int = 0,
+                 maxhealth: int = 50, *args, **kwargs) -> None:
+        super().__init__(name=name, strength=strength,
                          maxhealth=maxhealth, *args, **kwargs)