diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-07-26 04:53:11 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-26 10:53:11 +0200 |
commit | 7641d9590110fa7b4901c7f7ca0384392ef24375 (patch) | |
tree | 8efdfa5be3a88879a690a4a7351eb7b635989dc7 /datatypes.py | |
parent | 00c16023c45301224400a06f31f637fdedba00ee (diff) | |
download | lingo-apworld-7641d9590110fa7b4901c7f7ca0384392ef24375.tar.gz lingo-apworld-7641d9590110fa7b4901c7f7ca0384392ef24375.tar.bz2 lingo-apworld-7641d9590110fa7b4901c7f7ca0384392ef24375.zip |
Lingo: Add panels mode door shuffle (#3163)
* Created panels mode door shuffle * Added some panel door item names * Remove RUNT TURN panel door Not really useful. * Fix logic with First SIX related stuff * Add group_doors to slot data * Fix LEVEL 2 behavior with panels mode * Fixed unit tests * Fixed duplicate IDs from merge * Just regenerated new IDs * Fixed duplication of color and door group items * Removed unnecessary unit test option * Fix The Seeker being achievable without entrance door * Fix The Observant being achievable without locked panels * Added some more panel doors * Added Progressive Suits Area * Lingo: Fix Basement access with THE MASTER * Added indirect conditions for MASTER-blocked entrances * Fixed Incomparable achievement access * Fix STAIRS panel logic * Fix merge error with good items * Is this clearer? * DREAD and TURN LEARN * Allow a weird edge case for reduced locations Panels mode door shuffle + grouped doors + color shuffle + pilgrimage enabled is exactly the right number of items for reduced locations. Removing color shuffle also allows for disabling pilgrimage, adding sunwarp locking, or both, with a couple of locations left over. * Prevent small sphere one on panels mode * Added shuffle_doors aliases for old options * Fixed a unit test * Updated datafile * Tweaked requirements for reduced locations * Added player name to OptionError messages * Update generated.dat
Diffstat (limited to 'datatypes.py')
-rw-r--r-- | datatypes.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/datatypes.py b/datatypes.py index 36141da..9521422 100644 --- a/datatypes.py +++ b/datatypes.py | |||
@@ -12,6 +12,11 @@ class RoomAndPanel(NamedTuple): | |||
12 | panel: str | 12 | panel: str |
13 | 13 | ||
14 | 14 | ||
15 | class RoomAndPanelDoor(NamedTuple): | ||
16 | room: Optional[str] | ||
17 | panel_door: str | ||
18 | |||
19 | |||
15 | class EntranceType(Flag): | 20 | class EntranceType(Flag): |
16 | NORMAL = auto() | 21 | NORMAL = auto() |
17 | PAINTING = auto() | 22 | PAINTING = auto() |
@@ -63,9 +68,15 @@ class Panel(NamedTuple): | |||
63 | exclude_reduce: bool | 68 | exclude_reduce: bool |
64 | achievement: bool | 69 | achievement: bool |
65 | non_counting: bool | 70 | non_counting: bool |
71 | panel_door: Optional[RoomAndPanelDoor] # This will always be fully specified. | ||
66 | location_name: Optional[str] | 72 | location_name: Optional[str] |
67 | 73 | ||
68 | 74 | ||
75 | class PanelDoor(NamedTuple): | ||
76 | item_name: str | ||
77 | panel_group: Optional[str] | ||
78 | |||
79 | |||
69 | class Painting(NamedTuple): | 80 | class Painting(NamedTuple): |
70 | id: str | 81 | id: str |
71 | room: str | 82 | room: str |