ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Collisions are working

This commit is contained in:
Yohann D'ANELLO 2020-11-06 18:03:30 +01:00
parent 54bb2d1416
commit d06a42469a
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dungeonbattle/entities/player.py
View File

@ -5,14 +5,14 @@ class Player(FightingEntity):
maxhealth = 20
strength = 5
def move_up(self) -> None:
self.check_move(self.y - 1, self.x, True)
def move_up(self) -> bool:
return self.check_move(self.y - 1, self.x, True)
def move_down(self) -> None:
self.check_move(self.y + 1, self.x, True)
def move_down(self) -> bool:
return self.check_move(self.y + 1, self.x, True)
def move_left(self) -> None:
self.check_move(self.y, self.x - 1, True)
def move_left(self) -> bool:
return self.check_move(self.y, self.x - 1, True)
def move_right(self) -> None:
self.check_move(self.y, self.x + 1, True)
def move_right(self) -> bool:
return self.check_move(self.y, self.x + 1, True)

16
dungeonbattle/tests/entities_test.py
View File

@ -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())