monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lingo: Move datafiles into a subdirectory (#2459)

This commit is contained in:
Star Rauchenberger 2023-11-24 12:11:34 -05:00 committed by GitHub
parent c5b0330223
commit a18fb0a14f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
worlds/lingo/LL1.yaml → worlds/lingo/data/LL1.yaml
View File

@ -42,6 +42,8 @@
# this panel. # this panel.
# - non_counting: If True, this panel does not contribute to the total needed # - non_counting: If True, this panel does not contribute to the total needed
# to unlock Level 2. # to unlock Level 2.
# - hunt: If True, the tracker will show this panel even when it is
# not a check. Used for hunts like the Number Hunt.
# #
# doors is an array of doors associated with this room. When door # doors is an array of doors associated with this room. When door
# randomization is enabled, each of these is an item. The key is a name that # randomization is enabled, each of these is an item. The key is a name that
@ -449,6 +451,7 @@
FOUR: FOUR:
id: Backside Room/Panel_four_four_3 id: Backside Room/Panel_four_four_3
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Outside The Undeterred room: Outside The Undeterred
door: Fours door: Fours
@ -521,12 +524,14 @@
FOUR: FOUR:
id: Backside Room/Panel_four_four_2 id: Backside Room/Panel_four_four_2
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Outside The Undeterred room: Outside The Undeterred
door: Fours door: Fours
EIGHT: EIGHT:
id: Backside Room/Panel_eight_eight_8 id: Backside Room/Panel_eight_eight_8
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Eights door: Eights
@ -551,6 +556,7 @@
MASTERY: MASTERY:
id: Master Room/Panel_mastery_mastery14 id: Master Room/Panel_mastery_mastery14
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
@ -662,6 +668,7 @@
EIGHT: EIGHT:
id: Backside Room/Panel_eight_eight_5 id: Backside Room/Panel_eight_eight_5
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Eights door: Eights
@ -843,6 +850,7 @@
NINE: NINE:
id: Backside Room/Panel_nine_nine_3 id: Backside Room/Panel_nine_nine_3
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines
@ -1055,17 +1063,20 @@
PURPLE: PURPLE:
id: Color Arrow Room/Panel_purple_afar id: Color Arrow Room/Panel_purple_afar
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Purple Barrier door: Purple Barrier
FIVE (1): FIVE (1):
id: Backside Room/Panel_five_five_5 id: Backside Room/Panel_five_five_5
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Outside The Undeterred room: Outside The Undeterred
door: Fives door: Fives
FIVE (2): FIVE (2):
id: Backside Room/Panel_five_five_4 id: Backside Room/Panel_five_five_4
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Outside The Undeterred room: Outside The Undeterred
door: Fives door: Fives
@ -1296,12 +1307,14 @@
MASTERY (1): MASTERY (1):
id: Master Room/Panel_mastery_mastery5 id: Master Room/Panel_mastery_mastery5
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
MASTERY (2): MASTERY (2):
id: Master Room/Panel_mastery_mastery9 id: Master Room/Panel_mastery_mastery9
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
@ -1545,6 +1558,7 @@
BACKSIDE: BACKSIDE:
id: Backside Room/Panel_backside_2 id: Backside Room/Panel_backside_2
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Backside Door door: Backside Door
STAIRS: STAIRS:
@ -1912,6 +1926,7 @@
RED: RED:
id: Color Arrow Room/Panel_red_afar id: Color Arrow Room/Panel_red_afar
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Red Barrier door: Red Barrier
DEER + WREN: DEER + WREN:
@ -2013,6 +2028,7 @@
EIGHT: EIGHT:
id: Backside Room/Panel_eight_eight_3 id: Backside Room/Panel_eight_eight_3
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Eights door: Eights
@ -2058,6 +2074,7 @@
NINE: NINE:
id: Backside Room/Panel_nine_nine_2 id: Backside Room/Panel_nine_nine_2
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines
@ -2163,6 +2180,7 @@
# accessed by jumping from the top of the tower. # accessed by jumping from the top of the tower.
id: Master Room/Panel_mastery_mastery8 id: Master Room/Panel_mastery_mastery8
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Mastery door: Mastery
doors: doors:
@ -2234,36 +2252,42 @@
MASTERY (1): MASTERY (1):
id: Master Room/Panel_mastery_mastery6 id: Master Room/Panel_mastery_mastery6
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
MASTERY (2): MASTERY (2):
id: Master Room/Panel_mastery_mastery7 id: Master Room/Panel_mastery_mastery7
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
MASTERY (3): MASTERY (3):
id: Master Room/Panel_mastery_mastery10 id: Master Room/Panel_mastery_mastery10
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
MASTERY (4): MASTERY (4):
id: Master Room/Panel_mastery_mastery11 id: Master Room/Panel_mastery_mastery11
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
MASTERY (5): MASTERY (5):
id: Master Room/Panel_mastery_mastery12 id: Master Room/Panel_mastery_mastery12
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
MASTERY (6): MASTERY (6):
id: Master Room/Panel_mastery_mastery15 id: Master Room/Panel_mastery_mastery15
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
@ -2279,6 +2303,7 @@
MASTERY: MASTERY:
id: Master Room/Panel_mastery_mastery3 id: Master Room/Panel_mastery_mastery3
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
@ -2309,9 +2334,11 @@
id: Strand Room/Panel_i_staring id: Strand Room/Panel_i_staring
colors: blue colors: blue
tag: forbid tag: forbid
hunt: True
GREEN: GREEN:
id: Color Arrow Room/Panel_green_afar id: Color Arrow Room/Panel_green_afar
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Green Barrier door: Green Barrier
PINECONE: PINECONE:
@ -2356,9 +2383,11 @@
BACKSIDE: BACKSIDE:
id: Backside Room/Panel_backside_3 id: Backside Room/Panel_backside_3
tag: midwhite tag: midwhite
hunt: True
NINE: NINE:
id: Backside Room/Panel_nine_nine_8 id: Backside Room/Panel_nine_nine_8
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines
@ -2725,35 +2754,41 @@
SEVEN (1): SEVEN (1):
id: Backside Room/Panel_seven_seven_5 id: Backside Room/Panel_seven_seven_5
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sevens door: Sevens
SEVEN (2): SEVEN (2):
id: Backside Room/Panel_seven_seven_6 id: Backside Room/Panel_seven_seven_6
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sevens door: Sevens
EIGHT: EIGHT:
id: Backside Room/Panel_eight_eight_7 id: Backside Room/Panel_eight_eight_7
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Eights door: Eights
NINE: NINE:
id: Backside Room/Panel_nine_nine_4 id: Backside Room/Panel_nine_nine_4
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines
BLUE: BLUE:
id: Color Arrow Room/Panel_blue_afar id: Color Arrow Room/Panel_blue_afar
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Blue Barrier door: Blue Barrier
ORANGE: ORANGE:
id: Color Arrow Room/Panel_orange_afar id: Color Arrow Room/Panel_orange_afar
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Orange Barrier door: Orange Barrier
UNCOVER: UNCOVER:
@ -3077,6 +3112,7 @@
FOUR: FOUR:
id: Backside Room/Panel_four_four_4 id: Backside Room/Panel_four_four_4
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Outside The Undeterred room: Outside The Undeterred
door: Fours door: Fours
@ -3135,12 +3171,14 @@
SIX: SIX:
id: Backside Room/Panel_six_six_4 id: Backside Room/Panel_six_six_4
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sixes door: Sixes
NINE: NINE:
id: Backside Room/Panel_nine_nine_5 id: Backside Room/Panel_nine_nine_5
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines
@ -3804,46 +3842,54 @@
FIVE (1): FIVE (1):
id: Backside Room/Panel_five_five_3 id: Backside Room/Panel_five_five_3
tag: midwhite tag: midwhite
hunt: True
required_panel: required_panel:
panel: LIGHT panel: LIGHT
FIVE (2): FIVE (2):
id: Backside Room/Panel_five_five_2 id: Backside Room/Panel_five_five_2
tag: midwhite tag: midwhite
hunt: True
required_panel: required_panel:
panel: WARD panel: WARD
SIX (1): SIX (1):
id: Backside Room/Panel_six_six_3 id: Backside Room/Panel_six_six_3
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sixes door: Sixes
SIX (2): SIX (2):
id: Backside Room/Panel_six_six_2 id: Backside Room/Panel_six_six_2
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sixes door: Sixes
SEVEN: SEVEN:
id: Backside Room/Panel_seven_seven_2 id: Backside Room/Panel_seven_seven_2
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sevens door: Sevens
EIGHT: EIGHT:
id: Backside Room/Panel_eight_eight_2 id: Backside Room/Panel_eight_eight_2
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Eights door: Eights
NINE: NINE:
id: Backside Room/Panel_nine_nine_6 id: Backside Room/Panel_nine_nine_6
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines
BACKSIDE: BACKSIDE:
id: Backside Room/Panel_backside_4 id: Backside Room/Panel_backside_4
tag: midwhite tag: midwhite
hunt: True
"834283054": "834283054":
id: Tower Room/Panel_834283054_undaunted id: Tower Room/Panel_834283054_undaunted
colors: orange colors: orange
@ -3864,6 +3910,7 @@
YELLOW: YELLOW:
id: Color Arrow Room/Panel_yellow_afar id: Color Arrow Room/Panel_yellow_afar
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Yellow Barrier door: Yellow Barrier
WADED + WEE: WADED + WEE:
@ -4100,6 +4147,7 @@
BACKSIDE: BACKSIDE:
id: Backside Room/Panel_backside_5 id: Backside Room/Panel_backside_5
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
door: Backside Door door: Backside Door
PART: PART:
@ -4144,6 +4192,7 @@
colors: colors:
- red - red
- yellow - yellow
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sixes door: Sixes
@ -4221,6 +4270,7 @@
colors: colors:
- red - red
- yellow - yellow
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Sixes door: Sixes
@ -4547,6 +4597,7 @@
MASTERY: MASTERY:
id: Master Room/Panel_mastery_mastery2 id: Master Room/Panel_mastery_mastery2
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
@ -4988,18 +5039,21 @@
SEVEN (1): SEVEN (1):
id: Backside Room/Panel_seven_seven_7 id: Backside Room/Panel_seven_seven_7
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
- room: Number Hunt - room: Number Hunt
door: Sevens door: Sevens
SEVEN (2): SEVEN (2):
id: Backside Room/Panel_seven_seven_3 id: Backside Room/Panel_seven_seven_3
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
- room: Number Hunt - room: Number Hunt
door: Sevens door: Sevens
SEVEN (3): SEVEN (3):
id: Backside Room/Panel_seven_seven_4 id: Backside Room/Panel_seven_seven_4
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
- room: Number Hunt - room: Number Hunt
door: Sevens door: Sevens
@ -5598,6 +5652,7 @@
EIGHT: EIGHT:
id: Backside Room/Panel_eight_eight_4 id: Backside Room/Panel_eight_eight_4
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Eights door: Eights
@ -5797,6 +5852,7 @@
MASTERY: MASTERY:
id: Master Room/Panel_mastery_mastery4 id: Master Room/Panel_mastery_mastery4
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
@ -5915,9 +5971,11 @@
id: Strand Room/Panel_a_strands id: Strand Room/Panel_a_strands
colors: blue colors: blue
tag: forbid tag: forbid
hunt: True
NINE: NINE:
id: Backside Room/Panel_nine_nine_7 id: Backside Room/Panel_nine_nine_7
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines
@ -5929,6 +5987,7 @@
MASTERY: MASTERY:
id: Master Room/Panel_mastery_mastery13 id: Master Room/Panel_mastery_mastery13
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Orange Tower Seventh Floor room: Orange Tower Seventh Floor
door: Mastery door: Mastery
@ -6025,6 +6084,7 @@
EIGHT: EIGHT:
id: Backside Room/Panel_eight_eight_6 id: Backside Room/Panel_eight_eight_6
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Eights door: Eights
@ -6322,6 +6382,7 @@
NINE: NINE:
id: Backside Room/Panel_nine_nine_9 id: Backside Room/Panel_nine_nine_9
tag: midwhite tag: midwhite
hunt: True
required_door: required_door:
room: Number Hunt room: Number Hunt
door: Nines door: Nines

0
worlds/lingo/data/__init__.py Normal file
View File

0
worlds/lingo/ids.yaml → worlds/lingo/data/ids.yaml
View File

12
worlds/lingo/static_logic.py
View File

@ -1,6 +1,6 @@
from typing import Dict, List, NamedTuple, Optional, Set from typing import Dict, List, NamedTuple, Optional, Set
import yaml import Utils
class RoomAndDoor(NamedTuple): class RoomAndDoor(NamedTuple):
@ -108,9 +108,11 @@ def load_static_data():
except ImportError: except ImportError:
from importlib_resources import files from importlib_resources import files
from . import data
# Load in all item and location IDs. These are broken up into groups based on the type of item/location. # Load in all item and location IDs. These are broken up into groups based on the type of item/location.
with files("worlds.lingo").joinpath("ids.yaml").open() as file: with files(data).joinpath("ids.yaml").open() as file:
config = yaml.load(file, Loader=yaml.Loader) config = Utils.parse_yaml(file)
if "special_items" in config: if "special_items" in config:
for item_name, item_id in config["special_items"].items(): for item_name, item_id in config["special_items"].items():
@ -144,8 +146,8 @@ def load_static_data():
PROGRESSIVE_ITEM_IDS[item_name] = item_id PROGRESSIVE_ITEM_IDS[item_name] = item_id
# Process the main world file. # Process the main world file.
with files("worlds.lingo").joinpath("LL1.yaml").open() as file: with files(data).joinpath("LL1.yaml").open() as file:
config = yaml.load(file, Loader=yaml.Loader) config = Utils.parse_yaml(file)
for room_name, room_data in config.items(): for room_name, room_data in config.items():
process_room(room_name, room_data) process_room(room_name, room_data)