Skip to content

Lingo: Split up Color Hunt and Champion's Rest #2745

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Lingo: Split up Color Hunt and Champion's Rest #2745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
91 changes: 41 additions & 50 deletions worlds/lingo/data/LL1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@
group: Color Hunt Barriers
skip_location: True
panels:
- room: Champion's Rest
- room: Color Hunt
panel: PURPLE
Hallway Door:
id: Red Blue Purple Room Area Doors/Door_room_2
Expand Down Expand Up @@ -1957,7 +1957,7 @@
group: Color Hunt Barriers
skip_location: True
panels:
- room: Champion's Rest
- room: Color Hunt
panel: RED
Rhyme Room Entrance:
id: Double Room Area Doors/Door_room_entry_stairs2
Expand All @@ -1975,9 +1975,9 @@
- Color Arrow Room Doors/Door_orange_hider_1
- Color Arrow Room Doors/Door_orange_hider_2
- Color Arrow Room Doors/Door_orange_hider_3
location_name: Color Hunt - RED and YELLOW
group: Champion's Rest - Color Barriers
item_name: Champion's Rest - Orange Barrier
location_name: Color Barriers - RED and YELLOW
group: Color Hunt Barriers
item_name: Color Hunt - Orange Barrier
panels:
- RED
- room: Directional Gallery
Expand Down Expand Up @@ -2382,7 +2382,7 @@
group: Color Hunt Barriers
skip_location: True
panels:
- room: Champion's Rest
- room: Color Hunt
panel: GREEN
paintings:
- id: flower_painting_7
Expand Down Expand Up @@ -2893,14 +2893,14 @@
group: Color Hunt Barriers
skip_location: True
panels:
- room: Champion's Rest
- room: Color Hunt
panel: BLUE
Orange Barrier:
id: Color Arrow Room Doors/Door_orange_3
group: Color Hunt Barriers
skip_location: True
panels:
- room: Champion's Rest
- room: Color Hunt
panel: ORANGE
Initiated Entrance:
id: Red Blue Purple Room Area Doors/Door_locked_knocked
Expand All @@ -2912,9 +2912,9 @@
# containing region.
Green Barrier:
id: Color Arrow Room Doors/Door_green_hider_1
location_name: Color Hunt - BLUE and YELLOW
item_name: Champion's Rest - Green Barrier
group: Champion's Rest - Color Barriers
location_name: Color Barriers - BLUE and YELLOW
item_name: Color Hunt - Green Barrier
group: Color Hunt Barriers
panels:
- BLUE
- room: Directional Gallery
Expand All @@ -2924,9 +2924,9 @@
- Color Arrow Room Doors/Door_purple_hider_1
- Color Arrow Room Doors/Door_purple_hider_2
- Color Arrow Room Doors/Door_purple_hider_3
location_name: Color Hunt - RED and BLUE
item_name: Champion's Rest - Purple Barrier
group: Champion's Rest - Color Barriers
location_name: Color Barriers - RED and BLUE
item_name: Color Hunt - Purple Barrier
group: Color Hunt Barriers
panels:
- BLUE
- room: Orange Tower Third Floor
Expand All @@ -2936,7 +2936,7 @@
- Color Arrow Room Doors/Door_all_hider_1
- Color Arrow Room Doors/Door_all_hider_2
- Color Arrow Room Doors/Door_all_hider_3
location_name: Color Hunt - GREEN, ORANGE and PURPLE
location_name: Color Barriers - GREEN, ORANGE and PURPLE
item_name: Champion's Rest - Entrance
panels:
- ORANGE
Expand Down Expand Up @@ -3176,8 +3176,8 @@
Outside The Bold:
entrances:
Color Hallways: True
Champion's Rest:
room: Champion's Rest
Color Hunt:
room: Color Hunt
door: Shortcut to The Steady
The Bearer:
room: The Bearer
Expand Down Expand Up @@ -4002,7 +4002,7 @@
group: Color Hunt Barriers
skip_location: True
panels:
- room: Champion's Rest
- room: Color Hunt
panel: YELLOW
paintings:
- id: smile_painting_7
Expand All @@ -4020,12 +4020,15 @@
orientation: south
- id: cherry_painting
orientation: east
Champion's Rest:
Color Hunt:
entrances:
Outside The Bold:
door: Shortcut to The Steady
Orange Tower Fourth Floor: True # sunwarp
Roof: True # through ceiling of sunwarp
Champion's Rest:
room: Outside The Initiated
door: Entrance
panels:
EXIT:
id: Rock Room/Panel_red_red
Expand Down Expand Up @@ -4066,61 +4069,49 @@
required_door:
room: Orange Tower Third Floor
door: Orange Barrier
YOU:
id: Color Arrow Room/Panel_you
doors:
Shortcut to The Steady:
id: Rock Room Doors/Door_hint
panels:
- EXIT
paintings:
- id: arrows_painting_7
orientation: east
- id: fruitbowl_painting3
orientation: west
enter_only: True
required_door:
room: Outside The Initiated
door: Entrance
Champion's Rest:
entrances:
Color Hunt:
room: Outside The Initiated
door: Entrance
panels:
YOU:
id: Color Arrow Room/Panel_you
check: True
colors: gray
tag: forbid
ME:
id: Color Arrow Room/Panel_me
colors: gray
tag: forbid
required_door:
room: Outside The Initiated
door: Entrance
SECRET BLUE:
# Pretend this and the other two are white, because they are snipes.
# TODO: Extract them and randomize them?
id: Color Arrow Room/Panel_secret_blue
tag: forbid
required_door:
room: Outside The Initiated
door: Entrance
SECRET YELLOW:
id: Color Arrow Room/Panel_secret_yellow
tag: forbid
required_door:
room: Outside The Initiated
door: Entrance
SECRET RED:
id: Color Arrow Room/Panel_secret_red
tag: forbid
required_door:
room: Outside The Initiated
door: Entrance
doors:
Shortcut to The Steady:
id: Rock Room Doors/Door_hint
panels:
- EXIT
paintings:
- id: arrows_painting_7
orientation: east
- id: fruitbowl_painting3
orientation: west
enter_only: True
required_door:
room: Outside The Initiated
door: Entrance
- id: colors_painting
orientation: south
enter_only: True
required_door:
room: Outside The Initiated
door: Entrance
The Bearer:
entrances:
Outside The Bold:
Expand Down
6 changes: 3 additions & 3 deletions worlds/lingo/data/ids.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ panels:
WINDWARD: 444803
LIGHT: 444804
REWIND: 444805
Champion's Rest:
Color Hunt:
EXIT: 444806
HUES: 444807
RED: 444808
Expand All @@ -498,6 +498,7 @@ panels:
GREEN: 444811
PURPLE: 444812
ORANGE: 444813
Champion's Rest:
YOU: 444814
ME: 444815
SECRET BLUE: 444816
Expand Down Expand Up @@ -1286,7 +1287,7 @@ doors:
location: 445246
Yellow Barrier:
item: 444538
Champion's Rest:
Color Hunt:
Shortcut to The Steady:
item: 444539
location: 444806
Expand Down Expand Up @@ -1442,7 +1443,6 @@ door_groups:
Fearless Doors: 444469
Backside Doors: 444473
Orange Tower First Floor - Shortcuts: 444484
Champion's Rest - Color Barriers: 444489
Welcome Back Doors: 444492
Colorful Doors: 444498
Directional Gallery Doors: 444531
Expand Down
5 changes: 2 additions & 3 deletions worlds/lingo/player_logic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,8 @@ def __init__(self, world: "LingoWorld"):
["Orange Tower Fourth Floor", "Hot Crusts Door"], ["Outside The Initiated", "Shortcut to Hub Room"],
["Orange Tower First Floor", "Shortcut to Hub Room"], ["Directional Gallery", "Shortcut to The Undeterred"],
["Orange Tower First Floor", "Salt Pepper Door"], ["Hub Room", "Crossroads Entrance"],
["Champion's Rest", "Shortcut to The Steady"], ["The Bearer", "Shortcut to The Bold"],
["Art Gallery", "Exit"], ["The Tenacious", "Shortcut to Hub Room"],
["Outside The Agreeable", "Tenacious Entrance"]
["Color Hunt", "Shortcut to The Steady"], ["The Bearer", "Shortcut to The Bold"], ["Art Gallery", "Exit"],
["The Tenacious", "Shortcut to Hub Room"], ["Outside The Agreeable", "Tenacious Entrance"]
]
pilgrimage_reqs = AccessRequirements()
for door in fake_pilgrimage:
Expand Down