alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Some further merging

Browse Source
This commit is contained in:
codemann8
2022-03-27 23:31:52 -05:00
parent fd7d9f7121
commit dab40f1a98
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Main.py
View File

@@ -211,6 +211,8 @@ def main(args, seed=None, fish=None):
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
set_rules(world, player) set_rules(world, player)
district_item_pool_config(world)
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
if world.shopsanity[player]: if world.shopsanity[player]:
@@ -223,7 +225,6 @@ def main(args, seed=None, fish=None):
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
set_prize_drops(world, player) set_prize_drops(world, player)
district_item_pool_config(world)
massage_item_pool(world) massage_item_pool(world)
logger.info(world.fish.translate("cli", "cli", "placing.dungeon.prizes")) logger.info(world.fish.translate("cli", "cli", "placing.dungeon.prizes"))

10
source/item/District.py
View File

@@ -131,7 +131,7 @@ def resolve_districts(world):
if not location.item and location.real: if not location.item and location.real:
district.locations.add(location.name) district.locations.add(location.name)
for ext in region.exits: 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) queue.appendleft(ext.connected_region)
elif region.type == RegionType.Dungeon and region.dungeon: elif region.type == RegionType.Dungeon and region.dungeon:
district.dungeons.add(region.dungeon.name) district.dungeons.add(region.dungeon.name)
@@ -150,10 +150,10 @@ def find_reachable_locations(state, player):
return check_set 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', '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', inaccessible_regions_inv = {'Desert Palace Stairs', 'Maze Race Ledge', 'Desert Ledge',
'Desert Palace Entrance (North) Spot', 'Hyrule Castle Ledge', 'Death Mountain Return Ledge'} 'Desert Palace Entrance (North) Spot', 'Hyrule Castle Ledge', 'Mountain Entry Ledge'}