Noita: Do some cleanup to make mypy happy (#3114)

This commit is contained in:
Scipio Wright 2024-04-13 19:21:20 -04:00 committed by GitHub
parent 56ec0e902d
commit feaae1db12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions

View File

@ -38,7 +38,7 @@ class NoitaWorld(World):
web = NoitaWeb() web = NoitaWeb()
def generate_early(self): def generate_early(self) -> None:
if not self.multiworld.get_player_name(self.player).isascii(): if not self.multiworld.get_player_name(self.player).isascii():
raise Exception("Noita yaml's slot name has invalid character(s).") raise Exception("Noita yaml's slot name has invalid character(s).")

View File

@ -12,7 +12,7 @@ class NoitaLocation(Location):
class LocationData(NamedTuple): class LocationData(NamedTuple):
id: int id: int
flag: int = 0 flag: int = 0
ltype: Optional[str] = "shop" ltype: str = "shop"
class LocationFlag(IntEnum): class LocationFlag(IntEnum):

View File

@ -41,7 +41,7 @@ def create_regions(world: "NoitaWorld") -> Dict[str, Region]:
# An "Entrance" is really just a connection between two regions # An "Entrance" is really just a connection between two regions
def create_entrance(player: int, source: str, destination: str, regions: Dict[str, Region]): def create_entrance(player: int, source: str, destination: str, regions: Dict[str, Region]) -> Entrance:
entrance = Entrance(player, f"From {source} To {destination}", regions[source]) entrance = Entrance(player, f"From {source} To {destination}", regions[source])
entrance.connect(regions[destination]) entrance.connect(regions[destination])
return entrance return entrance

View File

@ -68,7 +68,7 @@ def has_orb_count(state: CollectionState, player: int, amount: int) -> bool:
return state.count("Orb", player) >= amount return state.count("Orb", player) >= amount
def forbid_items_at_locations(world: "NoitaWorld", shop_locations: Set[str], forbidden_items: Set[str]): def forbid_items_at_locations(world: "NoitaWorld", shop_locations: Set[str], forbidden_items: Set[str]) -> None:
for shop_location in shop_locations: for shop_location in shop_locations:
location = world.multiworld.get_location(shop_location, world.player) location = world.multiworld.get_location(shop_location, world.player)
GenericRules.forbid_items_for_player(location, forbidden_items, world.player) GenericRules.forbid_items_for_player(location, forbidden_items, world.player)
@ -129,7 +129,7 @@ def holy_mountain_unlock_conditions(world: "NoitaWorld") -> None:
) )
def biome_unlock_conditions(world: "NoitaWorld"): def biome_unlock_conditions(world: "NoitaWorld") -> None:
lukki_entrances = world.multiworld.get_region("Lukki Lair", world.player).entrances lukki_entrances = world.multiworld.get_region("Lukki Lair", world.player).entrances
magical_entrances = world.multiworld.get_region("Magical Temple", world.player).entrances magical_entrances = world.multiworld.get_region("Magical Temple", world.player).entrances
wizard_entrances = world.multiworld.get_region("Wizards' Den", world.player).entrances wizard_entrances = world.multiworld.get_region("Wizards' Den", world.player).entrances