Merging master into village, conflicts were solved

squirrelbattle/tests/entities_test.py

@@ -3,7 +3,7 @@
 
 import unittest
 
-from squirrelbattle.entities.items import Bomb, Heart, Item
+from squirrelbattle.entities.items import BodySnatchPotion, Bomb, Heart, Item
 from squirrelbattle.entities.monsters import Tiger, Hedgehog, Rabbit, TeddyBear
 from squirrelbattle.entities.player import Player
 from squirrelbattle.interfaces import Entity, Map
@@ -97,12 +97,13 @@ class TestEntities(unittest.TestCase):
         self.assertFalse(item.held)
         item.hold(self.player)
         self.assertTrue(item.held)
-        item.drop(2, 6)
-        self.assertEqual(item.y, 2)
+        item.drop()
+        self.assertEqual(item.y, 1)
         self.assertEqual(item.x, 6)
 
         # Pick up item
-        self.player.move_down()
+        self.player.move_left()
+        self.player.move_right()
         self.assertTrue(item.held)
         self.assertEqual(item.held_by, self.player)
         self.assertIn(item, self.player.inventory)
@@ -125,10 +126,14 @@ class TestEntities(unittest.TestCase):
         item.act(self.map)
         self.assertFalse(hedgehog.dead)
         self.assertFalse(teddy_bear.dead)
-        item.drop(42, 42)
+        self.player.move(42, 42)
+        item.hold(self.player)
+        item.use()
         self.assertEqual(item.y, 42)
         self.assertEqual(item.x, 42)
-        item.act(self.map)
+        # Wait for the explosion
+        for ignored in range(5):
+            item.act(self.map)
         self.assertTrue(hedgehog.dead)
         self.assertTrue(teddy_bear.dead)
         bomb_state = item.save_state()
@@ -149,6 +154,24 @@ class TestEntities(unittest.TestCase):
         heart_state = item.save_state()
         self.assertEqual(heart_state["healing"], item.healing)
 
+    def test_body_snatch_potion(self) -> None:
+        """
+        Test some random stuff with body snatch potions.
+        """
+        item = BodySnatchPotion()
+        self.map.add_entity(item)
+        item.hold(self.player)
+
+        tiger = Tiger(y=42, x=42)
+        self.map.add_entity(tiger)
+
+        # The player becomes a tiger, and the tiger becomes a squirrel
+        item.use()
+        self.assertEqual(self.player.name, "tiger")
+        self.assertEqual(tiger.name, "player")
+        self.assertEqual(self.player.y, 42)
+        self.assertEqual(self.player.x, 42)
+
     def test_players(self) -> None:
         """
         Test some random stuff with players.