Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lingo: Sync config with game update #2447

Merged
merged 4 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions worlds/lingo/LL1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,9 @@
The Observant: True # Assuming that access to The Observant includes access to the right entrance
Eight Room: True
Eight Alcove:
door: Eight Painting
door: Eight Door
Orange Tower Sixth Floor:
painting: True
panels:
Achievement:
id: Countdown Panels/Panel_incomparable_incomparable
Expand Down Expand Up @@ -1715,7 +1717,7 @@
colors: blue
tag: forbid
doors:
Eight Painting:
Eight Door:
id: Red Blue Purple Room Area Doors/Door_a_strands
location_name: Giant Sevens
group: Observant Doors
Expand All @@ -1725,11 +1727,17 @@
panel: I
- room: Elements Area
panel: A
paintings:
- id: crown_painting
orientation: east
Eight Alcove:
entrances:
The Incomparable:
room: The Incomparable
door: Eight Painting
door: Eight Door
Outside The Initiated:
room: Outside The Initiated
door: Eight Door
paintings:
- id: eight_painting2
orientation: north
Expand Down Expand Up @@ -2126,7 +2134,7 @@
orientation: north
- id: panda_painting_2
orientation: south
- id: pencil_painting
- id: crown_painting2
orientation: north
- id: colors_painting2
orientation: south
Expand Down Expand Up @@ -2638,10 +2646,8 @@
Hub Room: True
Outside The Wondrous: True
Outside The Undeterred: True
Outside The Initiated: True
Outside The Agreeable: True
Outside The Wanderer: True
Eight Alcove: True
Orange Tower Fifth Floor:
room: Orange Tower Fifth Floor
door: Welcome Back
Expand Down Expand Up @@ -2713,6 +2719,8 @@
Orange Tower Fifth Floor:
room: Art Gallery
door: Exit
Eight Alcove:
door: Eight Door
panels:
SEVEN (1):
id: Backside Room/Panel_seven_seven_5
Expand Down Expand Up @@ -2878,6 +2886,16 @@
panel: BACKSIDE
- room: The Bearer
panel: BACKSIDE
Eight Door:
id: Red Blue Purple Room Area Doors/Door_a_strands2
skip_location: True
panels:
- room: The Incomparable
panel: I (Seven)
- room: Courtyard
panel: I
- room: Elements Area
panel: A
paintings:
- id: clock_painting_5
orientation: east
Expand Down
4 changes: 3 additions & 1 deletion worlds/lingo/ids.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ doors:
item: 444474
location: 444569
The Incomparable:
Eight Painting:
Eight Door:
item: 444475
location: 445219
Orange Tower:
Expand Down Expand Up @@ -1219,6 +1219,8 @@ doors:
Entrance:
item: 444516
location: 445237
Eight Door:
item: 444578
The Traveled:
Color Hallways Entrance:
item: 444517
Expand Down
2 changes: 1 addition & 1 deletion worlds/lingo/utils/validate_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
directives = Set["entrances", "panels", "doors", "paintings", "progression"]
panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting"]
door_directives = Set["id", "painting_id", "panels", "item_name", "location_name", "skip_location", "skip_item", "group", "include_reduce", "junk_item", "event"]
painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move"]
painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"]

non_counting = 0

Expand Down