diff --git a/worlds/timespinner/Regions.py b/worlds/timespinner/Regions.py index 92856b27..863f7339 100644 --- a/worlds/timespinner/Regions.py +++ b/worlds/timespinner/Regions.py @@ -47,7 +47,7 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData connectStartingRegion(world, player) - names = {} + names: Dict[str, int] = {} connect(world, player, names, 'Lake desolation', 'Lower lake desolation', lambda state: state._timespinner_has_timestop(world, player or state.has('Talaria Attachment', player))) connect(world, player, names, 'Lake desolation', 'Upper lake desolation', lambda state: state._timespinner_has_fire(world, player) and state.can_reach('Upper Lake Sirine', 'Region', player)) @@ -60,7 +60,7 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData connect(world, player, names, 'Lower lake desolation', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) connect(world, player, names, 'Libary', 'Lower lake desolation') connect(world, player, names, 'Libary', 'Libary top', lambda state: state._timespinner_has_doublejump(world, player) or state.has('Talaria Attachment', player)) - connect(world, player, names, 'Libary', 'Varndagroth tower left', lambda state: state._timespinner_has_keycard_C(world, player)) + connect(world, player, names, 'Libary', 'Varndagroth tower left', lambda state: state._timespinner_has_keycard_D(world, player)) connect(world, player, names, 'Libary', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) connect(world, player, names, 'Libary top', 'Libary') connect(world, player, names, 'Varndagroth tower left', 'Libary') @@ -149,6 +149,7 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData connect(world, player, names, 'Space time continuum', 'Caves of Banishment (Maw)', lambda state: pyramid_keys_unlock == "GateMaw") connect(world, player, names, 'Space time continuum', 'Caves of Banishment (upper)', lambda state: pyramid_keys_unlock == "GateCavesOfBanishment") + def create_location(player: int, name: str, id: Optional[int], region: Region, rule: Callable, location_cache: List[Location]) -> Location: location = Location(player, name, id, region) location.access_rule = rule @@ -197,7 +198,7 @@ def connectStartingRegion(world: MultiWorld, player: int): space_time_continuum.exits.append(teleport_back_to_start) -def connect(world: MultiWorld, player: int, used_names : Dict[str, int], source: str, target: str, rule: Optional[Callable] = None): +def connect(world: MultiWorld, player: int, used_names: Dict[str, int], source: str, target: str, rule: Optional[Callable] = None): sourceRegion = world.get_region(source, player) targetRegion = world.get_region(target, player) diff --git a/worlds/timespinner/__init__.py b/worlds/timespinner/__init__.py index 2adb3ca0..cf7e75dc 100644 --- a/worlds/timespinner/__init__.py +++ b/worlds/timespinner/__init__.py @@ -64,8 +64,8 @@ class TimespinnerWorld(World): self.world.itempool += pool - def fill_slot_data(self) -> Dict: - slot_data = {} + def fill_slot_data(self) -> Dict[str, object]: + slot_data: Dict[str, object] = {} for option_name in timespinner_options: slot_data[option_name] = is_option_enabled(self.world, self.player, option_name) @@ -85,7 +85,7 @@ def create_item(name: str, player: int) -> Item: def get_excluded_items_based_on_options(world: MultiWorld, player: int) -> List[str]: - excluded_items = [] + excluded_items: List[str] = [] if is_option_enabled(world, player, "StartWithJewelryBox"): excluded_items.append('Jewelry Box')