Merge branch 'main' into fixfilenames

Author: Emerassi

worlds/crystal_project/__init__.py

@@ -398,16 +398,16 @@ def set_rules(self) -> None:
         win_condition_item: str
         if self.options.goal == self.options.goal.option_astley:
             win_condition_item = "Item - New World Stone" # todo should this still be here if we auto-hand you the stone?
-        elif self.options.goal == self.options.goal.option_true_astley:
-            win_condition_item = "Item - Old World Stone"
+        #elif self.options.goal == self.options.goal.option_true_astley:
+        #    win_condition_item = "Item - Old World Stone"
         elif self.options.goal == self.options.goal.option_clamshells:
             win_condition_item = "Item - Clamshell"
 
         if self.options.goal == 0:
             self.multiworld.completion_condition[self.player] = lambda state: logic.has_jobs(state, self.options.newWorldStoneJobQuantity.value)
-        if self.options.goal == 1:
-            self.multiworld.completion_condition[self.player] = lambda state: state.has(win_condition_item, self.player)
-        if self.options.goal == 2:
+        #elif self.options.goal == 1:
+        #    self.multiworld.completion_condition[self.player] = lambda state: state.has(win_condition_item, self.player)
+        elif self.options.goal == 2:
             self.multiworld.completion_condition[self.player] = lambda state: state.has(win_condition_item, self.player, self.options.clamshellsQuantity.value)
 
     def get_job_id_list(self) -> List[int]:

worlds/crystal_project/options.py

@@ -13,13 +13,11 @@ class Goal(Choice):
     
     Astley: Defeat Astley in the New World. A New World Stone will be given to the player after obtaining a certain number of jobs.
     
-    True Astley: Defeat Astley but more somehow.
-
     Clamshells: Collect enough clamshells for the clam lover.
     """
     display_name = "Goal"
     option_astley = 0
-    option_true_astley = 1
+    #option_true_astley = 1 True Astley: Defeat Astley but more somehow.
     option_clamshells = 2
     default = 0
 
@@ -120,7 +118,7 @@ class IncludedRegions(Choice):
     default = 3
 
 #"""Progression Options"""
-class LevelGating(Toggle):
+class LevelGating(DefaultOnToggle):
     """
     When enabled, the parties maximum level will be capped, with items in the pool increasing that cap.
     Areas in the game will be considered out of logic (but still accessible) if the party level cap is below the area level.
@@ -158,13 +156,11 @@ class KeyMode(Choice):
 
     Skeleton Key: Only the Skeleton Key, which can open any locked door, will be in your item pool.
 
-    Key Ring: One check will give all keys needed to complete one dungeon. The Skeleton Key will still be in the pool. NOT IMPLEMENTED
-
     Vanilla: All vanilla keys will be in the item pool.
     """
     display_name = "Key Mode"
     option_skeleton = 0
-    option_key_ring = 1
+    #option_key_ring = 1 Key Ring: One check will give all keys needed to complete one dungeon. The Skeleton Key will still be in the pool.
     option_vanilla = 2
     default = 2