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

Doors #156

Merged
ynerant merged 9 commits from doors into map_generation 2021-01-10 22:54:14 +00:00
Conversation 5 Commits 9 Files Changed 9 +22 -6
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 60675d7859 - Show all commits

6
squirrelbattle/assets/example_map.txt
View File

@ -2,17 +2,17 @@
####### ############# ####### #############
#.H...# #...........# #.H...# #...........#
#.....# #####...........# #.....# #####...........#
#.....# #............H..# #.....# #...&........H..#
#.##### #.###...........# #.##### #.###...........#
#.# #.# #...........# #.# #.# #...........#
#.# #.# ############# #.# #.# #############
#.# #.# #.# #.#
#.#### #.# #.#### #.#
#....# #.# #....# #.#
####.###################.# ####&###################&#
#.....................# ################# #.....................# #################
#.....................# #...............# #.....................# #...............#
#.....................#######...............# #.....................#######...............#
#...........................................# #.....................&.....&...............#
#.....................#######...............# #.....................#######...............#
####################### ################# ####################### #################

6
squirrelbattle/tests/entities_test.py
View File

@ -134,13 +134,13 @@ class TestEntities(unittest.TestCase):
self.map.remove_entity(entity2) self.map.remove_entity(entity2)
# Test following the player and finding the player as target # Test following the player and finding the player as target
self.player.move(5, 5) self.player.move(6, 5)
fam.move(4, 5) fam.move(5, 5)
fam.target = None fam.target = None
self.player.move_down() self.player.move_down()
self.map.tick(self.player) self.map.tick(self.player)
self.assertTrue(fam.target == self.player) self.assertTrue(fam.target == self.player)
self.assertEqual(fam.y, 5) self.assertEqual(fam.y, 6)
self.assertEqual(fam.x, 5) self.assertEqual(fam.x, 5)
# Test random move # Test random move

16
squirrelbattle/tests/game_test.py
View File

@ -728,6 +728,7 @@ class TestGame(unittest.TestCase):
self.game.player.inventory.clear() self.game.player.inventory.clear()
ring = RingCritical() ring = RingCritical()
ring.hold(self.game.player) ring.hold(self.game.player)
self.game.display_actions(DisplayActions.REFRESH)
old_critical = self.game.player.critical old_critical = self.game.player.critical
self.game.handle_key_pressed(KeyValues.EQUIP) self.game.handle_key_pressed(KeyValues.EQUIP)
self.assertEqual(self.game.player.critical, self.assertEqual(self.game.player.critical,
@ -951,3 +952,18 @@ class TestGame(unittest.TestCase):
# Exit the menu # Exit the menu
self.game.handle_key_pressed(KeyValues.SPACE) self.game.handle_key_pressed(KeyValues.SPACE)
self.assertEqual(self.game.state, GameMode.PLAY) self.assertEqual(self.game.state, GameMode.PLAY)
def test_doors(self) -> None:
"""
Check that the user can open doors.
"""
self.game.state = GameMode.PLAY
self.game.player.move(9, 8)
self.assertEqual(self.game.map.tiles[10][8], Tile.DOOR)
# Open door
self.game.handle_key_pressed(KeyValues.DOWN)
self.assertEqual(self.game.map.tiles[10][8], Tile.FLOOR)
self.assertEqual(self.game.player.y, 10)
self.assertEqual(self.game.player.x, 8)
self.game.display_actions(DisplayActions.REFRESH)