From dab40f1a9877905637a4aaee6edf8619ed30c761 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 27 Mar 2022 23:31:52 -0500 Subject: [PATCH] Some further merging --- Main.py | 3 ++- source/item/District.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Main.py b/Main.py index c5c390e0..b494848b 100644 --- a/Main.py +++ b/Main.py @@ -211,6 +211,8 @@ def main(args, seed=None, fish=None): for player in range(1, world.players + 1): set_rules(world, player) + + district_item_pool_config(world) for player in range(1, world.players + 1): if world.shopsanity[player]: @@ -223,7 +225,6 @@ def main(args, seed=None, fish=None): for player in range(1, world.players + 1): set_prize_drops(world, player) - district_item_pool_config(world) massage_item_pool(world) logger.info(world.fish.translate("cli", "cli", "placing.dungeon.prizes")) diff --git a/source/item/District.py b/source/item/District.py index 61acb972..375138a3 100644 --- a/source/item/District.py +++ b/source/item/District.py @@ -131,7 +131,7 @@ def resolve_districts(world): if not location.item and location.real: district.locations.add(location.name) for ext in region.exits: - if ext.connected_region not in visited: + if ext.connected_region is not None and ext.connected_region not in visited: queue.appendleft(ext.connected_region) elif region.type == RegionType.Dungeon and region.dungeon: district.dungeons.add(region.dungeon.name) @@ -150,10 +150,10 @@ def find_reachable_locations(state, player): return check_set -inaccessible_regions_std = {'Desert Palace Lone Stairs', 'Bumper Cave Ledge', 'Skull Woods Forest (West)', +inaccessible_regions_std = {'Desert Palace Stairs', 'Bumper Cave Ledge', 'Skull Woods Forest (West)', 'Dark Death Mountain Ledge', 'Dark Death Mountain Isolated Ledge', - 'Death Mountain Floating Island (Dark World)'} + 'Dark Death Mountain Floating Island'} -inaccessible_regions_inv = {'Desert Palace Lone Stairs', 'Maze Race Ledge', 'Desert Ledge', - 'Desert Palace Entrance (North) Spot', 'Hyrule Castle Ledge', 'Death Mountain Return Ledge'} +inaccessible_regions_inv = {'Desert Palace Stairs', 'Maze Race Ledge', 'Desert Ledge', + 'Desert Palace Entrance (North) Spot', 'Hyrule Castle Ledge', 'Mountain Entry Ledge'}