Made it so collectable requirements gates the goal level, and fixed documentation

Author: doshyw

worlds/celeste/docs/en_Celeste.md

@@ -35,22 +35,17 @@ greyed out cannot be pressed, blocking access to Chapters/Sides that are not yet
 
 ## What is the goal for a Celeste world?
 
-At the moment, the only available goal for a Celeste world is to complete "Chapter 10: Farewell". This is done by
-receiving one of the three `Level 9 X-Side Completion` items from the multi-world, and then accessing and playing
-through Chapter 10.
+The following goals can be selected for a Celeste world:
+- Completing "Chapter 7: The Summit" A-Side.
+- Completing "Chapter 8: Core" A-Side.
+- Completing "Chapter 9: Farewell" A-Side.
 
 There is a set of options that allow you to configure how many items of different types need to have been collected
-prior to passing through the Crystal Heart Gate in Chapter 10. It defaults to matching the original story progression
-(i.e., requiring 15 different Crystal Hearts and nothing else), but can be modified to make it either easier or harder
-to pass through the gate. The required number of Cassettes, Crystal Hearts, Level Completions, and Strawberries can all
-be configured.
+prior to accessing the goal level. The required number of Cassettes, Crystal Hearts, Level Completions, and Strawberries can all be configured.
 
 The following goals are currently being planned for addition:
-- Completing "Chapter 7: The Summit" A-Side.
-- Completing "Chapter 8: Core" A-Side.
 - Completing some set of Sides (e.g., all A-Sides, all A and B-Sides, etc) for all Chapters in-game.
 
-
 The following configuration options are also being planned:
 - Toggle for whether the end-game item checks are based on receiving items from the multi-world or completing location
 checks.

worlds/celeste/items.py

@@ -99,7 +99,7 @@ def create_from_pandas(world: World, row: Dict[str, Any]) -> "CelesteLocation":
                 location.access_rule = lambda state: state.has_group("gemhearts", world.player, 15)
             elif location.side == 2:
                 location.access_rule = lambda state: state.has_group("gemhearts", world.player, 23)
-        if location.level == 10:
+        if location.level == world.completion_level:
             location.access_rule = (
                 lambda state: state.has_group(
                     "gemhearts", world.player, get_option_value(world.multiworld, world.player, "hearts_required")

worlds/celeste/options.py

@@ -8,7 +8,7 @@
 
 
 class BerriesRequired(Range):
-    """Number of Strawberries required to pass through the Crystal Heart Gate in Chapter 9: Farewell."""
+    """Number of Strawberries required to access the goal level."""
 
     display_name = "Strawberry Requirement"
     range_start = 0
@@ -17,7 +17,7 @@ class BerriesRequired(Range):
 
 
 class CassettesRequired(Range):
-    """Number of Cassettes required to pass through the Crystal Heart Gate in Chapter 9: Farewell."""
+    """Number of Cassettes required to access the goal level."""
 
     display_name = "Cassette Requirement"
     range_start = 0
@@ -26,16 +26,16 @@ class CassettesRequired(Range):
 
 
 class HeartsRequired(Range):
-    """Number of Crystal Hearts required to pass through the Crystal Heart Gate in Chapter 9: Farewell."""
+    """Number of Crystal Hearts required to access the goal level."""
 
     display_name = "Crystal Heart Requirement"
     range_start = 0
     range_end = 24
-    default = 15
+    default = 0
 
 
 class LevelsRequired(Range):
-    """Number of Level Completions required to pass through the Crystal Heart Gate in Chapter 9: Farewell."""
+    """Number of Level Completions required to access the goal level."""
 
     display_name = "Level Completion Requirement"
     range_start = 0