diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-05-22 20:09:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-23 02:09:52 +0200 |
commit | e41bdceb052334f2c86a78ba41411a9c85df7cc5 (patch) | |
tree | 617719d43319e041236d17b740924fa0ce9a1242 /utils/pickle_static_data.py | |
parent | 808daa5b230aa0912671b263edc6de2c71b73a6a (diff) | |
download | lingo-apworld-e41bdceb052334f2c86a78ba41411a9c85df7cc5.tar.gz lingo-apworld-e41bdceb052334f2c86a78ba41411a9c85df7cc5.tar.bz2 lingo-apworld-e41bdceb052334f2c86a78ba41411a9c85df7cc5.zip |
Lingo: Minor logic fixes (part 2) (#3250)
* Lingo: Minor logic fixes (part 2) * Update the datafile * Renamed Fearless Mastery * Move Rhyme Room LEAP into upper room * Rename Artistic achievement location * Fix broken wondrous painting * Added a test for the Wondrous painting thing
Diffstat (limited to 'utils/pickle_static_data.py')
-rw-r--r-- | utils/pickle_static_data.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/pickle_static_data.py b/utils/pickle_static_data.py index 10ec69b..e40c21c 100644 --- a/utils/pickle_static_data.py +++ b/utils/pickle_static_data.py | |||
@@ -150,8 +150,6 @@ def process_entrance(source_room, doors, room_obj): | |||
150 | def process_panel(room_name, panel_name, panel_data): | 150 | def process_panel(room_name, panel_name, panel_data): |
151 | global PANELS_BY_ROOM | 151 | global PANELS_BY_ROOM |
152 | 152 | ||
153 | full_name = f"{room_name} - {panel_name}" | ||
154 | |||
155 | # required_room can either be a single room or a list of rooms. | 153 | # required_room can either be a single room or a list of rooms. |
156 | if "required_room" in panel_data: | 154 | if "required_room" in panel_data: |
157 | if isinstance(panel_data["required_room"], list): | 155 | if isinstance(panel_data["required_room"], list): |
@@ -229,8 +227,13 @@ def process_panel(room_name, panel_name, panel_data): | |||
229 | else: | 227 | else: |
230 | non_counting = False | 228 | non_counting = False |
231 | 229 | ||
230 | if "location_name" in panel_data: | ||
231 | location_name = panel_data["location_name"] | ||
232 | else: | ||
233 | location_name = None | ||
234 | |||
232 | panel_obj = Panel(required_rooms, required_doors, required_panels, colors, check, event, exclude_reduce, | 235 | panel_obj = Panel(required_rooms, required_doors, required_panels, colors, check, event, exclude_reduce, |
233 | achievement, non_counting) | 236 | achievement, non_counting, location_name) |
234 | PANELS_BY_ROOM[room_name][panel_name] = panel_obj | 237 | PANELS_BY_ROOM[room_name][panel_name] = panel_obj |
235 | 238 | ||
236 | 239 | ||