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

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

This commit is contained in:
Star Rauchenberger 2024-02-13 19:56:24 -05:00 committed by GitHub
parent 2165253961
commit 2167db5a88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 54 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
worlds/lingo/data/LL1.yaml
View File

@ -1166,7 +1166,7 @@
group: Color Hunt Barriers group: Color Hunt Barriers
skip_location: True skip_location: True
panels: panels:
- room: Champion's Rest - room: Color Hunt
panel: PURPLE panel: PURPLE
Hallway Door: Hallway Door:
id: Red Blue Purple Room Area Doors/Door_room_2 id: Red Blue Purple Room Area Doors/Door_room_2
@ -1957,7 +1957,7 @@
group: Color Hunt Barriers group: Color Hunt Barriers
skip_location: True skip_location: True
panels: panels:
- room: Champion's Rest - room: Color Hunt
panel: RED panel: RED
Rhyme Room Entrance: Rhyme Room Entrance:
id: Double Room Area Doors/Door_room_entry_stairs2 id: Double Room Area Doors/Door_room_entry_stairs2
@ -1975,9 +1975,9 @@
- Color Arrow Room Doors/Door_orange_hider_1 - Color Arrow Room Doors/Door_orange_hider_1
- Color Arrow Room Doors/Door_orange_hider_2 - Color Arrow Room Doors/Door_orange_hider_2
- Color Arrow Room Doors/Door_orange_hider_3 - Color Arrow Room Doors/Door_orange_hider_3
location_name: Color Hunt - RED and YELLOW location_name: Color Barriers - RED and YELLOW
group: Champion's Rest - Color Barriers group: Color Hunt Barriers
item_name: Champion's Rest - Orange Barrier item_name: Color Hunt - Orange Barrier
panels: panels:
- RED - RED
- room: Directional Gallery - room: Directional Gallery
@ -2382,7 +2382,7 @@
group: Color Hunt Barriers group: Color Hunt Barriers
skip_location: True skip_location: True
panels: panels:
- room: Champion's Rest - room: Color Hunt
panel: GREEN panel: GREEN
paintings: paintings:
- id: flower_painting_7 - id: flower_painting_7
@ -2893,14 +2893,14 @@
group: Color Hunt Barriers group: Color Hunt Barriers
skip_location: True skip_location: True
panels: panels:
- room: Champion's Rest - room: Color Hunt
panel: BLUE panel: BLUE
Orange Barrier: Orange Barrier:
id: Color Arrow Room Doors/Door_orange_3 id: Color Arrow Room Doors/Door_orange_3
group: Color Hunt Barriers group: Color Hunt Barriers
skip_location: True skip_location: True
panels: panels:
- room: Champion's Rest - room: Color Hunt
panel: ORANGE panel: ORANGE
Initiated Entrance: Initiated Entrance:
id: Red Blue Purple Room Area Doors/Door_locked_knocked id: Red Blue Purple Room Area Doors/Door_locked_knocked
@ -2912,9 +2912,9 @@
# containing region. # containing region.
Green Barrier: Green Barrier:
id: Color Arrow Room Doors/Door_green_hider_1 id: Color Arrow Room Doors/Door_green_hider_1
location_name: Color Hunt - BLUE and YELLOW location_name: Color Barriers - BLUE and YELLOW
item_name: Champion's Rest - Green Barrier item_name: Color Hunt - Green Barrier
group: Champion's Rest - Color Barriers group: Color Hunt Barriers
panels: panels:
- BLUE - BLUE
- room: Directional Gallery - room: Directional Gallery
@ -2924,9 +2924,9 @@
- Color Arrow Room Doors/Door_purple_hider_1 - Color Arrow Room Doors/Door_purple_hider_1
- Color Arrow Room Doors/Door_purple_hider_2 - Color Arrow Room Doors/Door_purple_hider_2
- Color Arrow Room Doors/Door_purple_hider_3 - Color Arrow Room Doors/Door_purple_hider_3
location_name: Color Hunt - RED and BLUE location_name: Color Barriers - RED and BLUE
item_name: Champion's Rest - Purple Barrier item_name: Color Hunt - Purple Barrier
group: Champion's Rest - Color Barriers group: Color Hunt Barriers
panels: panels:
- BLUE - BLUE
- room: Orange Tower Third Floor - room: Orange Tower Third Floor
@ -2936,7 +2936,7 @@
- Color Arrow Room Doors/Door_all_hider_1 - Color Arrow Room Doors/Door_all_hider_1
- Color Arrow Room Doors/Door_all_hider_2 - Color Arrow Room Doors/Door_all_hider_2
- Color Arrow Room Doors/Door_all_hider_3 - 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 item_name: Champion's Rest - Entrance
panels: panels:
- ORANGE - ORANGE
@ -3176,8 +3176,8 @@
Outside The Bold: Outside The Bold:
entrances: entrances:
Color Hallways: True Color Hallways: True
Champion's Rest: Color Hunt:
room: Champion's Rest room: Color Hunt
door: Shortcut to The Steady door: Shortcut to The Steady
The Bearer: The Bearer:
room: The Bearer room: The Bearer
@ -4002,7 +4002,7 @@
group: Color Hunt Barriers group: Color Hunt Barriers
skip_location: True skip_location: True
panels: panels:
- room: Champion's Rest - room: Color Hunt
panel: YELLOW panel: YELLOW
paintings: paintings:
- id: smile_painting_7 - id: smile_painting_7
@ -4020,12 +4020,15 @@
orientation: south orientation: south
- id: cherry_painting - id: cherry_painting
orientation: east orientation: east
Champion's Rest: Color Hunt:
entrances: entrances:
Outside The Bold: Outside The Bold:
door: Shortcut to The Steady door: Shortcut to The Steady
Orange Tower Fourth Floor: True # sunwarp Orange Tower Fourth Floor: True # sunwarp
Roof: True # through ceiling of sunwarp Roof: True # through ceiling of sunwarp
Champion's Rest:
room: Outside The Initiated
door: Entrance
panels: panels:
EXIT: EXIT:
id: Rock Room/Panel_red_red id: Rock Room/Panel_red_red
@ -4066,41 +4069,6 @@
required_door: required_door:
room: Orange Tower Third Floor room: Orange Tower Third Floor
door: Orange Barrier door: Orange Barrier
YOU:
id: Color Arrow Room/Panel_you
required_door:
room: Outside The Initiated
door: Entrance
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: doors:
Shortcut to The Steady: Shortcut to The Steady:
id: Rock Room Doors/Door_hint id: Rock Room Doors/Door_hint
@ -4115,12 +4083,35 @@
required_door: required_door:
room: Outside The Initiated room: Outside The Initiated
door: Entrance 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
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
SECRET YELLOW:
id: Color Arrow Room/Panel_secret_yellow
tag: forbid
SECRET RED:
id: Color Arrow Room/Panel_secret_red
tag: forbid
paintings:
- id: colors_painting - id: colors_painting
orientation: south orientation: south
enter_only: True
required_door:
room: Outside The Initiated
door: Entrance
The Bearer: The Bearer:
entrances: entrances:
Outside The Bold: Outside The Bold:

6
worlds/lingo/data/ids.yaml
View File

@ -489,7 +489,7 @@ panels:
WINDWARD: 444803 WINDWARD: 444803
LIGHT: 444804 LIGHT: 444804
REWIND: 444805 REWIND: 444805
Champion's Rest: Color Hunt:
EXIT: 444806 EXIT: 444806
HUES: 444807 HUES: 444807
RED: 444808 RED: 444808
@ -498,6 +498,7 @@ panels:
GREEN: 444811 GREEN: 444811
PURPLE: 444812 PURPLE: 444812
ORANGE: 444813 ORANGE: 444813
Champion's Rest:
YOU: 444814 YOU: 444814
ME: 444815 ME: 444815
SECRET BLUE: 444816 SECRET BLUE: 444816
@ -1286,7 +1287,7 @@ doors:
location: 445246 location: 445246
Yellow Barrier: Yellow Barrier:
item: 444538 item: 444538
Champion's Rest: Color Hunt:
Shortcut to The Steady: Shortcut to The Steady:
item: 444539 item: 444539
location: 444806 location: 444806
@ -1442,7 +1443,6 @@ door_groups:
Fearless Doors: 444469 Fearless Doors: 444469
Backside Doors: 444473 Backside Doors: 444473
Orange Tower First Floor - Shortcuts: 444484 Orange Tower First Floor - Shortcuts: 444484
Champion's Rest - Color Barriers: 444489
Welcome Back Doors: 444492 Welcome Back Doors: 444492
Colorful Doors: 444498 Colorful Doors: 444498
Directional Gallery Doors: 444531 Directional Gallery Doors: 444531

5
worlds/lingo/player_logic.py
View File

@ -196,9 +196,8 @@ class LingoPlayerLogic:
["Orange Tower Fourth Floor", "Hot Crusts Door"], ["Outside The Initiated", "Shortcut to Hub Room"], ["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", "Shortcut to Hub Room"], ["Directional Gallery", "Shortcut to The Undeterred"],
["Orange Tower First Floor", "Salt Pepper Door"], ["Hub Room", "Crossroads Entrance"], ["Orange Tower First Floor", "Salt Pepper Door"], ["Hub Room", "Crossroads Entrance"],
["Champion's Rest", "Shortcut to The Steady"], ["The Bearer", "Shortcut to The Bold"], ["Color Hunt", "Shortcut to The Steady"], ["The Bearer", "Shortcut to The Bold"], ["Art Gallery", "Exit"],
["Art Gallery", "Exit"], ["The Tenacious", "Shortcut to Hub Room"], ["The Tenacious", "Shortcut to Hub Room"], ["Outside The Agreeable", "Tenacious Entrance"]
["Outside The Agreeable", "Tenacious Entrance"]
] ]
pilgrimage_reqs = AccessRequirements() pilgrimage_reqs = AccessRequirements()
for door in fake_pilgrimage: for door in fake_pilgrimage: