dungeon generation fixes

Author: neph1

stories/dungeon/story.py

@@ -126,22 +126,6 @@ def add_zone(self, zone: Zone) -> bool:
 
         return True
 
-    def _generate_boss(self, zone: Zone) -> bool:
-        character = self.llm_util.generate_character(keywords=['final boss']) # Characterv2
-        if character:
-            boss = RoamingMob(character.name, 
-                            gender=character.gender, 
-                            title=lang.capital(character.name), 
-                            descr=character.description, 
-                            short_descr=character.appearance, 
-                            age=character.age,
-                            personality=character.personality)
-            boss.aliases = [character.name.split(' ')[0]]
-            boss.stats.level = self.max_depth
-            location = random.choice(list(zone.locations.values()))
-            location.insert(boss, None)
-            return True
-        return False
 
 if __name__ == "__main__":
     # story is invoked as a script, start it in the Tale Driver.

tale/dungeon/dungeon.py

@@ -9,7 +9,7 @@
 from typing import TYPE_CHECKING
 
 from stories.anything.npcs.npc_defs import RoamingMob
-from tale import lang
+from tale import lang, parse_utils
 from tale.base import Door, Exit, Location
 from tale.coord import Coord
 from tale.dungeon.dungeon_generator import ItemPopulator, Layout, LayoutGenerator, MobPopulator
@@ -201,27 +201,29 @@ def _connect_locations(self, layout: Layout) -> None:
         for connection in connections:
             cell_location = self._grid.get(connection.coord.as_tuple(), None)
             parent_location = self._grid.get(connection.other.as_tuple(), None)
+            direction = parse_utils.direction_from_coordinates(connection.other.subtract(connection.coord))
+            reverse_direction = parse_utils.opposite_direction(direction)
 
             if not cell_location or not parent_location:
                 continue
 
             # Skip if already connected
-            if cell_location.exits.get(parent_location.name, None):
+            if cell_location.exits.get(parent_location.name, None) or cell_location.exits.get(direction, None):
                 continue
-            elif parent_location.exits.get(cell_location.name, None):
+            elif parent_location.exits.get(cell_location.name, None) or parent_location.exits.get(reverse_direction, None):
                 continue
 
             # Create connection
             if connection.door:
                 Door.connect(
-                    cell_location, parent_location.name, '', None,
-                    parent_location, cell_location.name, '', None,
+                    cell_location, [parent_location.name, direction], '', None,
+                    parent_location, [cell_location.name, reverse_direction], '', None,
                     opened=False, locked=connection.locked, key_code=connection.key_code
                 )
             else:
                 Exit.connect(
-                    cell_location, parent_location.name, '', None,
-                    parent_location, cell_location.name, '', None
+                    cell_location, [parent_location.name, direction], '', None,
+                    parent_location, [cell_location.name, reverse_direction], '', None
                 )
 
     def _spawn_gold(self, zone: Zone):

tale/dungeon/dungeon_generator.py

@@ -223,7 +223,8 @@ def populate(self, layout: 'Layout', story: DynamicStory, zone: Zone) -> list:
             if not mob_type:
                 continue
             mob_type['level'] = zone.level
-            item_probabilities = [random.random() * 0.15 + 0.5 for i in range(len(zone.items))]
+            item_types = [zone.items]
+            item_probabilities = [(random.random() * 0.15 + 0.5) for i in range(len(item_types))]
             mob_spawner = MobSpawner(location=location, mob_type=mob_type, spawn_rate=30, spawn_limit=2, drop_items=zone.items, drop_item_probabilities=item_probabilities)
             mob_spawners.append(mob_spawner)
         if len(mob_spawners) == 1:
@@ -249,7 +250,7 @@ def populate(self, zone: Zone, story: DynamicStory) -> list:
                 continue
             item_type['level'] = zone.level
             item_types = [item_type]
-            item_probabilities = [random.random() * 0.15 + 0.5 for i in range(len(zone.items))]
+            item_probabilities = [(random.random() * 0.15 + 0.5) for i in range(len(item_types))]
             item_spawners.append(ItemSpawner(zone=zone, items=item_types, item_probabilities=item_probabilities, spawn_rate=30))
         if len(item_spawners) == 1:
             return [item_spawners]

tale/zone.py

@@ -23,7 +23,7 @@ def __init__(self, name: str, description: str = '') -> None:
         self.name = name
         self.lore = ""
         self.dungeon_config = None  # type: DungeonConfig
-        self.dungeon = None  # type: Dungeon - tracks if a dungeon has been generated for this zone
+        self.dungeon = None  # type: Dungeon
 
     def add_location(self, location: Location) -> bool:
         """ Add a location to the zone. Skip if location already exists."""