Fixed some spelling
This commit is contained in:
		
							parent
							
								
									833de94ab0
								
							
						
					
					
						commit
						20d61d14e0
					
				|  | @ -32,18 +32,18 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L | ||||||
|         LocationData('Upper lake desolation', 'Crash site chest 1',  1337016, lambda state: state.has_all(['Killed Maw', 'Gas Mask'], player)), |         LocationData('Upper lake desolation', 'Crash site chest 1',  1337016, lambda state: state.has_all(['Killed Maw', 'Gas Mask'], player)), | ||||||
|         LocationData('Upper lake desolation', 'Crash site chest 2',  1337017, lambda state: state.has_all(['Killed Maw', 'Gas Mask'], player)), |         LocationData('Upper lake desolation', 'Crash site chest 2',  1337017, lambda state: state.has_all(['Killed Maw', 'Gas Mask'], player)), | ||||||
|         LocationData('Upper lake desolation', 'Kitty Boss',  1337018), |         LocationData('Upper lake desolation', 'Kitty Boss',  1337018), | ||||||
|         LocationData('Libary', 'Basement',  1337019), |         LocationData('Library', 'Basement',  1337019), | ||||||
|         LocationData('Libary', 'Consolation',  1337020), |         LocationData('Library', 'Consolation',  1337020), | ||||||
|         LocationData('Libary', 'Librarian',  1337021), |         LocationData('Library', 'Librarian',  1337021), | ||||||
|         LocationData('Libary', 'Reading nook chest',  1337022), |         LocationData('Library', 'Reading nook chest',  1337022), | ||||||
|         LocationData('Libary', 'Storage room chest 1',  1337023, lambda state: state._timespinner_has_keycard_D(world, player)), |         LocationData('Library', 'Storage room chest 1',  1337023, lambda state: state._timespinner_has_keycard_D(world, player)), | ||||||
|         LocationData('Libary', 'Storage room chest 2',  1337024, lambda state: state._timespinner_has_keycard_D(world, player)), |         LocationData('Library', 'Storage room chest 2',  1337024, lambda state: state._timespinner_has_keycard_D(world, player)), | ||||||
|         LocationData('Libary', 'Storage room chest 3',  1337025, lambda state: state._timespinner_has_keycard_D(world, player)), |         LocationData('Library', 'Storage room chest 3',  1337025, lambda state: state._timespinner_has_keycard_D(world, player)), | ||||||
|         LocationData('Libary top', 'Backer room chest 5',  1337026), |         LocationData('Library top', 'Backer room chest 5',  1337026), | ||||||
|         LocationData('Libary top', 'Backer room chest 4',  1337027), |         LocationData('Library top', 'Backer room chest 4',  1337027), | ||||||
|         LocationData('Libary top', 'Backer room chest 3',  1337028), |         LocationData('Library top', 'Backer room chest 3',  1337028), | ||||||
|         LocationData('Libary top', 'Backer room chest 2',  1337029), |         LocationData('Library top', 'Backer room chest 2',  1337029), | ||||||
|         LocationData('Libary top', 'Backer room chest 1',  1337030), |         LocationData('Library top', 'Backer room chest 1',  1337030), | ||||||
|         LocationData('Varndagroth tower left', 'Elevator Key not required',  1337031), |         LocationData('Varndagroth tower left', 'Elevator Key not required',  1337031), | ||||||
|         LocationData('Varndagroth tower left', 'Ye olde Timespinner',  1337032), |         LocationData('Varndagroth tower left', 'Ye olde Timespinner',  1337032), | ||||||
|         LocationData('Varndagroth tower left', 'C Keycard chest',  1337033, lambda state: state._timespinner_has_keycard_C(world, player)), |         LocationData('Varndagroth tower left', 'C Keycard chest',  1337033, lambda state: state._timespinner_has_keycard_C(world, player)), | ||||||
|  | @ -114,19 +114,19 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L | ||||||
|         LocationData('Forest', 'Batcave',  1337096), |         LocationData('Forest', 'Batcave',  1337096), | ||||||
|         LocationData('Forest', 'Bridge Chest',  1337097), |         LocationData('Forest', 'Bridge Chest',  1337097), | ||||||
|         LocationData('Left Side forest Caves', 'Solitary bat room',  1337098), |         LocationData('Left Side forest Caves', 'Solitary bat room',  1337098), | ||||||
|         LocationData('Upper Lake Sirine', 'Rat nest',  1337099), |         LocationData('Upper Lake Serene', 'Rat nest',  1337099), | ||||||
|         LocationData('Upper Lake Sirine', 'Double jump cave platform (past)',  1337100, lambda state: state._timespinner_has_doublejump(world, player)), |         LocationData('Upper Lake Serene', 'Double jump cave platform (past)',  1337100, lambda state: state._timespinner_has_doublejump(world, player)), | ||||||
|         LocationData('Upper Lake Sirine', 'Double jump cave floor (past)',  1337101), |         LocationData('Upper Lake Serene', 'Double jump cave floor (past)',  1337101), | ||||||
|         LocationData('Upper Lake Sirine', 'West lake serene cave secret',  1337102, lambda state: state._timespinner_can_break_walls(world, player)), |         LocationData('Upper Lake Serene', 'West lake serene cave secret',  1337102, lambda state: state._timespinner_can_break_walls(world, player)), | ||||||
|         LocationData('Upper Lake Sirine', 'Chest behind vines',  1337103), |         LocationData('Upper Lake Serene', 'Chest behind vines',  1337103), | ||||||
|         LocationData('Upper Lake Sirine', 'Pyramid keys room',  1337104), |         LocationData('Upper Lake Serene', 'Pyramid keys room',  1337104), | ||||||
|         LocationData('Lower Lake Sirine', 'Deep dive',  1337105), |         LocationData('Lower Lake Serene', 'Deep dive',  1337105), | ||||||
|         LocationData('Lower Lake Sirine', 'Under the eels',  1337106), |         LocationData('Lower Lake Serene', 'Under the eels',  1337106), | ||||||
|         LocationData('Lower Lake Sirine', 'Water spikes room',  1337107), |         LocationData('Lower Lake Serene', 'Water spikes room',  1337107), | ||||||
|         LocationData('Lower Lake Sirine', 'Underwater secret',  1337108, lambda state: state._timespinner_can_break_walls(world, player)), |         LocationData('Lower Lake Serene', 'Underwater secret',  1337108, lambda state: state._timespinner_can_break_walls(world, player)), | ||||||
|         LocationData('Lower Lake Sirine', 'T chest',  1337109), |         LocationData('Lower Lake Serene', 'T chest',  1337109), | ||||||
|         LocationData('Lower Lake Sirine', 'Past the eels',  1337110), |         LocationData('Lower Lake Serene', 'Past the eels',  1337110), | ||||||
|         LocationData('Lower Lake Sirine', 'Underwater pedestal',  1337111), |         LocationData('Lower Lake Serene', 'Underwater pedestal',  1337111), | ||||||
|         LocationData('Caves of Banishment (upper)', 'Mushroom double jump',  1337112, lambda state: state._timespinner_has_doublejump(world, player)), |         LocationData('Caves of Banishment (upper)', 'Mushroom double jump',  1337112, lambda state: state._timespinner_has_doublejump(world, player)), | ||||||
|         LocationData('Caves of Banishment (upper)', 'Caves of banishment secret room',  1337113), |         LocationData('Caves of Banishment (upper)', 'Caves of banishment secret room',  1337113), | ||||||
|         LocationData('Caves of Banishment (upper)', 'Below caves of banishment secret',  1337114), |         LocationData('Caves of Banishment (upper)', 'Below caves of banishment secret',  1337114), | ||||||
|  | @ -144,30 +144,30 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L | ||||||
|         LocationData('Caves of Banishment (Sirens)', 'Underwater sirens left',  1337125, lambda state: state.has('Water Mask', player)), |         LocationData('Caves of Banishment (Sirens)', 'Underwater sirens left',  1337125, lambda state: state.has('Water Mask', player)), | ||||||
|         LocationData('Caves of Banishment (Sirens)', 'Underwater sirens right',  1337126, lambda state: state.has('Water Mask', player)), |         LocationData('Caves of Banishment (Sirens)', 'Underwater sirens right',  1337126, lambda state: state.has('Water Mask', player)), | ||||||
|         LocationData('Caves of Banishment (Sirens)', 'Water hook',  1337127), |         LocationData('Caves of Banishment (Sirens)', 'Water hook',  1337127), | ||||||
|         LocationData('Caste Ramparts', 'Caste Bomber chest',  1337128, lambda state: state._timespinner_has_multiple_small_jumps_of_npc(world, player)), |         LocationData('Castle Ramparts', 'Castle Bomber chest',  1337128, lambda state: state._timespinner_has_multiple_small_jumps_of_npc(world, player)), | ||||||
|         LocationData('Caste Ramparts', 'Freeze the engineer',  1337129, lambda state: state.has('Talaria Attachment', player) or state._timespinner_has_timestop(world, player)), |         LocationData('Castle Ramparts', 'Freeze the engineer',  1337129, lambda state: state.has('Talaria Attachment', player) or state._timespinner_has_timestop(world, player)), | ||||||
|         LocationData('Caste Ramparts', 'Giantess guarded room',  1337130), |         LocationData('Castle Ramparts', 'Giantess guarded room',  1337130), | ||||||
|         LocationData('Caste Ramparts', 'Knight and archer guarded room',  1337131), |         LocationData('Castle Ramparts', 'Knight and archer guarded room',  1337131), | ||||||
|         LocationData('Caste Ramparts', 'Castle pedestal',  1337132), |         LocationData('Castle Ramparts', 'Castle pedestal',  1337132), | ||||||
|         LocationData('Caste Keep', 'Basement secret pedestal',  1337133, lambda state: state._timespinner_can_break_walls(world, player)), |         LocationData('Castle Keep', 'Basement secret pedestal',  1337133, lambda state: state._timespinner_can_break_walls(world, player)), | ||||||
|         LocationData('Caste Keep', 'Break the wall',  1337134), |         LocationData('Castle Keep', 'Break the wall',  1337134), | ||||||
|         LocationData('Royal towers (lower)', 'Yas queen room',  1337135, lambda state: state._timespinner_has_pink(world, player)), |         LocationData('Royal towers (lower)', 'Yas queen room',  1337135, lambda state: state._timespinner_has_pink(world, player)), | ||||||
|         LocationData('Caste Keep', 'Basement hammer',  1337136), |         LocationData('Castle Keep', 'Basement hammer',  1337136), | ||||||
|         LocationData('Caste Keep', 'Omelette chest',  1337137), |         LocationData('Castle Keep', 'Omelette chest',  1337137), | ||||||
|         LocationData('Caste Keep', 'Just an egg',  1337138), |         LocationData('Castle Keep', 'Just an egg',  1337138), | ||||||
|         LocationData('Caste Keep', 'Out of the way',  1337139), |         LocationData('Castle Keep', 'Out of the way',  1337139), | ||||||
|         LocationData('Caste Keep', 'Killed Twins',  EventId, lambda state: state._timespinner_has_timestop(world, player)), |         LocationData('Castle Keep', 'Killed Twins',  EventId, lambda state: state._timespinner_has_timestop(world, player)), | ||||||
|         LocationData('Caste Keep', 'Twins',  1337140, lambda state: state._timespinner_has_timestop(world, player)), |         LocationData('Castle Keep', 'Twins',  1337140, lambda state: state._timespinner_has_timestop(world, player)), | ||||||
|         LocationData('Caste Keep', 'Royal guard tiny room',  1337141, lambda state: state._timespinner_has_doublejump(world, player)), |         LocationData('Castle Keep', 'Royal guard tiny room',  1337141, lambda state: state._timespinner_has_doublejump(world, player)), | ||||||
|         LocationData('Royal towers (lower)', 'Royal tower floor secret',  1337142, lambda state: state._timespinner_has_doublejump(world, player) and state._timespinner_can_break_walls(world, player)), |         LocationData('Royal towers (lower)', 'Royal tower floor secret',  1337142, lambda state: state._timespinner_has_doublejump(world, player) and state._timespinner_can_break_walls(world, player)), | ||||||
|         LocationData('Royal towers', 'Above the gap',  1337143), |         LocationData('Royal towers', 'Above the gap',  1337143), | ||||||
|         LocationData('Royal towers', 'Under the ice mage',  1337144), |         LocationData('Royal towers', 'Under the ice mage',  1337144), | ||||||
|         LocationData('Royal towers (upper)', 'Next to easy struggle juggle room',  1337145), |         LocationData('Royal towers (upper)', 'Next to easy struggle juggle room',  1337145), | ||||||
|         LocationData('Royal towers (upper)', 'Easy struggle juggle',  1337146, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), |         LocationData('Royal towers (upper)', 'Easy struggle juggle',  1337146, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), | ||||||
|         LocationData('Royal towers (upper)', 'Hard struggle juggle',  1337147, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), |         LocationData('Royal towers (upper)', 'Hard struggle juggle',  1337147, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), | ||||||
|         LocationData('Royal towers (upper)', 'No sturggle required',  1337148, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), |         LocationData('Royal towers (upper)', 'No struggle required',  1337148, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), | ||||||
|         LocationData('Royal towers', 'Right tower freebie',  1337149), |         LocationData('Royal towers', 'Right tower freebie',  1337149), | ||||||
|         LocationData('Royal towers (upper)', 'Above the cide mage',  1337150), |         LocationData('Royal towers (upper)', 'Above the ice mage',  1337150), | ||||||
|         LocationData('Royal towers (upper)', 'Royal guard big room',  1337151), |         LocationData('Royal towers (upper)', 'Royal guard big room',  1337151), | ||||||
|         LocationData('Royal towers (upper)', 'Before Aelana',  1337152), |         LocationData('Royal towers (upper)', 'Before Aelana',  1337152), | ||||||
|         LocationData('Royal towers (upper)', 'Killed Aelana',  EventId), |         LocationData('Royal towers (upper)', 'Killed Aelana',  EventId), | ||||||
|  | @ -196,14 +196,14 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L | ||||||
| 
 | 
 | ||||||
|     downloadable_items: Tuple[LocationData, ...] = ( |     downloadable_items: Tuple[LocationData, ...] = ( | ||||||
|         # DownloadTerminals |         # DownloadTerminals | ||||||
|         LocationData('Libary', 'Library terminal 1',  1337157, lambda state: state.has('Tablet', player)), |         LocationData('Library', 'Library terminal 1',  1337157, lambda state: state.has('Tablet', player)), | ||||||
|         LocationData('Libary', 'Library terminal 2',  1337156, lambda state: state.has('Tablet', player)), |         LocationData('Library', 'Library terminal 2',  1337156, lambda state: state.has('Tablet', player)), | ||||||
|         # 1337158 Is Lost in time |         # 1337158 Is Lost in time | ||||||
|         LocationData('Libary', 'Library terminal 3',  1337159, lambda state: state.has('Tablet', player)), |         LocationData('Library', 'Library terminal 3',  1337159, lambda state: state.has('Tablet', player)), | ||||||
|         LocationData('Libary', 'V terminal 1',  1337160, lambda state: state.has_all(['Tablet', 'Library Keycard V'], player)), |         LocationData('Library', 'V terminal 1',  1337160, lambda state: state.has_all(['Tablet', 'Library Keycard V'], player)), | ||||||
|         LocationData('Libary', 'V terminal 2',  1337161, lambda state: state.has_all(['Tablet', 'Library Keycard V'], player)), |         LocationData('Library', 'V terminal 2',  1337161, lambda state: state.has_all(['Tablet', 'Library Keycard V'], player)), | ||||||
|         LocationData('Libary', 'V terminal 3',  1337162, lambda state: state.has_all(['Tablet', 'Library Keycard V'], player)), |         LocationData('Library', 'V terminal 3',  1337162, lambda state: state.has_all(['Tablet', 'Library Keycard V'], player)), | ||||||
|         LocationData('Libary top', 'Backer room terminal',  1337163, lambda state: state.has('Tablet', player)), |         LocationData('Library top', 'Backer room terminal',  1337163, lambda state: state.has('Tablet', player)), | ||||||
|         LocationData('Varndagroth tower right (elevator)', 'Medbay',  1337164, lambda state: state.has('Tablet', player) and state._timespinner_has_keycard_B(world, player)), |         LocationData('Varndagroth tower right (elevator)', 'Medbay',  1337164, lambda state: state.has('Tablet', player) and state._timespinner_has_keycard_B(world, player)), | ||||||
|         LocationData('The lab (upper)', 'Chest and download terminal',  1337165, lambda state: state.has('Tablet', player)), |         LocationData('The lab (upper)', 'Chest and download terminal',  1337165, lambda state: state.has('Tablet', player)), | ||||||
|         LocationData('The lab (power off)', 'Lab terminal middle',  1337166, lambda state: state.has('Tablet', player)), |         LocationData('The lab (power off)', 'Lab terminal middle',  1337166, lambda state: state.has('Tablet', player)), | ||||||
|  |  | ||||||
|  | @ -39,7 +39,7 @@ class Inverted(Toggle): | ||||||
|     display_name = "Inverted" |     display_name = "Inverted" | ||||||
| 
 | 
 | ||||||
| #class StinkyMaw(Toggle): | #class StinkyMaw(Toggle): | ||||||
| #    "Require gassmask for Maw" | #    "Require gasmask for Maw" | ||||||
| #    display_name = "Stinky Maw" | #    display_name = "Stinky Maw" | ||||||
| 
 | 
 | ||||||
| # Some options that are available in the timespinner randomizer arent currently implemented | # Some options that are available in the timespinner randomizer arent currently implemented | ||||||
|  |  | ||||||
|  | @ -12,8 +12,8 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Lake desolation'), |         create_region(world, player, locations_per_region, location_cache, 'Lake desolation'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Upper lake desolation'), |         create_region(world, player, locations_per_region, location_cache, 'Upper lake desolation'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Lower lake desolation'), |         create_region(world, player, locations_per_region, location_cache, 'Lower lake desolation'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Libary'), |         create_region(world, player, locations_per_region, location_cache, 'Library'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Libary top'), |         create_region(world, player, locations_per_region, location_cache, 'Library top'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Varndagroth tower left'), |         create_region(world, player, locations_per_region, location_cache, 'Varndagroth tower left'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Varndagroth tower right (upper)'), |         create_region(world, player, locations_per_region, location_cache, 'Varndagroth tower right (upper)'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Varndagroth tower right (lower)'), |         create_region(world, player, locations_per_region, location_cache, 'Varndagroth tower right (lower)'), | ||||||
|  | @ -30,13 +30,13 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Refugee Camp'), |         create_region(world, player, locations_per_region, location_cache, 'Refugee Camp'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Forest'), |         create_region(world, player, locations_per_region, location_cache, 'Forest'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Left Side forest Caves'), |         create_region(world, player, locations_per_region, location_cache, 'Left Side forest Caves'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Upper Lake Sirine'), |         create_region(world, player, locations_per_region, location_cache, 'Upper Lake Serene'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Lower Lake Sirine'), |         create_region(world, player, locations_per_region, location_cache, 'Lower Lake Serene'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Caves of Banishment (upper)'), |         create_region(world, player, locations_per_region, location_cache, 'Caves of Banishment (upper)'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Caves of Banishment (Maw)'), |         create_region(world, player, locations_per_region, location_cache, 'Caves of Banishment (Maw)'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Caves of Banishment (Sirens)'), |         create_region(world, player, locations_per_region, location_cache, 'Caves of Banishment (Sirens)'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Caste Ramparts'), |         create_region(world, player, locations_per_region, location_cache, 'Castle Ramparts'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Caste Keep'), |         create_region(world, player, locations_per_region, location_cache, 'Castle Keep'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Royal towers (lower)'), |         create_region(world, player, locations_per_region, location_cache, 'Royal towers (lower)'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Royal towers'), |         create_region(world, player, locations_per_region, location_cache, 'Royal towers'), | ||||||
|         create_region(world, player, locations_per_region, location_cache, 'Royal towers (upper)'), |         create_region(world, player, locations_per_region, location_cache, 'Royal towers (upper)'), | ||||||
|  | @ -50,20 +50,20 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData | ||||||
|     names: Dict[str, int] = {} |     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', '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)) |     connect(world, player, names, 'Lake desolation', 'Upper lake desolation', lambda state: state._timespinner_has_fire(world, player) and state.can_reach('Upper Lake Serene', 'Region', player)) | ||||||
|     connect(world, player, names, 'Lake desolation', 'Skeleton Shaft', lambda state: state._timespinner_has_doublejump(world, player)) |     connect(world, player, names, 'Lake desolation', 'Skeleton Shaft', lambda state: state._timespinner_has_doublejump(world, player)) | ||||||
|     connect(world, player, names, 'Lake desolation', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Lake desolation', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Upper lake desolation', 'Lake desolation') |     connect(world, player, names, 'Upper lake desolation', 'Lake desolation') | ||||||
|     connect(world, player, names, 'Upper lake desolation', 'Lower lake desolation')  |     connect(world, player, names, 'Upper lake desolation', 'Lower lake desolation')  | ||||||
|     connect(world, player, names, 'Lower lake desolation', 'Lake desolation')  |     connect(world, player, names, 'Lower lake desolation', 'Lake desolation')  | ||||||
|     connect(world, player, names, 'Lower lake desolation', 'Libary')  |     connect(world, player, names, 'Lower lake desolation', 'Library')  | ||||||
|     connect(world, player, names, 'Lower lake desolation', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     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, 'Library', '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, 'Library', 'Library 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_D(world, player)) |     connect(world, player, names, 'Library', '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, 'Library', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Libary top', 'Libary') |     connect(world, player, names, 'Library top', 'Library') | ||||||
|     connect(world, player, names, 'Varndagroth tower left', 'Libary') |     connect(world, player, names, 'Varndagroth tower left', 'Library') | ||||||
|     connect(world, player, names, 'Varndagroth tower left', 'Varndagroth tower right (upper)', lambda state: state._timespinner_has_keycard_C(world, player)) |     connect(world, player, names, 'Varndagroth tower left', 'Varndagroth tower right (upper)', lambda state: state._timespinner_has_keycard_C(world, player)) | ||||||
|     connect(world, player, names, 'Varndagroth tower left', 'Varndagroth tower right (lower)', lambda state: state._timespinner_has_keycard_B(world, player)) |     connect(world, player, names, 'Varndagroth tower left', 'Varndagroth tower right (lower)', lambda state: state._timespinner_has_keycard_B(world, player)) | ||||||
|     connect(world, player, names, 'Varndagroth tower left', 'Sealed Caves (Sirens)', lambda state: state._timespinner_has_keycard_B(world, player) and state.has('Elevator Keycard', player)) |     connect(world, player, names, 'Varndagroth tower left', 'Sealed Caves (Sirens)', lambda state: state._timespinner_has_keycard_B(world, player) and state.has('Elevator Keycard', player)) | ||||||
|  | @ -98,35 +98,35 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData | ||||||
|     connect(world, player, names, 'Sealed Caves (Xarion)', 'Sealed Caves (upper)', lambda state: state._timespinner_has_forwarddash_doublejump(world, player)) |     connect(world, player, names, 'Sealed Caves (Xarion)', 'Sealed Caves (upper)', lambda state: state._timespinner_has_forwarddash_doublejump(world, player)) | ||||||
|     connect(world, player, names, 'Sealed Caves (Xarion)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Sealed Caves (Xarion)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Refugee Camp', 'Forest') |     connect(world, player, names, 'Refugee Camp', 'Forest') | ||||||
|     connect(world, player, names, 'Refugee Camp', 'Libary', lambda state: not is_option_enabled(world, player, "Inverted")) |     connect(world, player, names, 'Refugee Camp', 'Library', lambda state: not is_option_enabled(world, player, "Inverted")) | ||||||
|     connect(world, player, names, 'Refugee Camp', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Refugee Camp', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Forest', 'Refugee Camp') |     connect(world, player, names, 'Forest', 'Refugee Camp') | ||||||
|     connect(world, player, names, 'Forest', 'Left Side forest Caves', lambda state: state.has('Talaria Attachment', player) or state._timespinner_has_timestop(world, player)) |     connect(world, player, names, 'Forest', 'Left Side forest Caves', lambda state: state.has('Talaria Attachment', player) or state._timespinner_has_timestop(world, player)) | ||||||
|     connect(world, player, names, 'Forest', 'Caves of Banishment (Sirens)') |     connect(world, player, names, 'Forest', 'Caves of Banishment (Sirens)') | ||||||
|     connect(world, player, names, 'Forest', 'Caste Ramparts') |     connect(world, player, names, 'Forest', 'Castle Ramparts') | ||||||
|     connect(world, player, names, 'Left Side forest Caves', 'Forest') |     connect(world, player, names, 'Left Side forest Caves', 'Forest') | ||||||
|     connect(world, player, names, 'Left Side forest Caves', 'Upper Lake Sirine', lambda state: state._timespinner_has_timestop(world, player)) |     connect(world, player, names, 'Left Side forest Caves', 'Upper Lake Serene', lambda state: state._timespinner_has_timestop(world, player)) | ||||||
|     connect(world, player, names, 'Left Side forest Caves', 'Lower Lake Sirine', lambda state: state.has('Water Mask', player)) |     connect(world, player, names, 'Left Side forest Caves', 'Lower Lake Serene', lambda state: state.has('Water Mask', player)) | ||||||
|     connect(world, player, names, 'Left Side forest Caves', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Left Side forest Caves', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Upper Lake Sirine', 'Left Side forest Caves') |     connect(world, player, names, 'Upper Lake Serene', 'Left Side forest Caves') | ||||||
|     connect(world, player, names, 'Upper Lake Sirine', 'Lower Lake Sirine', lambda state: state.has('Water Mask', player)) |     connect(world, player, names, 'Upper Lake Serene', 'Lower Lake Serene', lambda state: state.has('Water Mask', player)) | ||||||
|     connect(world, player, names, 'Lower Lake Sirine', 'Upper Lake Sirine') |     connect(world, player, names, 'Lower Lake Serene', 'Upper Lake Serene') | ||||||
|     connect(world, player, names, 'Lower Lake Sirine', 'Left Side forest Caves') |     connect(world, player, names, 'Lower Lake Serene', 'Left Side forest Caves') | ||||||
|     connect(world, player, names, 'Lower Lake Sirine', 'Caves of Banishment (upper)') |     connect(world, player, names, 'Lower Lake Serene', 'Caves of Banishment (upper)') | ||||||
|     connect(world, player, names, 'Caves of Banishment (upper)', 'Upper Lake Sirine', lambda state: state.has('Water Mask', player)) |     connect(world, player, names, 'Caves of Banishment (upper)', 'Upper Lake Serene', lambda state: state.has('Water Mask', player)) | ||||||
|     connect(world, player, names, 'Caves of Banishment (upper)', 'Caves of Banishment (Maw)', lambda state: state.has('Twin Pyramid Key', player) or state._timespinner_has_forwarddash_doublejump(world, player)) |     connect(world, player, names, 'Caves of Banishment (upper)', 'Caves of Banishment (Maw)', lambda state: state.has('Twin Pyramid Key', player) or state._timespinner_has_forwarddash_doublejump(world, player)) | ||||||
|     connect(world, player, names, 'Caves of Banishment (upper)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Caves of Banishment (upper)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Caves of Banishment (Maw)', 'Caves of Banishment (upper)', lambda state: state._timespinner_has_forwarddash_doublejump(world, player)) |     connect(world, player, names, 'Caves of Banishment (Maw)', 'Caves of Banishment (upper)', lambda state: state._timespinner_has_forwarddash_doublejump(world, player)) | ||||||
|     connect(world, player, names, 'Caves of Banishment (Maw)', 'Caves of Banishment (Sirens)', lambda state: state.has('Gas Mask', player)) |     connect(world, player, names, 'Caves of Banishment (Maw)', 'Caves of Banishment (Sirens)', lambda state: state.has('Gas Mask', player)) | ||||||
|     connect(world, player, names, 'Caves of Banishment (Maw)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Caves of Banishment (Maw)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Caves of Banishment (Sirens)', 'Forest') |     connect(world, player, names, 'Caves of Banishment (Sirens)', 'Forest') | ||||||
|     connect(world, player, names, 'Caste Ramparts', 'Forest') |     connect(world, player, names, 'Castle Ramparts', 'Forest') | ||||||
|     connect(world, player, names, 'Caste Ramparts', 'Caste Keep') |     connect(world, player, names, 'Castle Ramparts', 'Castle Keep') | ||||||
|     connect(world, player, names, 'Caste Ramparts', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Castle Ramparts', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Caste Keep', 'Caste Ramparts') |     connect(world, player, names, 'Castle Keep', 'Castle Ramparts') | ||||||
|     connect(world, player, names, 'Caste Keep', 'Royal towers (lower)', lambda state: state._timespinner_has_doublejump(world, player)) |     connect(world, player, names, 'Castle Keep', 'Royal towers (lower)', lambda state: state._timespinner_has_doublejump(world, player)) | ||||||
|     connect(world, player, names, 'Caste Keep', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Castle Keep', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Royal towers (lower)', 'Caste Keep') |     connect(world, player, names, 'Royal towers (lower)', 'Castle Keep') | ||||||
|     connect(world, player, names, 'Royal towers (lower)', 'Royal towers', lambda state: state.has('Timespinner Wheel', player) or state._timespinner_has_forwarddash_doublejump(world, player)) |     connect(world, player, names, 'Royal towers (lower)', 'Royal towers', lambda state: state.has('Timespinner Wheel', player) or state._timespinner_has_forwarddash_doublejump(world, player)) | ||||||
|     connect(world, player, names, 'Royal towers (lower)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) |     connect(world, player, names, 'Royal towers (lower)', 'Space time continuum', lambda state: state.has('Twin Pyramid Key', player)) | ||||||
|     connect(world, player, names, 'Royal towers', 'Royal towers (lower)') |     connect(world, player, names, 'Royal towers', 'Royal towers (lower)') | ||||||
|  | @ -137,14 +137,14 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData | ||||||
|     connect(world, player, names, 'Ancient Pyramid (right)', 'Ancient Pyramid (left)', lambda state: state._timespinner_has_upwarddash(world, player)) |     connect(world, player, names, 'Ancient Pyramid (right)', 'Ancient Pyramid (left)', lambda state: state._timespinner_has_upwarddash(world, player)) | ||||||
|     connect(world, player, names, 'Space time continuum', 'Lake desolation', lambda state: pyramid_keys_unlock == "GateLakeDesolation") |     connect(world, player, names, 'Space time continuum', 'Lake desolation', lambda state: pyramid_keys_unlock == "GateLakeDesolation") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Lower lake desolation', lambda state: pyramid_keys_unlock == "GateKittyBoss") |     connect(world, player, names, 'Space time continuum', 'Lower lake desolation', lambda state: pyramid_keys_unlock == "GateKittyBoss") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Libary', lambda state: pyramid_keys_unlock == "GateLeftLibrary") |     connect(world, player, names, 'Space time continuum', 'Library', lambda state: pyramid_keys_unlock == "GateLeftLibrary") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Varndagroth tower right (lower)', lambda state: pyramid_keys_unlock == "GateMilitairyGate") |     connect(world, player, names, 'Space time continuum', 'Varndagroth tower right (lower)', lambda state: pyramid_keys_unlock == "GateMilitairyGate") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Skeleton Shaft', lambda state: pyramid_keys_unlock == "GateSealedCaves") |     connect(world, player, names, 'Space time continuum', 'Skeleton Shaft', lambda state: pyramid_keys_unlock == "GateSealedCaves") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Sealed Caves (Sirens)', lambda state: pyramid_keys_unlock == "GateSealedSirensCave") |     connect(world, player, names, 'Space time continuum', 'Sealed Caves (Sirens)', lambda state: pyramid_keys_unlock == "GateSealedSirensCave") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Left Side forest Caves', lambda state: pyramid_keys_unlock == "GateLakeSirineRight") |     connect(world, player, names, 'Space time continuum', 'Left Side forest Caves', lambda state: pyramid_keys_unlock == "GateLakeSereneRight") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Refugee Camp', lambda state: pyramid_keys_unlock == "GateAccessToPast") |     connect(world, player, names, 'Space time continuum', 'Refugee Camp', lambda state: pyramid_keys_unlock == "GateAccessToPast") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Caste Ramparts', lambda state: pyramid_keys_unlock == "GateCastleRamparts") |     connect(world, player, names, 'Space time continuum', 'Castle Ramparts', lambda state: pyramid_keys_unlock == "GateCastleRamparts") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Caste Keep', lambda state: pyramid_keys_unlock == "GateCastleKeep") |     connect(world, player, names, 'Space time continuum', 'Castle Keep', lambda state: pyramid_keys_unlock == "GateCastleKeep") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Royal towers (lower)', lambda state: pyramid_keys_unlock == "GateRoyalTowers") |     connect(world, player, names, 'Space time continuum', 'Royal towers (lower)', lambda state: pyramid_keys_unlock == "GateRoyalTowers") | ||||||
|     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 (Maw)', lambda state: pyramid_keys_unlock == "GateMaw") | ||||||
|     connect(world, player, names, 'Space time continuum', 'Caves of Banishment (upper)', lambda state: pyramid_keys_unlock == "GateCavesOfBanishment") |     connect(world, player, names, 'Space time continuum', 'Caves of Banishment (upper)', lambda state: pyramid_keys_unlock == "GateCavesOfBanishment") | ||||||
|  |  | ||||||
|  | @ -18,7 +18,7 @@ class TimespinnerWorld(World): | ||||||
|     game = "Timespinner" |     game = "Timespinner" | ||||||
|     topology_present = True |     topology_present = True | ||||||
|     remote_items = False |     remote_items = False | ||||||
|     data_version = 2 |     data_version = 3 | ||||||
| 
 | 
 | ||||||
|     item_name_to_id = {name: data.code for name, data in item_table.items()} |     item_name_to_id = {name: data.code for name, data in item_table.items()} | ||||||
|     location_name_to_id = {location.name: location.code for location in get_locations(None, None)} |     location_name_to_id = {location.name: location.code for location in get_locations(None, None)} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue