mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-27 20:43:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary Optional from LocData

Browse Source
This commit is contained in:
CookieCat
2024-05-13 15:49:03 -04:00
parent e33c5cc352
commit e7c2bea613
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
worlds/ahit/Rules.py
View File

@@ -229,7 +229,7 @@ def set_rules(world: "HatInTimeWorld"):
and can_use_hat(state, world, HatType.BREWING) and can_use_hat(state, world, HatType.DWELLER))
if world.is_dlc1():
add_rule(world.multiworld.get_entrance("Telescope -> The Arctic Cruise", world.player),
add_rule(world.multiworld.get_entrance("Telescope -> Arctic Cruise", world.player),
lambda state: state.has("Time Piece", world.player, world.chapter_timepiece_costs[ChapterIndex.ALPINE])
and state.has("Time Piece", world.player, world.chapter_timepiece_costs[ChapterIndex.CRUISE]))
@@ -253,8 +253,7 @@ def set_rules(world: "HatInTimeWorld"):
loc = world.multiworld.get_location(key, world.player)
for hat in data.required_hats:
if hat is not HatType.NONE:
add_rule(loc, lambda state, h=hat: can_use_hat(state, world, h))
add_rule(loc, lambda state, h=hat: can_use_hat(state, world, h))
if data.hookshot:
add_rule(loc, lambda state: can_use_hookshot(state, world))

22
worlds/ahit/Types.py
View File

@@ -55,21 +55,21 @@ class Difficulty(IntEnum):
class LocData(NamedTuple):
id: Optional[int] = 0
region: Optional[str] = ""
required_hats: Optional[List[HatType]] = [HatType.NONE]
hookshot: Optional[bool] = False
dlc_flags: Optional[HatDLC] = HatDLC.none
paintings: Optional[int] = 0 # Paintings required for Subcon painting shuffle
misc_required: Optional[List[str]] = []
id: int = 0
region: str = ""
required_hats: List[HatType] = []
hookshot: bool = False
dlc_flags: HatDLC = HatDLC.none
paintings: int = 0 # Paintings required for Subcon painting shuffle
misc_required: List[str] = []
# For UmbrellaLogic setting only.
hit_type: Optional[HitType] = HitType.none
hit_type: HitType = HitType.none
# Other
act_event: Optional[bool] = False # Only used for event locations. Copy access rule from act completion
nyakuza_thug: Optional[str] = "" # Name of Nyakuza thug NPC (for metro shops)
snatcher_coin: Optional[str] = "" # Only for Snatcher Coin event locations, name of the Snatcher Coin item
act_event: bool = False # Only used for event locations. Copy access rule from act completion
nyakuza_thug: str = "" # Name of Nyakuza thug NPC (for metro shops)
snatcher_coin: str = "" # Only for Snatcher Coin event locations, name of the Snatcher Coin item
class ItemData(NamedTuple):