Merge pull request #14 from nuzcraft/part_11

Part 11

Author: nuzcraft

README.md

@@ -12,6 +12,20 @@ I want to use this as an opportunity to:
 4. make a roguelike
 5. practice with git
 
+## Part 11 Dev Notes
+
+### Delving into the Dungeon
+
+https://rogueliketutorials.com/tutorials/tcod/v2/part-11/
+
+This part looks like a part where we start putting in some bells and whistles to really flush out what the game can be. We'll add additional floors as well as exp and a level up system.
+
+Adding additional floors was a bit of a treat! It allows us to play for a pseudo-goal (get as low in the dungeon as possible) and adds an 'infinite quality' aka we can play forever and keep winning if we wish. This is better (maybe?) than the previous version where we had one easy level to clear and be forced to quit the game with nothing new to do. I'm not really sure how much I like the GameWorld system whereby define the current_level then generate a new game_map when we need one. In a future version of my own game (based on this framework), I will likely add some options for keeping track of previous floors and such. I think it's interesting that this tutorial uses a new tile for the stairs as opposed to using an entity.
+
+Adding the level up system was a significant amount of event handler work. We needed to add a new component to keep track of xp and the level as well as a new screen to level up certain attributes and a character screen. Implementing the screens and the inputs used in them is always interesting and the unit tests behind them are critical to making sure the screens act as expected.
+
+Overall, I enjoyed working this part. It really feels like the game is coming together and I'm looking forward to the last (final?) part, which I would guess is level progression to make the lower levels of the game harder.
+
 ## Part 10 Dev Notes
 
 ### Saving and Loading

Tests/test_actions.py

@@ -2,6 +2,8 @@
 import unittest
 from unittest.mock import patch
 
+from numpy import power
+
 from actions import (
     Action, ActionWithDirection,
     MovementAction,
@@ -10,14 +12,16 @@
     PickupAction,
     ItemAction,
     DropItem,
+    TakeStairAction,
 )
 from entity import Entity, Actor, Item
-from game_map import GameMap
+from game_map import GameMap, GameWorld
 from engine import Engine
 from components.ai import BaseAI, HostileEnemy
 from components.fighter import Fighter
 from components.consumable import Consumable
 from components.inventory import Inventory
+from components.level import Level
 import tile_types
 import color
 from exceptions import Impossible
@@ -62,6 +66,61 @@ def test_perform(self):
         '''
 
 
+class Test_Actions_TakeStairsAction(unittest.TestCase):
+    def test_perform_with_stairs(self):
+        actor = Actor(
+            ai_cls=BaseAI,
+            fighter=Fighter(hp=10, defense=10, power=10),
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )
+        eng = Engine(player=actor)
+        eng.game_world = GameWorld(
+            engine=eng,
+            map_width=10,
+            map_height=10,
+            max_rooms=5,
+            room_min_size=3,
+            room_max_size=4,
+            max_monsters_per_room=2,
+            max_items_per_room=1,
+        )
+        eng.game_world.generate_floor()
+        actor.x, actor.y = eng.game_map.downstairs_location
+        action = TakeStairAction(entity=actor)
+
+        with patch('message_log.MessageLog.add_message') as patch_add_message:
+            action.perform()
+
+        self.assertEqual(action.engine.game_world.current_floor, 2)
+        patch_add_message.assert_called_once()
+
+    def test_perform_no_stairs(self):
+        actor = Actor(
+            ai_cls=BaseAI,
+            fighter=Fighter(hp=10, defense=10, power=10),
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )
+        eng = Engine(player=actor)
+        eng.game_world = GameWorld(
+            engine=eng,
+            map_width=10,
+            map_height=10,
+            max_rooms=5,
+            room_min_size=3,
+            room_max_size=4,
+            max_monsters_per_room=2,
+            max_items_per_room=1,
+        )
+        eng.game_world.generate_floor()
+        # actor.x, actor.y = eng.game_map.downstairs_location
+        action = TakeStairAction(entity=actor)
+
+        with self.assertRaises(Impossible):
+            action.perform()
+
+
 class Test_Actions_ActionWithDirection(unittest.TestCase):
     def test_init(self):
         '''
@@ -125,10 +184,20 @@ def test_target_actor_with_actor(self):
         test that target_actor returns and actor if one exists at the location 
         of the action
         '''
-        pl = Actor(ai_cls=BaseAI, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))  # player at 0, 0
-        ent = Actor(x=1, y=1, ai_cls=BaseAI, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))  # entity at 1, 1
+        pl = Actor(
+            ai_cls=BaseAI,
+            fighter=Fighter(hp=10, defense=10, power=10),
+            inventory=Inventory(capacity=5),
+            level=Level(),
+        )  # player at 0, 0
+        ent = Actor(
+            x=1,
+            y=1,
+            ai_cls=BaseAI,
+            fighter=Fighter(hp=10, defense=10, power=10),
+            inventory=Inventory(capacity=5),
+            level=Level(),
+        )  # entity at 1, 1
         eng = Engine(player=pl)
         gm = GameMap(engine=eng, width=10, height=10)
         gm.entities = {pl, ent}
@@ -143,8 +212,12 @@ def test_target_actor_noner(self):
         test that target_actor returns nothing when none exists at the location 
         of the action
         '''
-        pl = Actor(ai_cls=BaseAI, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))  # player at 0, 0
+        pl = Actor(
+            ai_cls=BaseAI,
+            fighter=Fighter(hp=10, defense=10, power=10),
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )  # player at 0, 0
         eng = Engine(player=pl)
         gm = GameMap(engine=eng, width=10, height=10)
         gm.entities = {pl, }
@@ -184,9 +257,11 @@ def test_perform_player_with_target_and_damage(self, mock_add_message):
         put out a message with the correct color
         '''
         pl = Actor(x=0, y=0, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # player at 0,0
+            hp=10, defense=0, power=5), inventory=Inventory(capacity=5),
+            level=Level())  # player at 0,0
         ent = Actor(x=1, y=1, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # blocking entity at 1,1
+            hp=10, defense=0, power=5), inventory=Inventory(capacity=5),
+            level=Level())  # blocking entity at 1,1
         eng = Engine(player=pl)
         gm = GameMap(engine=eng, width=10, height=10)
         # add blocking entity to the game map, add game map to engine and player
@@ -213,11 +288,14 @@ def test_perform_enemy_with_target_and_damage(self, mock_add_message):
         put out a message with the correct color
         '''
         pl = Actor(x=0, y=0, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # player at 0,0
+            hp=10, defense=0, power=5), inventory=Inventory(capacity=5),
+            level=Level())  # player at 0,0
         ent = Actor(x=1, y=1, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # blocking entity at 1,1
+            hp=10, defense=0, power=5), inventory=Inventory(capacity=5),
+            level=Level())  # blocking entity at 1,1
         ent2 = Actor(x=2, y=2, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # blocking entity at 1,1
+            hp=10, defense=0, power=5), inventory=Inventory(capacity=5),
+            level=Level())  # blocking entity at 1,1
         eng = Engine(player=pl)
         gm = GameMap(engine=eng, width=10, height=10)
         # add blocking entity to the game map, add game map to engine and player
@@ -244,9 +322,11 @@ def test_perform_with_target_and_no_damage(self, mock_add_message):
         test that a Melee Action with a target will print when no damage is done
         '''
         pl = Actor(x=0, y=0, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # player at 0,0
+            hp=10, defense=0, power=5), inventory=Inventory(capacity=5),
+            level=Level())  # player at 0,0
         ent = Actor(x=1, y=1, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=5, power=5), inventory=Inventory(capacity=5))  # blocking entity at 1,1
+            hp=10, defense=5, power=5), inventory=Inventory(capacity=5),
+            level=Level())  # blocking entity at 1,1
         eng = Engine(player=pl)
         gm = GameMap(engine=eng, width=10, height=10)
         # add blocking entity to the game map, add game map to engine and player
@@ -350,10 +430,22 @@ def test_perform_melee(self, mock_add_message):
         verify that a BumpAction performs the same as a MeleeAction
         basically a copy of Test_Actions_MeleeAction.test_perform_with_target
         '''
-        pl = Actor(x=0, y=0, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # player at 0,0
-        ent = Actor(x=1, y=1, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=0, power=5), inventory=Inventory(capacity=5))  # blocking entity at 1,1
+        pl = Actor(
+            x=0,
+            y=0,
+            ai_cls=HostileEnemy,
+            fighter=Fighter(hp=10, defense=0, power=5),
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )  # player at 0,0
+        ent = Actor(
+            x=1,
+            y=1,
+            ai_cls=HostileEnemy,
+            fighter=Fighter(hp=10, defense=0, power=5),
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )  # blocking entity at 1,1
         eng = Engine(player=pl)
         gm = GameMap(engine=eng, width=10, height=10)
         # add blocking entity to the game map, add game map to engine and player
@@ -398,7 +490,8 @@ def test_init(self):
         test that a pickup action can be initialized okay
         '''
         actor = Actor(ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))
+            hp=10, defense=10, power=10), inventory=Inventory(capacity=5),
+            level=Level())
         action = PickupAction(entity=actor)
         self.assertIsInstance(action, PickupAction)
 
@@ -412,7 +505,9 @@ def test_perform_with_item_and_capacity(self):
             x=5, y=6,
             ai_cls=HostileEnemy,
             fighter=Fighter(hp=10, defense=10, power=10),
-            inventory=Inventory(capacity=5))
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )
         eng = Engine(player=actor)
         gm = GameMap(engine=eng, width=10, height=10)
         item = Item(
@@ -445,7 +540,9 @@ def test_perform_with_no_item_on_map(self):
             x=5, y=6,
             ai_cls=HostileEnemy,
             fighter=Fighter(hp=10, defense=10, power=10),
-            inventory=Inventory(capacity=5))
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )
         eng = Engine(player=actor)
         gm = GameMap(engine=eng, width=10, height=10)
         # item = Item(
@@ -471,7 +568,9 @@ def test_perform_with_item_in_wrong_spot(self):
             x=5, y=6,
             ai_cls=HostileEnemy,
             fighter=Fighter(hp=10, defense=10, power=10),
-            inventory=Inventory(capacity=5))
+            inventory=Inventory(capacity=5),
+            level=Level()
+        )
         eng = Engine(player=actor)
         gm = GameMap(engine=eng, width=10, height=10)
         item = Item(
@@ -497,7 +596,9 @@ def test_perform_with_no_capacity(self):
             x=5, y=6,
             ai_cls=HostileEnemy,
             fighter=Fighter(hp=10, defense=10, power=10),
-            inventory=Inventory(capacity=0))
+            inventory=Inventory(capacity=0),
+            level=Level()
+        )
         eng = Engine(player=actor)
         gm = GameMap(engine=eng, width=10, height=10)
         item = Item(
@@ -522,7 +623,8 @@ def test_init_no_targetxy(self):
         and the target_xy gets set to the x, y of the entity
         '''
         actor = Actor(x=5, y=6, ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))
+            hp=10, defense=10, power=10), inventory=Inventory(capacity=5),
+            level=Level())
         item = Item(consumable=Consumable())
         item_action = ItemAction(entity=actor, item=item)
         self.assertEqual(item_action.item, item)
@@ -534,7 +636,8 @@ def test_init_with_targetxy(self):
         and the target_xy gets set
         '''
         actor = Actor(ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))
+            hp=10, defense=10, power=10), inventory=Inventory(capacity=5),
+            level=Level())
         item = Item(consumable=Consumable())
         item_action = ItemAction(entity=actor, item=item, target_xy=(5, 6))
         self.assertEqual(item_action.item, item)
@@ -545,7 +648,8 @@ def test_property_target_actor(self):
         test that get_actor_at_location is called with the correct inputs
         '''
         actor = Actor(ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))
+            hp=10, defense=10, power=10), inventory=Inventory(capacity=5),
+            level=Level())
         item = Item(consumable=Consumable())
         eng = Engine(player=actor)
         gm = GameMap(engine=eng, width=10, height=10)
@@ -564,7 +668,8 @@ def test_perform(self):
         passing in the existing itemAction
         '''
         actor = Actor(ai_cls=HostileEnemy, fighter=Fighter(
-            hp=10, defense=10, power=10), inventory=Inventory(capacity=5))
+            hp=10, defense=10, power=10), inventory=Inventory(capacity=5),
+            level=Level())
         item = Item(consumable=Consumable())
         item_action = ItemAction(entity=actor, item=item)
 
@@ -582,7 +687,8 @@ def test_perform(self):
         ent = Actor(
             ai_cls=BaseAI,
             fighter=Fighter(hp=10, defense=10, power=10),
-            inventory=Inventory(capacity=1)
+            inventory=Inventory(capacity=1),
+            level=Level()
         )
         item = Item(consumable=Consumable())
         ent.inventory.items.append(item)