Merge branch 'master' into 'game'

# Conflicts:
#   dungeonbattle/game.py
#   dungeonbattle/mapdisplay.py
This commit is contained in:
ynerant
2020-11-06 18:36:59 +01:00
5 changed files with 55 additions and 31 deletions

View File

@ -59,8 +59,8 @@ class TestEntities(unittest.TestCase):
"""
item = Bomb()
squirrel = Squirrel()
self.map.entities.append(item)
self.map.entities.append(squirrel)
self.map.add_entity(item)
self.map.add_entity(squirrel)
squirrel.health = 2
squirrel.move(41, 42)
item.act(self.map)
@ -76,6 +76,22 @@ class TestEntities(unittest.TestCase):
Test some random stuff with players.
"""
player = Player()
self.map.add_entity(player)
player.move(1, 6)
self.assertEqual(player.strength, 5)
self.assertEqual(player.health, player.maxhealth)
self.assertEqual(player.maxhealth, 20)
# Test movements and ensure that collisions are working
self.assertFalse(player.move_up())
self.assertTrue(player.move_left())
self.assertFalse(player.move_left())
for i in range(8):
self.assertTrue(player.move_down())
self.assertFalse(player.move_down())
self.assertTrue(player.move_right())
self.assertTrue(player.move_right())
self.assertTrue(player.move_right())
self.assertFalse(player.move_right())
self.assertTrue(player.move_down())
self.assertTrue(player.move_down())