Merge branch 'master' into 'lighting'

# Conflicts:
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/interfaces.py

squirrelbattle/tests/entities_test.py

@@ -6,6 +6,7 @@ import unittest
 from squirrelbattle.entities.items import BodySnatchPotion, Bomb, Heart, Item, \
     Explosion
 from squirrelbattle.entities.monsters import Tiger, Hedgehog, Rabbit, TeddyBear
+from squirrelbattle.entities.friendly import Trumpet
 from squirrelbattle.entities.player import Player
 from squirrelbattle.interfaces import Entity, Map
 from squirrelbattle.resources import ResourceManager
@@ -14,7 +15,7 @@ from squirrelbattle.resources import ResourceManager
 class TestEntities(unittest.TestCase):
     def setUp(self) -> None:
         """
-        Load example map that can be used in tests.
+        Loads example map that can be used in tests.
         """
         self.map = Map.load(ResourceManager.get_asset_path("example_map.txt"))
         self.player = Player()
@@ -23,7 +24,7 @@ class TestEntities(unittest.TestCase):
 
     def test_basic_entities(self) -> None:
         """
-        Test some random stuff with basic entities.
+        Tests some random stuff with basic entities.
         """
         entity = Entity()
         entity.move(42, 64)
@@ -38,7 +39,7 @@ class TestEntities(unittest.TestCase):
 
     def test_fighting_entities(self) -> None:
         """
-        Test some random stuff with fighting entities.
+        Tests some random stuff with fighting entities.
         """
         entity = Tiger()
         self.map.add_entity(entity)
@@ -57,17 +58,17 @@ class TestEntities(unittest.TestCase):
         self.map.add_entity(entity)
         entity.move(15, 44)
         # Move randomly
-        self.map.tick()
+        self.map.tick(self.player)
         self.assertFalse(entity.y == 15 and entity.x == 44)
 
         # Move to the player
         entity.move(3, 6)
-        self.map.tick()
+        self.map.tick(self.player)
         self.assertTrue(entity.y == 2 and entity.x == 6)
 
         # Rabbit should fight
         old_health = self.player.health
-        self.map.tick()
+        self.map.tick(self.player)
         self.assertTrue(entity.y == 2 and entity.x == 6)
         self.assertEqual(old_health - entity.strength, self.player.health)
         self.assertEqual(self.map.logs.messages[-1],
@@ -89,9 +90,50 @@ class TestEntities(unittest.TestCase):
         self.assertTrue(entity.dead)
         self.assertGreaterEqual(self.player.current_xp, 3)
 
+        # Test the familiars
+        fam = Trumpet()
+        entity = Rabbit()
+        self.map.add_entity(entity)
+        self.map.add_entity(fam)
+        self.player.move(1, 6)
+        entity.move(2, 6)
+        fam.move(2, 7)
+
+        # Test fighting
+        entity.health = 2
+        entity.paths = []
+        entity.recalculate_paths()
+        fam.target = entity
+        self.map.tick(self.player)
+        self.assertTrue(entity.dead)
+
+        # Test finding a new target
+        entity2 = Rabbit()
+        self.map.add_entity(entity2)
+        entity2.move(2, 6)
+        self.map.tick(self.player)
+        self.assertTrue(fam.target == entity2)
+        self.map.remove_entity(entity2)
+
+        # Test following the player and finding the player as target
+        self.player.move(5, 5)
+        fam.move(4, 5)
+        fam.target = None
+        self.player.move_down()
+        self.map.tick(self.player)
+        self.assertTrue(fam.target == self.player)
+        self.assertEqual(fam.y, 5)
+        self.assertEqual(fam.x, 5)
+
+        # Test random move
+        fam.move(13, 20)
+        fam.target = self.player
+        self.map.tick(self.player)
+        self.assertTrue(fam.x != 20 or fam.y != 13)
+
     def test_items(self) -> None:
         """
-        Test some random stuff with items.
+        Tests some random stuff with items.
         """
         item = Item()
         self.map.add_entity(item)
@@ -112,7 +154,7 @@ class TestEntities(unittest.TestCase):
 
     def test_bombs(self) -> None:
         """
-        Test some random stuff with bombs.
+        Tests some random stuff with bombs.
         """
         item = Bomb()
         hedgehog = Hedgehog()
@@ -156,7 +198,7 @@ class TestEntities(unittest.TestCase):
 
     def test_hearts(self) -> None:
         """
-        Test some random stuff with hearts.
+        Tests some random stuff with hearts.
         """
         item = Heart()
         self.map.add_entity(item)
@@ -171,7 +213,7 @@ class TestEntities(unittest.TestCase):
 
     def test_body_snatch_potion(self) -> None:
         """
-        Test some random stuff with body snatch potions.
+        Tests some random stuff with body snatch potions.
         """
         item = BodySnatchPotion()
         self.map.add_entity(item)
@@ -189,7 +231,7 @@ class TestEntities(unittest.TestCase):
 
     def test_players(self) -> None:
         """
-        Test some random stuff with players.
+        Tests some random stuff with players.
         """
         player = Player()
         self.map.add_entity(player)