morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Timespinner: some reformatting and type fixes

Browse Source
This commit is contained in:
Fabian Dill
2021-09-25 02:31:32 +02:00
parent 1cef10b309
commit 59529eba4e
2 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worlds/timespinner/Locations.py
View File

@@ -4,14 +4,16 @@ from .Options import is_option_enabled
EventId: Optional[int] = None
class LocationData(NamedTuple):
region: str
name: str
code: Optional[int]
rule: Callable = lambda state: True
def get_locations(world: MultiWorld, player: int):
location_table: Tuple[LocationData] = (
def get_locations(world: Optional[MultiWorld], player: Optional[int]):
location_table: Tuple[LocationData, ...] = (
# PresentItemLocations
LocationData('Tutorial', 'Yo Momma 1', 1337000),
LocationData('Tutorial', 'Yo Momma 2', 1337001),
@@ -194,7 +196,7 @@ def get_locations(world: MultiWorld, player: int):
LocationData('Ancient Pyramid (right)', 'Killed Nightmare', EventId)
)
downloadable_items: Tuple[LocationData] = (
downloadable_items: Tuple[LocationData, ...] = (
# DownloadTerminals
LocationData('Libary', 'Library terminal 1', 1337157, lambda state: state.has('Tablet', player)),
LocationData('Libary', 'Library terminal 2', 1337156, lambda state: state.has('Tablet', player)),
@@ -217,7 +219,7 @@ def get_locations(world: MultiWorld, player: int):
else:
return location_table
starter_progression_locations: Tuple[str] = (
starter_progression_locations: Tuple[str, ...] = (
'Starter chest 2',
'Starter chest 3',
'Starter chest 1',