Merge pull request #15 from nuzcraft/part_12

Part 12

Author: nuzcraft

README.md

@@ -12,6 +12,16 @@ I want to use this as an opportunity to:
 4. make a roguelike
 5. practice with git
 
+## Part 12 Dev Notes
+
+### Increasing Difficulty
+
+https://rogueliketutorials.com/tutorials/tcod/v2/part-12/
+
+This section looks pretty short. As it stands, the game is pretty easy. We breeze past the each level due to the high number of items relative to monsters. I think this will be an interesting way to modulate the difficulty.
+
+This was the shortest part so far (I think) and it was a bit refreshing. Overall, I think this method of progressing the difficulty is interesting. My personal gripe with it is just that its somewhat hard to test out the balance; I think when I end up looking at tuning the balance, I'll want to set up some sort of method to set the map at a certain state as well as figure out how to unit test the functions that rely on random generation.
+
 ## Part 11 Dev Notes
 
 ### Delving into the Dungeon

Tests/test_actions.py

@@ -82,8 +82,6 @@ def test_perform_with_stairs(self):
             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
@@ -110,8 +108,6 @@ def test_perform_no_stairs(self):
             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

Tests/test_engine.py

@@ -127,8 +127,6 @@ def test_render(self, patch_render, patch_MessageLog_render, patch_render_bar, p
             max_rooms=5,
             room_min_size=3,
             room_max_size=4,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         eng.game_map = GameMap(engine=eng, width=10, height=10)
 

Tests/test_game_map.py

@@ -213,7 +213,6 @@ def test_init(self):
         mw, mh = 10, 11
         mr = 6
         rmin, rmax = 3, 4
-        mm, mi = 1, 2
         cf = 5
         gw = GameWorld(
             engine=eng,
@@ -222,8 +221,6 @@ def test_init(self):
             max_rooms=mr,
             room_min_size=rmin,
             room_max_size=rmax,
-            max_monsters_per_room=mm,
-            max_items_per_room=mi,
             current_floor=cf
         )
         self.assertEqual(gw.engine, eng)
@@ -232,8 +229,6 @@ def test_init(self):
         self.assertEqual(gw.max_rooms, mr)
         self.assertEqual(gw.room_min_size, rmin)
         self.assertEqual(gw.room_max_size, rmax)
-        self.assertEqual(gw.max_monsters_per_room, mm)
-        self.assertEqual(gw.max_items_per_room, mi)
         self.assertEqual(gw.current_floor, cf)
 
     def test_generate_floor(self):
@@ -248,8 +243,6 @@ def test_generate_floor(self):
             max_rooms=10,
             room_min_size=3,
             room_max_size=6,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         with patch('procgen.generate_dungeon') as patch_gen_dun:
             gw.generate_floor()

Tests/test_input_handlers.py

@@ -1200,8 +1200,6 @@ def test_on_render_player_on_left(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1240,8 +1238,6 @@ def test_on_render_player_on_right(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1281,8 +1277,6 @@ def test_on_render_player_on_left(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1321,8 +1315,6 @@ def test_on_render_player_on_right(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1470,8 +1462,6 @@ def test_on_render_player_on_left(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1511,8 +1501,6 @@ def test_on_render_player_on_right(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1556,8 +1544,6 @@ def test_on_render_height_calulated(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1601,8 +1587,6 @@ def test_on_render_items_printed(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1633,8 +1617,6 @@ def test_on_render_no_items(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=50, height=50)
         eng.game_map = gm
@@ -1830,8 +1812,6 @@ def test_on_render(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=10, height=10)
         eng.game_map = gm
@@ -2307,8 +2287,6 @@ def test_on_render(self):
             max_rooms=20,
             room_min_size=2,
             room_max_size=14,
-            max_monsters_per_room=2,
-            max_items_per_room=2
         )
         gm = GameMap(engine=eng, width=10, height=10)
         eng.game_map = gm

Tests/test_procgen.py

@@ -1,7 +1,48 @@
 import unittest
-from procgen import RectangularRoom, generate_dungeon, tunnel_between, place_entities
+from procgen import (
+    RectangularRoom,
+    generate_dungeon,
+    tunnel_between,
+    place_entities,
+    get_max_value_for_floor,
+)
 from entity import Entity
 from engine import Engine
+from game_map import GameWorld
+
+
+class TestMaxValue(unittest.TestCase):
+    def test_get_max_value_for_floor_on_floor(self):
+        '''
+        test that passing in a matching floor will return 
+        the exact match for the value associated with that floor
+        '''
+        weighted_chances = [
+            (1, 2),
+            (4, 3),
+            (6, 5),
+        ]
+        ret = get_max_value_for_floor(
+            weighted_chances_by_floor=weighted_chances,
+            floor=4
+        )
+        self.assertEqual(ret, 3)
+
+    def test_get_max_value_for_floor_between_floors(self):
+        '''
+        test that passing in a not matching floor will return 
+        the match for the value associated with the lower floor
+        '''
+        weighted_chances = [
+            (1, 2),
+            (4, 3),
+            (6, 5),
+        ]
+        ret = get_max_value_for_floor(
+            weighted_chances_by_floor=weighted_chances,
+            floor=3
+        )
+        self.assertEqual(ret, 2)
 
 
 class Test_RectangularRoom(unittest.TestCase):
@@ -81,14 +122,21 @@ def test_generate_dungeon(self):
         '''
         ent = Entity()
         eng = Engine(player=ent)
+        eng.game_world = GameWorld(
+            engine=eng,
+            map_width=50,
+            map_height=50,
+            max_rooms=10,
+            room_min_size=3,
+            room_max_size=5,
+            current_floor=1
+        )
         d = generate_dungeon(
             max_rooms=10,
             room_min_size=3,
             room_max_size=5,
             map_width=50,
             map_height=50,
-            max_monsters_per_room=3,
-            max_items_per_room=2,
             engine=eng
         )
         self.assertEqual(d.height, 50)

game_map.py

@@ -115,8 +115,6 @@ def __init__(
         max_rooms: int,
         room_min_size: int,
         room_max_size: int,
-        max_monsters_per_room: int,
-        max_items_per_room: int,
         current_floor: int = 0
     ):
         self.engine = engine
@@ -129,9 +127,6 @@ def __init__(
         self.room_min_size = room_min_size
         self.room_max_size = room_max_size
 
-        self.max_monsters_per_room = max_monsters_per_room
-        self.max_items_per_room = max_items_per_room
-
         self.current_floor = current_floor
 
     def generate_floor(self) -> None:
@@ -144,7 +139,5 @@ def generate_floor(self) -> None:
             room_max_size=self.room_max_size,
             map_width=self.map_width,
             map_height=self.map_height,
-            max_monsters_per_room=self.max_monsters_per_room,
-            max_items_per_room=self.max_items_per_room,
             engine=self.engine,
         )