Skip to content

Commit fadcfbd

Browse files
authored
Celeste (Open World): v1.0.7 Logic Fixes (ArchipelagoMW#5827)
### Logic Fixes: - Old Site A - Logic now allows for going backwards from the `Awake` checkpoint - Golden Ridge A - `Golden Strawberry` now requires `Moving Platforms` as it should - Mirror Temple A - `Room b-01c Strawberry` and `Room b-10 Strawberry` no longer erroneously require `Red Boosters` - `Golden Strawberry` now requires `Dash Refills` as it should - Reflection A - Logic now allows for going backwards from the `Reflection` checkpoint - Reflection B - Logic now allows for going backwards from the `Reflection` checkpoint - Farewell - `Power Source Key 2` now logically requires `Dash Switches` and `Double Dash Refills` as it should
1 parent 3c4c294 commit fadcfbd

File tree

6 files changed

+25
-24
lines changed

6 files changed

+25
-24
lines changed

worlds/celeste_open_world/Items.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484

8585

8686
class CelesteItem(Item):
87-
game = "Celeste"
87+
game = "Celeste (Open World)"
8888

8989

9090
class CelesteItemData(NamedTuple):
@@ -259,6 +259,7 @@ def generate_item_groups() -> dict[str, list[str]]:
259259
"Blue Bubbles": [ItemName.blue_boosters],
260260
"Red Bubbles": [ItemName.red_boosters],
261261
"Touch Switches": [ItemName.coins],
262+
"Shields": [ItemName.coins],
262263
}
263264

264265
return item_groups

worlds/celeste_open_world/Locations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
class CelesteLocation(Location):
19-
game = "Celeste"
19+
game = "Celeste (Open World)"
2020

2121

2222
class CelesteLocationData(NamedTuple):

worlds/celeste_open_world/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CelesteOpenWorld(World):
4242
options_dataclass = CelesteOptions
4343
options: CelesteOptions
4444

45-
apworld_version = 10005
45+
apworld_version = 10007
4646

4747
level_data: dict[str, Level] = load_logic_data()
4848

worlds/celeste_open_world/archipelago.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"game": "Celeste (Open World)",
33
"authors": [ "PoryGone" ],
44
"minimum_ap_version": "0.6.3",
5-
"world_version": "1.0.5"
5+
"world_version": "1.0.7"
66
}

worlds/celeste_open_world/data/CelesteLevelData.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5413,13 +5413,13 @@
54135413
"name": "north-west",
54145414
"direction": "left",
54155415
"blocked": false,
5416-
"closes_behind": true
5416+
"closes_behind": false
54175417
},
54185418
{
54195419
"name": "west",
54205420
"direction": "left",
54215421
"blocked": false,
5422-
"closes_behind": true
5422+
"closes_behind": false
54235423
},
54245424
{
54255425
"name": "east",
@@ -14326,7 +14326,7 @@
1432614326
"name": "golden",
1432714327
"display_name": "Golden Strawberry",
1432814328
"type": "golden_strawberry",
14329-
"rule": [ [ "blue_clouds", "pink_clouds", "blue_boosters", "move_blocks", "dash_refills", "springs", "coins" ] ]
14329+
"rule": [ [ "blue_clouds", "pink_clouds", "blue_boosters", "move_blocks", "moving_platforms", "dash_refills", "springs", "coins" ] ]
1433014330
}
1433114331
]
1433214332
}
@@ -16985,7 +16985,7 @@
1698516985
"name": "strawberry",
1698616986
"display_name": "Strawberry",
1698716987
"type": "strawberry",
16988-
"rule": [ [ "red_boosters" ] ]
16988+
"rule": []
1698916989
}
1699016990
]
1699116991
}
@@ -17577,7 +17577,7 @@
1757717577
"name": "strawberry",
1757817578
"display_name": "Strawberry",
1757917579
"type": "strawberry",
17580-
"rule": [ [ "red_boosters" ] ]
17580+
"rule": []
1758117581
}
1758217582
]
1758317583
}
@@ -19953,7 +19953,7 @@
1995319953
"name": "golden",
1995419954
"display_name": "Golden Strawberry",
1995519955
"type": "golden_strawberry",
19956-
"rule": [ [ "red_boosters", "swap_blocks", "dash_switches", "Entrance Key", "Depths Key", "Search Key 1", "Search Key 2", "seekers", "coins", "theo_crystal" ] ]
19956+
"rule": [ [ "red_boosters", "swap_blocks", "dash_switches", "dash_refills", "Entrance Key", "Depths Key", "Search Key 1", "Search Key 2", "seekers", "coins", "theo_crystal" ] ]
1995719957
}
1995819958
]
1995919959
}
@@ -23479,7 +23479,7 @@
2347923479
"name": "west",
2348023480
"direction": "left",
2348123481
"blocked": false,
23482-
"closes_behind": true
23482+
"closes_behind": false
2348323483
},
2348423484
{
2348523485
"name": "top",
@@ -25250,7 +25250,7 @@
2525025250
"name": "west",
2525125251
"direction": "left",
2525225252
"blocked": false,
25253-
"closes_behind": true
25253+
"closes_behind": false
2525425254
},
2525525255
{
2525625256
"name": "east",
@@ -37237,13 +37237,13 @@
3723737237
"name": "binoculars",
3723837238
"display_name": "Binoculars",
3723937239
"type": "binoculars",
37240-
"rule": [ [ "breaker_boxes" ] ]
37240+
"rule": [ [ "breaker_boxes", "double_dash_refills", "dash_switches" ] ]
3724137241
},
3724237242
{
3724337243
"name": "key_2",
3724437244
"display_name": "Power Source Key 2",
3724537245
"type": "key",
37246-
"rule": [ [ "breaker_boxes", "double_dash_refills", "jellyfish" ] ]
37246+
"rule": [ [ "breaker_boxes", "double_dash_refills", "dash_switches", "jellyfish" ] ]
3724737247
}
3724837248
]
3724937249
}

worlds/celeste_open_world/data/CelesteLevelData.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@
330330
"2a_end_2_north-east": Door("2a_end_2_north-east", "2a_end_2", DoorDirection.right, False, False),
331331
"2a_end_2_east": Door("2a_end_2_east", "2a_end_2", DoorDirection.right, False, False),
332332

333-
"2a_end_3_north-west": Door("2a_end_3_north-west", "2a_end_3", DoorDirection.left, False, True),
334-
"2a_end_3_west": Door("2a_end_3_west", "2a_end_3", DoorDirection.left, False, True),
333+
"2a_end_3_north-west": Door("2a_end_3_north-west", "2a_end_3", DoorDirection.left, False, False),
334+
"2a_end_3_west": Door("2a_end_3_west", "2a_end_3", DoorDirection.left, False, False),
335335
"2a_end_3_east": Door("2a_end_3_east", "2a_end_3", DoorDirection.right, False, False),
336336

337337
"2a_end_4_west": Door("2a_end_4_west", "2a_end_4", DoorDirection.left, False, False),
@@ -1434,7 +1434,7 @@
14341434
"6a_20_west": Door("6a_20_west", "6a_20", DoorDirection.left, False, False),
14351435
"6a_20_east": Door("6a_20_east", "6a_20", DoorDirection.right, False, False),
14361436

1437-
"6a_b-00_west": Door("6a_b-00_west", "6a_b-00", DoorDirection.left, False, True),
1437+
"6a_b-00_west": Door("6a_b-00_west", "6a_b-00", DoorDirection.left, False, False),
14381438
"6a_b-00_top": Door("6a_b-00_top", "6a_b-00", DoorDirection.up, False, False),
14391439
"6a_b-00_east": Door("6a_b-00_east", "6a_b-00", DoorDirection.right, False, False),
14401440

@@ -1543,7 +1543,7 @@
15431543
"6b_a-06_west": Door("6b_a-06_west", "6b_a-06", DoorDirection.left, False, False),
15441544
"6b_a-06_east": Door("6b_a-06_east", "6b_a-06", DoorDirection.right, False, False),
15451545

1546-
"6b_b-00_west": Door("6b_b-00_west", "6b_b-00", DoorDirection.left, False, True),
1546+
"6b_b-00_west": Door("6b_b-00_west", "6b_b-00", DoorDirection.left, False, False),
15471547
"6b_b-00_east": Door("6b_b-00_east", "6b_b-00", DoorDirection.down, False, False),
15481548

15491549
"6b_b-01_top": Door("6b_b-01_top", "6b_b-01", DoorDirection.up, False, False),
@@ -5127,7 +5127,7 @@
51275127
"4a_d-07_strawberry": LevelLocation("4a_d-07_strawberry", "Golden Ridge A - Room d-07 Strawberry", "4a_d-07_west", LocationType.strawberry, [[ItemName.blue_boosters, ], ]),
51285128
"4a_d-09_strawberry": LevelLocation("4a_d-09_strawberry", "Golden Ridge A - Room d-09 Strawberry", "4a_d-09_west", LocationType.strawberry, [[ItemName.blue_boosters, ], ]),
51295129
"4a_d-10_clear": LevelLocation("4a_d-10_clear", "Golden Ridge A - Level Clear", "4a_d-10_goal", LocationType.level_clear, []),
5130-
"4a_d-10_golden": LevelLocation("4a_d-10_golden", "Golden Ridge A - Golden Strawberry", "4a_d-10_goal", LocationType.golden_strawberry, [[ItemName.blue_clouds, ItemName.pink_clouds, ItemName.blue_boosters, ItemName.move_blocks, ItemName.dash_refills, ItemName.springs, ItemName.coins, ], ]),
5130+
"4a_d-10_golden": LevelLocation("4a_d-10_golden", "Golden Ridge A - Golden Strawberry", "4a_d-10_goal", LocationType.golden_strawberry, [[ItemName.blue_clouds, ItemName.pink_clouds, ItemName.blue_boosters, ItemName.move_blocks, ItemName.moving_platforms, ItemName.dash_refills, ItemName.springs, ItemName.coins, ], ]),
51315131

51325132
"4b_b-02_binoculars": LevelLocation("4b_b-02_binoculars", "Golden Ridge B - Room b-02 Binoculars", "4b_b-02_bottom", LocationType.binoculars, []),
51335133
"4b_c-03_binoculars": LevelLocation("4b_c-03_binoculars", "Golden Ridge B - Room c-03 Binoculars", "4b_c-03_bottom", LocationType.binoculars, []),
@@ -5155,14 +5155,14 @@
51555155
"5a_a-15_strawberry": LevelLocation("5a_a-15_strawberry", "Mirror Temple A - Room a-15 Strawberry", "5a_a-15_south", LocationType.strawberry, [[ItemName.coins, ItemName.red_boosters, ], ]),
51565156
"5a_a-14_strawberry": LevelLocation("5a_a-14_strawberry", "Mirror Temple A - Room a-14 Strawberry", "5a_a-14_south", LocationType.strawberry, [[ItemName.swap_blocks, ItemName.dash_refills, ], ]),
51575157
"5a_b-18_strawberry": LevelLocation("5a_b-18_strawberry", "Mirror Temple A - Room b-18 Strawberry", "5a_b-18_south", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
5158-
"5a_b-01c_strawberry": LevelLocation("5a_b-01c_strawberry", "Mirror Temple A - Room b-01c Strawberry", "5a_b-01c_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
5158+
"5a_b-01c_strawberry": LevelLocation("5a_b-01c_strawberry", "Mirror Temple A - Room b-01c Strawberry", "5a_b-01c_east", LocationType.strawberry, []),
51595159
"5a_b-20_strawberry_1": LevelLocation("5a_b-20_strawberry_1", "Mirror Temple A - Room b-20 Strawberry 1", "5a_b-20_south", LocationType.strawberry, []),
51605160
"5a_b-20_strawberry_2": LevelLocation("5a_b-20_strawberry_2", "Mirror Temple A - Room b-20 Strawberry 2", "5a_b-20_east", LocationType.strawberry, [[ItemName.swap_blocks, ], ]),
51615161
"5a_b-21_strawberry": LevelLocation("5a_b-21_strawberry", "Mirror Temple A - Room b-21 Strawberry", "5a_b-21_east", LocationType.strawberry, [[ItemName.red_boosters, ItemName.dash_refills, ], ]),
51625162
"5a_b-03_strawberry": LevelLocation("5a_b-03_strawberry", "Mirror Temple A - Room b-03 Strawberry", "5a_b-03_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
51635163
"5a_b-05_strawberry": LevelLocation("5a_b-05_strawberry", "Mirror Temple A - Room b-05 Strawberry", "5a_b-05_west", LocationType.strawberry, [[ItemName.red_boosters, ItemName.dash_refills, ], ]),
51645164
"5a_b-04_key_2": LevelLocation("5a_b-04_key_2", "Mirror Temple A - Depths Key", "5a_b-04_east", LocationType.key, []),
5165-
"5a_b-10_strawberry": LevelLocation("5a_b-10_strawberry", "Mirror Temple A - Room b-10 Strawberry", "5a_b-10_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
5165+
"5a_b-10_strawberry": LevelLocation("5a_b-10_strawberry", "Mirror Temple A - Room b-10 Strawberry", "5a_b-10_east", LocationType.strawberry, []),
51665166
"5a_b-12_strawberry": LevelLocation("5a_b-12_strawberry", "Mirror Temple A - Room b-12 Strawberry", "5a_b-12_east", LocationType.strawberry, [[ItemName.red_boosters, ], ]),
51675167
"5a_b-17_strawberry_2": LevelLocation("5a_b-17_strawberry_2", "Mirror Temple A - Room b-17 Strawberry 2", "5a_b-17_west", LocationType.strawberry, [[ItemName.strawberry_seeds, ItemName.springs, ], ]),
51685168
"5a_b-17_strawberry_1": LevelLocation("5a_b-17_strawberry_1", "Mirror Temple A - Room b-17 Strawberry 1", "5a_b-17_north-west", LocationType.strawberry, []),
@@ -5181,7 +5181,7 @@
51815181
"5a_d-19_strawberry": LevelLocation("5a_d-19_strawberry", "Mirror Temple A - Room d-19 Strawberry", "5a_d-19_east", LocationType.strawberry, [["Mirror Temple A - Search Key 3", ], ]),
51825182
"5a_e-06_strawberry": LevelLocation("5a_e-06_strawberry", "Mirror Temple A - Room e-06 Strawberry", "5a_e-06_east", LocationType.strawberry, [[ItemName.dash_switches, ], ]),
51835183
"5a_e-11_clear": LevelLocation("5a_e-11_clear", "Mirror Temple A - Level Clear", "5a_e-11_goal", LocationType.level_clear, []),
5184-
"5a_e-11_golden": LevelLocation("5a_e-11_golden", "Mirror Temple A - Golden Strawberry", "5a_e-11_goal", LocationType.golden_strawberry, [[ItemName.red_boosters, ItemName.swap_blocks, ItemName.dash_switches, "Mirror Temple A - Entrance Key", "Mirror Temple A - Depths Key", "Mirror Temple A - Search Key 1", "Mirror Temple A - Search Key 2", ItemName.seekers, ItemName.coins, ItemName.theo_crystal, ], ]),
5184+
"5a_e-11_golden": LevelLocation("5a_e-11_golden", "Mirror Temple A - Golden Strawberry", "5a_e-11_goal", LocationType.golden_strawberry, [[ItemName.red_boosters, ItemName.swap_blocks, ItemName.dash_switches, ItemName.dash_refills, "Mirror Temple A - Entrance Key", "Mirror Temple A - Depths Key", "Mirror Temple A - Search Key 1", "Mirror Temple A - Search Key 2", ItemName.seekers, ItemName.coins, ItemName.theo_crystal, ], ]),
51855185

51865186
"5b_b-02_key_1": LevelLocation("5b_b-02_key_1", "Mirror Temple B - Central Chamber Key 1", "5b_b-02_south-west", LocationType.key, []),
51875187
"5b_b-02_key_2": LevelLocation("5b_b-02_key_2", "Mirror Temple B - Central Chamber Key 2", "5b_b-02_south-east", LocationType.key, []),
@@ -5310,8 +5310,8 @@
53105310
"10a_d-00_binoculars": LevelLocation("10a_d-00_binoculars", "Farewell - Room d-00 Binoculars", "10a_d-00_south", LocationType.binoculars, []),
53115311
"10a_d-04_binoculars": LevelLocation("10a_d-04_binoculars", "Farewell - Room d-04 Binoculars", "10a_d-04_west", LocationType.binoculars, []),
53125312
"10a_d-04_key_1": LevelLocation("10a_d-04_key_1", "Farewell - Power Source Key 1", "10a_d-04_west", LocationType.key, [[ItemName.double_dash_refills, ItemName.jellyfish, ], ]),
5313-
"10a_d-03_binoculars": LevelLocation("10a_d-03_binoculars", "Farewell - Room d-03 Binoculars", "10a_d-03_west", LocationType.binoculars, [[ItemName.breaker_boxes, ], ]),
5314-
"10a_d-03_key_2": LevelLocation("10a_d-03_key_2", "Farewell - Power Source Key 2", "10a_d-03_west", LocationType.key, [[ItemName.breaker_boxes, ItemName.double_dash_refills, ItemName.jellyfish, ], ]),
5313+
"10a_d-03_binoculars": LevelLocation("10a_d-03_binoculars", "Farewell - Room d-03 Binoculars", "10a_d-03_west", LocationType.binoculars, [[ItemName.breaker_boxes, ItemName.double_dash_refills, ItemName.dash_switches, ], ]),
5314+
"10a_d-03_key_2": LevelLocation("10a_d-03_key_2", "Farewell - Power Source Key 2", "10a_d-03_west", LocationType.key, [[ItemName.breaker_boxes, ItemName.double_dash_refills, ItemName.dash_switches, ItemName.jellyfish, ], ]),
53155315
"10a_d-01_binoculars": LevelLocation("10a_d-01_binoculars", "Farewell - Room d-01 Binoculars", "10a_d-01_east", LocationType.binoculars, []),
53165316
"10a_d-01_key_3": LevelLocation("10a_d-01_key_3", "Farewell - Power Source Key 3", "10a_d-01_east", LocationType.key, [[ItemName.dash_refills, ItemName.dash_switches, ItemName.jellyfish, ], ]),
53175317
"10a_d-02_binoculars": LevelLocation("10a_d-02_binoculars", "Farewell - Room d-02 Binoculars", "10a_d-02_bottom", LocationType.binoculars, [[ItemName.breaker_boxes, ], ]),

0 commit comments

Comments
 (0)