Pass the whole Map into MapGenerator.generate

erynrl/map/__init__.py

@@ -12,7 +12,7 @@ import numpy as np
 import numpy.typing as npt
 import tcod
 
-from ..engine import Configuration
+from ..configuration import Configuration
 from ..geometry import Point, Rect, Size
 from .generator import MapGenerator
 from .tile import Empty, Shroud
@@ -28,7 +28,6 @@ class Map:
         shape = map_size.numpy_shape
 
         self.tiles = np.full(shape, fill_value=Empty, order='F')
-        generator.generate(self.tiles)
 
         self.up_stairs = generator.up_stairs
         self.down_stairs = generator.down_stairs
@@ -42,6 +41,8 @@ class Map:
 
         self.__walkable_points = None
 
+        generator.generate(self)
+
     @property
     def bounds(self) -> Rect:
         '''The bounds of the map'''

erynrl/map/generator/__init__.py

@@ -20,7 +20,8 @@ class MapGenerator:
         '''The location of any routes to a lower floor of the dungeon.'''
         raise NotImplementedError()
 
-    def generate(self, tiles: np.ndarray):
+    # pylint: disable=redefined-builtin
+    def generate(self, map: 'Map'):
         '''Generate a map and place it in `tiles`'''
         raise NotImplementedError()
 
@@ -42,9 +43,10 @@ class RoomsAndCorridorsGenerator(MapGenerator):
     def down_stairs(self) -> List[Point]:
         return self.room_generator.down_stairs
 
-    def generate(self, tiles: np.ndarray):
+    # pylint: disable=redefined-builtin
+    def generate(self, map: 'Map'):
         self.room_generator.generate()
-        self.room_generator.apply(tiles)
+        self.room_generator.apply(map)
 
         self.corridor_generator.generate(self.room_generator.rooms)
-        self.corridor_generator.apply(tiles)
+        self.corridor_generator.apply(map.tiles)

erynrl/map/generator/room.py

@@ -1,15 +1,17 @@
+# Eryn Wells <eryn@erynwells.me>
+
 import random
 from copy import copy
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import List, Optional, TYPE_CHECKING
 
-import numpy as np
 import tcod
 
 from ... import log
 from ...geometry import Point, Rect, Size
-from ..room import Room, RectangularRoom
-from ..tile import Empty, Floor, StairsUp, StairsDown, Wall
+
+if TYPE_CHECKING:
+    from .. import Map
 
 
 class RoomGenerator:
@@ -29,7 +31,9 @@ class RoomGenerator:
     def __init__(self, *, size: Size, config: Optional[Configuration] = None):
         self.size = size
         self.configuration = config if config else copy(RoomGenerator.DefaultConfiguration)
+
         self.rooms: List[Room] = []
+
         self.up_stairs: List[Point] = []
         self.down_stairs: List[Point] = []
 
@@ -54,20 +58,23 @@ class RoomGenerator:
         '''
         raise NotImplementedError()
 
-    def apply(self, tiles: np.ndarray):
+    # pylint: disable=redefined-builtin
+    def apply(self, map: 'Map'):
         '''Apply the generated rooms to a tile array'''
-        self._apply(tiles)
-        self._apply_stairs(tiles)
+        self._apply(map)
+        self._apply_stairs(map.tiles)
 
-    def _apply(self, tiles: np.ndarray):
+    def _apply(self, map: 'Map'):
         '''
         Apply the generated list of rooms to an array of tiles. Subclasses must implement this.
 
         Arguments
         ---------
-        tiles: np.ndarray
-            The array of tiles to update.
+        map: Map
+            The game map to apply the generated room to
         '''
+        tiles = map.tiles
+
         for room in self.rooms:
             for pt in room.floor_points:
                 tiles[pt.x, pt.y] = Floor
@@ -76,6 +83,7 @@ class RoomGenerator:
             for pt in room.wall_points:
                 if tiles[pt.x, pt.y] != Empty:
                     continue
+
                 tiles[pt.x, pt.y] = Wall
 
     def _generate_stairs(self):