Skip to content

Commit 280b4cc

Browse files
hatkirbyTheLX5
hatkirby
authored and
TheLX5
committed
Lingo: Split up Color Hunt and Champion's Rest (ArchipelagoMW#2745)
1 parent b12246a commit 280b4cc

File tree

3 files changed

+46
-56
lines changed

3 files changed

+46
-56
lines changed

‎worlds/lingo/data/LL1.yaml

+41-50
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@
11661166
group: Color Hunt Barriers
11671167
skip_location: True
11681168
panels:
1169-
- room: Champion's Rest
1169+
- room: Color Hunt
11701170
panel: PURPLE
11711171
Hallway Door:
11721172
id: Red Blue Purple Room Area Doors/Door_room_2
@@ -1957,7 +1957,7 @@
19571957
group: Color Hunt Barriers
19581958
skip_location: True
19591959
panels:
1960-
- room: Champion's Rest
1960+
- room: Color Hunt
19611961
panel: RED
19621962
Rhyme Room Entrance:
19631963
id: Double Room Area Doors/Door_room_entry_stairs2
@@ -1975,9 +1975,9 @@
19751975
- Color Arrow Room Doors/Door_orange_hider_1
19761976
- Color Arrow Room Doors/Door_orange_hider_2
19771977
- Color Arrow Room Doors/Door_orange_hider_3
1978-
location_name: Color Hunt - RED and YELLOW
1979-
group: Champion's Rest - Color Barriers
1980-
item_name: Champion's Rest - Orange Barrier
1978+
location_name: Color Barriers - RED and YELLOW
1979+
group: Color Hunt Barriers
1980+
item_name: Color Hunt - Orange Barrier
19811981
panels:
19821982
- RED
19831983
- room: Directional Gallery
@@ -2382,7 +2382,7 @@
23822382
group: Color Hunt Barriers
23832383
skip_location: True
23842384
panels:
2385-
- room: Champion's Rest
2385+
- room: Color Hunt
23862386
panel: GREEN
23872387
paintings:
23882388
- id: flower_painting_7
@@ -2893,14 +2893,14 @@
28932893
group: Color Hunt Barriers
28942894
skip_location: True
28952895
panels:
2896-
- room: Champion's Rest
2896+
- room: Color Hunt
28972897
panel: BLUE
28982898
Orange Barrier:
28992899
id: Color Arrow Room Doors/Door_orange_3
29002900
group: Color Hunt Barriers
29012901
skip_location: True
29022902
panels:
2903-
- room: Champion's Rest
2903+
- room: Color Hunt
29042904
panel: ORANGE
29052905
Initiated Entrance:
29062906
id: Red Blue Purple Room Area Doors/Door_locked_knocked
@@ -2912,9 +2912,9 @@
29122912
# containing region.
29132913
Green Barrier:
29142914
id: Color Arrow Room Doors/Door_green_hider_1
2915-
location_name: Color Hunt - BLUE and YELLOW
2916-
item_name: Champion's Rest - Green Barrier
2917-
group: Champion's Rest - Color Barriers
2915+
location_name: Color Barriers - BLUE and YELLOW
2916+
item_name: Color Hunt - Green Barrier
2917+
group: Color Hunt Barriers
29182918
panels:
29192919
- BLUE
29202920
- room: Directional Gallery
@@ -2924,9 +2924,9 @@
29242924
- Color Arrow Room Doors/Door_purple_hider_1
29252925
- Color Arrow Room Doors/Door_purple_hider_2
29262926
- Color Arrow Room Doors/Door_purple_hider_3
2927-
location_name: Color Hunt - RED and BLUE
2928-
item_name: Champion's Rest - Purple Barrier
2929-
group: Champion's Rest - Color Barriers
2927+
location_name: Color Barriers - RED and BLUE
2928+
item_name: Color Hunt - Purple Barrier
2929+
group: Color Hunt Barriers
29302930
panels:
29312931
- BLUE
29322932
- room: Orange Tower Third Floor
@@ -2936,7 +2936,7 @@
29362936
- Color Arrow Room Doors/Door_all_hider_1
29372937
- Color Arrow Room Doors/Door_all_hider_2
29382938
- Color Arrow Room Doors/Door_all_hider_3
2939-
location_name: Color Hunt - GREEN, ORANGE and PURPLE
2939+
location_name: Color Barriers - GREEN, ORANGE and PURPLE
29402940
item_name: Champion's Rest - Entrance
29412941
panels:
29422942
- ORANGE
@@ -3176,8 +3176,8 @@
31763176
Outside The Bold:
31773177
entrances:
31783178
Color Hallways: True
3179-
Champion's Rest:
3180-
room: Champion's Rest
3179+
Color Hunt:
3180+
room: Color Hunt
31813181
door: Shortcut to The Steady
31823182
The Bearer:
31833183
room: The Bearer
@@ -4002,7 +4002,7 @@
40024002
group: Color Hunt Barriers
40034003
skip_location: True
40044004
panels:
4005-
- room: Champion's Rest
4005+
- room: Color Hunt
40064006
panel: YELLOW
40074007
paintings:
40084008
- id: smile_painting_7
@@ -4020,12 +4020,15 @@
40204020
orientation: south
40214021
- id: cherry_painting
40224022
orientation: east
4023-
Champion's Rest:
4023+
Color Hunt:
40244024
entrances:
40254025
Outside The Bold:
40264026
door: Shortcut to The Steady
40274027
Orange Tower Fourth Floor: True # sunwarp
40284028
Roof: True # through ceiling of sunwarp
4029+
Champion's Rest:
4030+
room: Outside The Initiated
4031+
door: Entrance
40294032
panels:
40304033
EXIT:
40314034
id: Rock Room/Panel_red_red
@@ -4066,61 +4069,49 @@
40664069
required_door:
40674070
room: Orange Tower Third Floor
40684071
door: Orange Barrier
4069-
YOU:
4070-
id: Color Arrow Room/Panel_you
4072+
doors:
4073+
Shortcut to The Steady:
4074+
id: Rock Room Doors/Door_hint
4075+
panels:
4076+
- EXIT
4077+
paintings:
4078+
- id: arrows_painting_7
4079+
orientation: east
4080+
- id: fruitbowl_painting3
4081+
orientation: west
4082+
enter_only: True
40714083
required_door:
40724084
room: Outside The Initiated
40734085
door: Entrance
4086+
Champion's Rest:
4087+
entrances:
4088+
Color Hunt:
4089+
room: Outside The Initiated
4090+
door: Entrance
4091+
panels:
4092+
YOU:
4093+
id: Color Arrow Room/Panel_you
40744094
check: True
40754095
colors: gray
40764096
tag: forbid
40774097
ME:
40784098
id: Color Arrow Room/Panel_me
40794099
colors: gray
40804100
tag: forbid
4081-
required_door:
4082-
room: Outside The Initiated
4083-
door: Entrance
40844101
SECRET BLUE:
40854102
# Pretend this and the other two are white, because they are snipes.
40864103
# TODO: Extract them and randomize them?
40874104
id: Color Arrow Room/Panel_secret_blue
40884105
tag: forbid
4089-
required_door:
4090-
room: Outside The Initiated
4091-
door: Entrance
40924106
SECRET YELLOW:
40934107
id: Color Arrow Room/Panel_secret_yellow
40944108
tag: forbid
4095-
required_door:
4096-
room: Outside The Initiated
4097-
door: Entrance
40984109
SECRET RED:
40994110
id: Color Arrow Room/Panel_secret_red
41004111
tag: forbid
4101-
required_door:
4102-
room: Outside The Initiated
4103-
door: Entrance
4104-
doors:
4105-
Shortcut to The Steady:
4106-
id: Rock Room Doors/Door_hint
4107-
panels:
4108-
- EXIT
41094112
paintings:
4110-
- id: arrows_painting_7
4111-
orientation: east
4112-
- id: fruitbowl_painting3
4113-
orientation: west
4114-
enter_only: True
4115-
required_door:
4116-
room: Outside The Initiated
4117-
door: Entrance
41184113
- id: colors_painting
41194114
orientation: south
4120-
enter_only: True
4121-
required_door:
4122-
room: Outside The Initiated
4123-
door: Entrance
41244115
The Bearer:
41254116
entrances:
41264117
Outside The Bold:

‎worlds/lingo/data/ids.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ panels:
489489
WINDWARD: 444803
490490
LIGHT: 444804
491491
REWIND: 444805
492-
Champion's Rest:
492+
Color Hunt:
493493
EXIT: 444806
494494
HUES: 444807
495495
RED: 444808
@@ -498,6 +498,7 @@ panels:
498498
GREEN: 444811
499499
PURPLE: 444812
500500
ORANGE: 444813
501+
Champion's Rest:
501502
YOU: 444814
502503
ME: 444815
503504
SECRET BLUE: 444816
@@ -1286,7 +1287,7 @@ doors:
12861287
location: 445246
12871288
Yellow Barrier:
12881289
item: 444538
1289-
Champion's Rest:
1290+
Color Hunt:
12901291
Shortcut to The Steady:
12911292
item: 444539
12921293
location: 444806
@@ -1442,7 +1443,6 @@ door_groups:
14421443
Fearless Doors: 444469
14431444
Backside Doors: 444473
14441445
Orange Tower First Floor - Shortcuts: 444484
1445-
Champion's Rest - Color Barriers: 444489
14461446
Welcome Back Doors: 444492
14471447
Colorful Doors: 444498
14481448
Directional Gallery Doors: 444531

‎worlds/lingo/player_logic.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,8 @@ def __init__(self, world: "LingoWorld"):
196196
["Orange Tower Fourth Floor", "Hot Crusts Door"], ["Outside The Initiated", "Shortcut to Hub Room"],
197197
["Orange Tower First Floor", "Shortcut to Hub Room"], ["Directional Gallery", "Shortcut to The Undeterred"],
198198
["Orange Tower First Floor", "Salt Pepper Door"], ["Hub Room", "Crossroads Entrance"],
199-
["Champion's Rest", "Shortcut to The Steady"], ["The Bearer", "Shortcut to The Bold"],
200-
["Art Gallery", "Exit"], ["The Tenacious", "Shortcut to Hub Room"],
201-
["Outside The Agreeable", "Tenacious Entrance"]
199+
["Color Hunt", "Shortcut to The Steady"], ["The Bearer", "Shortcut to The Bold"], ["Art Gallery", "Exit"],
200+
["The Tenacious", "Shortcut to Hub Room"], ["Outside The Agreeable", "Tenacious Entrance"]
202201
]
203202
pilgrimage_reqs = AccessRequirements()
204203
for door in fake_pilgrimage:

0 commit comments

Comments
 (0)