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

Fix trock entrances when intensity >= 3

Browse Source 
Keysanity menu countdowns
Standard rain state
Multi-entrance dungeon bosses
This dungeon/universl key drops skip pose
More rupee candidates to remove for retro
This commit is contained in:
aerinon
2020-11-19 16:26:45 -07:00
parent b8dc174f87
commit f5327bc0e6
12 changed files with 256 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
DoorShuffle.py
View File

@@ -369,6 +369,9 @@ def choose_portals(world, player):
sanc = world.get_portal('Sanctuary', player)
sanc.destination = True
clean_up_portal_assignment(portal_assignment, dungeon, sanc, master_door_list, outstanding_portals)
for target_region, possible_portals in info.required_passage.items():
info.required_passage[target_region] = [x for x in possible_portals if x != sanc.name]
info.required_passage = {x: y for x, y in info.required_passage.items() if len(y) > 0}
for target_region, possible_portals in info.required_passage.items():
candidates = find_portal_candidates(master_door_list, dungeon, need_passage=True, crossed=cross_flag,
bk_shuffle=bk_shuffle)
@@ -596,6 +599,8 @@ def create_dungeon_entrances(world, player):
filtered_choices = [x for x in choices if any(y not in world.inaccessible_regions[player] for y in originating[key][x].keys())]
else:
filtered_choices = dest_choices
if len(filtered_choices) == 0:
raise Exception('No valid destinations')
choice = random.choice(filtered_choices)
r_name = portal.door.entrance.parent_region.name
split_map[key][choice].append(r_name)
@@ -650,6 +655,8 @@ def within_dungeon(world, player):
target = portal.door.entrance.parent_region
connect_simple_door(world, 'Sanctuary Mirror Route', target, player)
refine_boss_exits(world, player)
def handle_split_dungeons(dungeon_builders, recombinant_builders, entrances_map, builder_info):
dungeon_entrances, split_dungeon_entrances, world, player = builder_info
@@ -943,6 +950,7 @@ def cross_dungeon(world, player):
palette_assignment(world, player)
refine_hints(dungeon_builders)
refine_boss_exits(world, player)
def assign_cross_keys(dungeon_builders, world, player):
@@ -1138,6 +1146,44 @@ def refine_hints(dungeon_builders):
location.hint_text = dungeon_hints[name]
def refine_boss_exits(world, player):
for d_name, d_boss in {'Desert Palace': 'Desert Boss',
'Skull Woods': 'Skull Boss',
'Turtle Rock': 'TR Boss'}.items():
possible_portals = []
current_boss = None
for portal_name in dungeon_portals[d_name]:
portal = world.get_portal(portal_name, player)
if not portal.destination:
possible_portals.append(portal)
if portal.boss_exit_idx > -1:
current_boss = portal
if len(possible_portals) == 1:
if possible_portals[0] != current_boss:
possible_portals[0].change_boss_exit(current_boss.boss_exit_idx)
current_boss.change_boss_exit(-1)
else:
reachable_portals = []
for portal in possible_portals:
start_area = portal.door.entrance.parent_region
state = ExplorationState(dungeon=d_name)
state.visit_region(start_area)
state.add_all_doors_check_unattached(start_area, world, player)
explore_state_not_inaccessible(state, world, player)
if state.visited_at_all(world.get_region(d_boss, player)):
reachable_portals.append(portal)
if len(reachable_portals) == 0:
reachable_portals = possible_portals
unreachable = world.inaccessible_regions[player]
filtered = [x for x in reachable_portals if x.door.entrance.connected_region.name not in unreachable]
if 0 < len(filtered) < len(reachable_portals):
reachable_portals = filtered
chosen_one = random.choice(reachable_portals) if len(reachable_portals) > 1 else reachable_portals[0]
if chosen_one != current_boss:
chosen_one.change_boss_exit(current_boss.boss_exit_idx)
current_boss.change_boss_exit(-1)
def convert_to_sectors(region_names, world, player):
region_list = convert_regions(region_names, world, player)
sectors = []
@@ -1806,6 +1852,15 @@ def explore_state(state, world, player):
state.add_all_doors_check_unattached(connect_region, world, player)
def explore_state_not_inaccessible(state, world, player):
while len(state.avail_doors) > 0:
door = state.next_avail_door().door
connect_region = world.get_entrance(door.name, player).connected_region
if state.can_traverse(door) and not state.visited(connect_region) and connect_region.type == RegionType.Dungeon:
state.visit_region(connect_region)
state.add_all_doors_check_unattached(connect_region, world, player)
def check_if_regions_visited(state, check_paths):
valid = False
breaking_region = None