From 817833d0fab06ecc830195c3ea7075d94e157c48 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 29 Apr 2021 15:19:50 -0600 Subject: [PATCH] Standard generation bugs fixed --- DoorShuffle.py | 2 +- DungeonGenerator.py | 4 +++- RELEASENOTES.md | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index cfeab8ac..4e4d4d3b 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -555,7 +555,7 @@ def find_portal_candidates(door_list, dungeon, need_passage=False, dead_end_allo if not dead_end_allowed: ret = [x for x in ret if not x.deadEnd] if standard: - ret = [x for x in ret if not x.standard_restrict] + ret = [x for x in ret if not x.standard_restricted] return ret diff --git a/DungeonGenerator.py b/DungeonGenerator.py index e320bbaf..37f77e7d 100644 --- a/DungeonGenerator.py +++ b/DungeonGenerator.py @@ -1249,7 +1249,6 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player, for r_name in ['Hyrule Dungeon Cellblock', 'Sanctuary']: # need to deliver zelda assign_sector(find_sector(r_name, candidate_sectors), current_dungeon, candidate_sectors, global_pole) - standard_stair_check(dungeon_map, current_dungeon, candidate_sectors, global_pole) entrances_map, potentials, connections = connections_tuple accessible_sectors, reverse_d_map = set(), {} for key in dungeon_entrances.keys(): @@ -1265,6 +1264,9 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player, if not sector: sector = find_sector(r_name, all_sectors) reverse_d_map[sector] = key + if world.mode[player] == 'standard': + current_dungeon = dungeon_map['Hyrule Castle'] + standard_stair_check(world, dungeon_map, current_dungeon, candidate_sectors, global_pole) complete_dungeons = {x: y for x, y in dungeon_map.items() if sum(len(sector.outstanding_doors) for sector in y.sectors) <= 0} [dungeon_map.pop(key) for key in complete_dungeons.keys()] diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 214d470d..2c20660d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -150,6 +150,8 @@ New item counter modified to show total # Bug Fixes and Notes. +* 0.3.1.9-u + * Generation improvements for standard * 0.3.1.8-u * Fix for retro generation * Shopsanity - rebalance pricing - later prices can be are higher