From 21c3b5d94f2d485c8e3e4785c955600c61665552 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sun, 19 Feb 2023 18:22:45 -0800 Subject: [PATCH] Small bit of reformatting and type checking --- erynrl/map/generator/__init__.py | 7 ++++++- erynrl/map/generator/room.py | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/erynrl/map/generator/__init__.py b/erynrl/map/generator/__init__.py index 9f3cd82..d82d44e 100644 --- a/erynrl/map/generator/__init__.py +++ b/erynrl/map/generator/__init__.py @@ -1,4 +1,6 @@ -from typing import List +# Eryn Wells + +from typing import List, TYPE_CHECKING import numpy as np @@ -6,6 +8,9 @@ from .corridor import CorridorGenerator from .room import RoomGenerator from ...geometry import Point +if TYPE_CHECKING: + from .. import Map + class MapGenerator: '''Abstract base class defining an interface for generating a map and applying it to a set of tiles.''' diff --git a/erynrl/map/generator/room.py b/erynrl/map/generator/room.py index 5a039b8..9a3423d 100644 --- a/erynrl/map/generator/room.py +++ b/erynrl/map/generator/room.py @@ -41,8 +41,10 @@ class RoomGenerator: '''Generate rooms and stairs''' did_generate_rooms = self._generate() - if did_generate_rooms: - self._generate_stairs() + if not did_generate_rooms: + return + + self._generate_stairs() def _generate(self) -> bool: '''