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

Implemented District/Nearby Dungeon Item Shuffle

Browse Source
This commit is contained in:
codemann8
2024-12-24 11:49:24 -06:00
parent e3e227f3d5
commit 1247716e92
21 changed files with 295 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/item/District.py
View File

@@ -96,12 +96,15 @@ def resolve_districts(world):
for name, district in world.districts[player].items():
if district.dungeon:
dungeon = world.get_dungeon(district.dungeon, player)
dungeon.districts = [district] + dungeon.districts
layout = world.dungeon_layouts[player][district.dungeon]
district.locations.update([l.name for r in layout.master_sector.regions
for l in r.locations if not l.item and l.real])
else:
for region_name in district.regions:
region = world.get_region(region_name, player)
region.districts.append(district)
for location in region.locations:
if not location.item and location.real:
district.locations.add(location.name)
@@ -115,6 +118,7 @@ def resolve_districts(world):
RuntimeError(f'No region connected to entrance: {ent.name} Likely a missing entry in OWExitTypes')
visited.add(region)
if region.type == RegionType.Cave:
region.districts.append(district)
for location in region.locations:
if not location.item and location.real:
district.locations.add(location.name)
@@ -123,6 +127,8 @@ def resolve_districts(world):
queue.appendleft(ext.connected_region)
elif region.type == RegionType.Dungeon and region.dungeon:
district.dungeons.add(region.dungeon.name)
if district not in region.dungeon.districts:
region.dungeon.districts.append(district)
elif region.name in inaccessible:
district.access_points.add(region)

23
source/item/FillUtil.py
View File

@@ -134,7 +134,7 @@ def create_item_pool_config(world):
groups = LocationGroup('Major').locs(init_set)
if world.prizeshuffle[player] != 'none':
groups.locations.extend(mode_grouping['Prizes'])
if world.bigkeyshuffle[player]:
if world.bigkeyshuffle[player] != 'none':
groups.locations.extend(mode_grouping['Big Keys'])
if world.dropshuffle[player] != 'none':
groups.locations.extend(mode_grouping['Big Key Drops'])
@@ -144,9 +144,9 @@ def create_item_pool_config(world):
groups.locations.extend(mode_grouping['Key Drops'])
if world.pottery[player] not in ['none', 'cave']:
groups.locations.extend(mode_grouping['Pot Keys'])
if world.compassshuffle[player]:
if world.compassshuffle[player] != 'none':
groups.locations.extend(mode_grouping['Compasses'])
if world.mapshuffle[player]:
if world.mapshuffle[player] != 'none':
groups.locations.extend(mode_grouping['Maps'])
if world.shopsanity[player]:
groups.locations.append('Capacity Upgrade - Left')
@@ -259,12 +259,12 @@ def location_prefilled(location, world, player):
def previously_reserved(location, world, player):
if '- Boss' in location.name or '- Prize' in location.name:
if world.restrict_boss_items[player] == 'mapcompass' and (not world.compassshuffle[player]
or not world.mapshuffle[player]):
if world.restrict_boss_items[player] == 'mapcompass' and (world.compassshuffle[player] == 'none'
or world.mapshuffle[player] == 'none'):
return True
if world.restrict_boss_items[player] == 'dungeon' and (not world.compassshuffle[player]
or not world.mapshuffle[player]
or not world.bigkeyshuffle[player]
if world.restrict_boss_items[player] == 'dungeon' and (world.compassshuffle[player] == 'none'
or world.mapshuffle[player] == 'none'
or world.bigkeyshuffle[player] == 'none'
or world.keyshuffle[player] == 'none'
or world.prizeshuffle[player] in ['none', 'dungeon']):
return True
@@ -303,6 +303,7 @@ def massage_item_pool(world):
if item.prize:
dungeon = dungeon_pool[item.player].pop()
dungeon.prize = item
item.dungeon_object = dungeon
player_pool[item.player].append(item)
for dungeon in world.dungeons:
for item in dungeon.all_items:
@@ -381,13 +382,13 @@ def determine_major_items(world, player):
pass # now what?
if world.prizeshuffle[player] not in ['none', 'dungeon']:
major_item_set.update({x for x, y in item_table.items() if y[2] == 'Prize'})
if world.bigkeyshuffle[player]:
if world.bigkeyshuffle[player] != 'none':
major_item_set.update({x for x, y in item_table.items() if y[2] == 'BigKey'})
if world.keyshuffle[player] != 'none':
major_item_set.update({x for x, y in item_table.items() if y[2] == 'SmallKey'})
if world.compassshuffle[player]:
if world.compassshuffle[player] != 'none':
major_item_set.update({x for x, y in item_table.items() if y[2] == 'Compass'})
if world.mapshuffle[player]:
if world.mapshuffle[player] != 'none':
major_item_set.update({x for x, y in item_table.items() if y[2] == 'Map'})
if world.shopsanity[player]:
major_item_set.add('Bomb Upgrade (+5)')