mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-04-23 14:53:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

yay bad merges

Browse Source
This commit is contained in:
Silvris
2024-07-24 23:34:45 -05:00
parent cf1eea7888
commit e8eb0c873b
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
worlds/kdl3/regions.py
View File

@@ -136,8 +136,8 @@ def generate_valid_levels(world: "KDL3World", shuffle_mode: int) -> Dict[int, Li
try: try:
entrance_world, entrance_stage = connection.entrance.rsplit(" ", 1) entrance_world, entrance_stage = connection.entrance.rsplit(" ", 1)
stage_world, stage_stage = connection.exit.rsplit(" ", 1) stage_world, stage_stage = connection.exit.rsplit(" ", 1)
new_stage = default_levels[LocationName.level_names[stage_world.strip()]][int(stage_stage) - 1] new_stage = default_levels[location_name.level_names[stage_world.strip()]][int(stage_stage) - 1]
levels[LocationName.level_names[entrance_world.strip()]][int(entrance_stage) - 1] = new_stage levels[location_name.level_names[entrance_world.strip()]][int(entrance_stage) - 1] = new_stage
possible_stages.remove(new_stage) possible_stages.remove(new_stage)
except Exception: except Exception:
@@ -148,20 +148,16 @@ def generate_valid_levels(world: "KDL3World", shuffle_mode: int) -> Dict[int, Li
for level in range(1, 6): for level in range(1, 6):
for stage in range(6): for stage in range(6):
# Randomize bosses separately # Randomize bosses separately
try: if levels[level][stage] is None:
if levels[level][stage] is None: stage_candidates = [candidate for candidate in possible_stages
stage_candidates = [candidate for candidate in possible_stages if (shuffle_mode == 1 and candidate in default_levels[level])
if (enforce_world and candidate in default_levels[level]) or (shuffle_mode == 2 and ((candidate - 1) & 0x00FFFF) % 6 == stage)
or (enforce_pattern and ((candidate - 1) & 0x00FFFF) % 6 == stage) or (shuffle_mode == 3)
or (enforce_pattern == enforce_world)
] ]
new_stage = generate_valid_level(world, level, stage, stage_candidates, levels[level]) if not stage_candidates:
possible_stages.remove(new_stage) raise Exception(f"Failed to find valid stage for {level}-{stage}. Remaining Stages:{possible_stages}")
new_stage = generate_valid_level(world, level, stage, stage_candidates, levels[level])
except Exception: possible_stages.remove(new_stage)
raise Exception(
f"Invalid connection: {connection.entrance} =>"
f" {connection.exit} for player {world.player} ({world.player_name})")
else: else:
levels = deepcopy(default_levels) levels = deepcopy(default_levels)
for level in levels: for level in levels: