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

Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable

Browse Source
This commit is contained in:
aerinon
2022-12-16 14:25:42 -07:00
parent f0ad711e78 cd8bc9bd57
commit 99f92f3d79
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DoorShuffle.py
View File

@@ -2689,8 +2689,12 @@ def find_valid_bd_combination(builder, suggested, world, player):
test = random.choice([True, False]) test = random.choice([True, False])
if test: if test:
bomb_doors_needed -= 1 bomb_doors_needed -= 1
if bomb_doors_needed < 0:
bomb_doors_needed = 0
else: else:
dash_doors_needed -= 1 dash_doors_needed -= 1
if dash_doors_needed < 0:
dash_doors_needed = 0
bomb_proposal = random.sample(bd_door_pool, k=bomb_doors_needed) bomb_proposal = random.sample(bd_door_pool, k=bomb_doors_needed)
bomb_proposal.extend(custom_bomb_doors) bomb_proposal.extend(custom_bomb_doors)
dash_pool = [x for x in bd_door_pool if x not in bomb_proposal] dash_pool = [x for x in bd_door_pool if x not in bomb_proposal]

1
DungeonGenerator.py
View File

@@ -1335,6 +1335,7 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player, dunge
sector = find_sector(r_name, all_sectors) sector = find_sector(r_name, all_sectors)
reverse_d_map[sector] = key reverse_d_map[sector] = key
if world.mode[player] == 'standard': if world.mode[player] == 'standard':
if 'Hyrule Castle' in dungeon_map:
current_dungeon = dungeon_map['Hyrule Castle'] current_dungeon = dungeon_map['Hyrule Castle']
standard_stair_check(dungeon_map, current_dungeon, candidate_sectors, global_pole) standard_stair_check(dungeon_map, current_dungeon, candidate_sectors, global_pole)