From aa9640c73708e2bdbe9a1a86861edd3fc0e1310b Mon Sep 17 00:00:00 2001 From: Silvris <58583688+Silvris@users.noreply.github.com> Date: Sat, 26 Aug 2023 16:08:53 -0500 Subject: [PATCH] pep8 and typing cleanup --- worlds/kdl3/Regions.py | 8 +++++--- worlds/kdl3/Rom.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/worlds/kdl3/Regions.py b/worlds/kdl3/Regions.py index bc52ea8f241f..f6bf73e55af1 100644 --- a/worlds/kdl3/Regions.py +++ b/worlds/kdl3/Regions.py @@ -47,7 +47,8 @@ def generate_rooms(world: "KDL3World", door_shuffle: bool, level_regions: typing room_entry["animal_pointers"], room_entry["enemies"], room_entry["entity_load"], room_entry["consumables"], room_entry["consumables_pointer"]) room.add_locations({location: world.location_name_to_id[location] if location in world.location_name_to_id else - None for location in room_entry["locations"] if not any([x in location for x in ["1-Up", "Maxim"]]) or + None for location in room_entry["locations"] + if not any([x in location for x in ["1-Up", "Maxim"]]) or world.multiworld.consumables[world.player]}, KDL3Location) rooms[room.name] = room for location in room.locations: @@ -89,8 +90,9 @@ def generate_rooms(world: "KDL3World", door_shuffle: bool, level_regions: typing proper_stage = world.player_levels[level][stage] level_regions[level].add_exits([first_rooms[proper_stage].name], {first_rooms[proper_stage].name: - (lambda state: True) if world.multiworld.open_world[world.player] or - stage == 0 else lambda state, level=level, stage=stage: state.has( + (lambda state: True) if world.multiworld.open_world[world.player] or + stage == 0 else lambda state, level=level, + stage=stage: state.has( f"{LocationName.level_names_inverse[level]} " f"{f'{stage}'}" f" - Stage Completion", world.player)}) diff --git a/worlds/kdl3/Rom.py b/worlds/kdl3/Rom.py index d6c4fffed788..6ca7382eb985 100644 --- a/worlds/kdl3/Rom.py +++ b/worlds/kdl3/Rom.py @@ -377,7 +377,7 @@ def patch(self, target: str): def patch_rom(multiworld: MultiWorld, player: int, rom: RomData, heart_stars_required: int, - boss_requirements: Dict[int, int], shuffled_levels: Dict[int, List[int]], bb_boss_enabled: Dict[int, int], + boss_requirements: Dict[int, int], shuffled_levels: Dict[int, List[int]], bb_boss_enabled: List[bool], copy_abilities: Dict[str, str], slot_random: Random): # increase BWRAM by 0x8000 rom.write_byte(0x7FD8, 0x06)