Added gadget_rando & some description adjustments

worlds/grinch/Options.py

@@ -42,13 +42,14 @@ class Missionsanity(Choice):
 class ExcludeEnvironments(OptionSet):
     """
     Allows entire environments to be an excluded location to ensure you are not logically required to enter the environment along
-    with any and all checks that are in that environment too. WARNING: Excluding too many environments may cause generation to fail.
+    with any and all checks that are in that environment too.
+
+    WARNING: Excluding too many environments may cause generation to fail.
     [NOT IMPLEMENTED]
 
     Valid keys: "Whoville", "Who Forest", "Who Dump", "Who Lake", "Post Office", "Clock Tower", "City Hall",
                   "Ski Resort", "Civic Center", "Minefield", "Power Plant", "Generator Building", "Scout's Hut",
                   "North Shore", "Mayor's Villa", "Sleigh Ride"
-
     """
     display_name = "Exclude Environments"
     valid_keys = {"Whoville", "Who Forest", "Who Dump", "Who Lake", "Post Office", "Clock Tower", "City Hall",
@@ -68,7 +69,8 @@ class Supadow(Toggle):
 class Gifts(Range):
     """
     Considers how many gifts must be squashed per check.
-    Enabling this will also enable squashing all gifts in a region mission along side this. [NOT IMPLEMENTED]"""
+    Enabling this will also enable squashing all gifts in a region mission along side this. [NOT IMPLEMENTED]
+    """
     display_name = "Gifts Squashed per Check"
     range_start = 0
     range_end = 300
@@ -77,13 +79,17 @@ class Gifts(Range):
 class GadgetRando(OptionSet):
     """
     Randomizes Grinch's gadgets along with randomizing Binoculars into the pool. [NOT IMPLEMENTED]
-
-    Valid keys: "Binoculars", "Rotten Egg Launcher", "Rocket Spring", "Slime Shooter", "Octopus Climbing Device",
-                "Marine Mobile", "Grinch Copter"
     """
     display_name = "Gadgets Randomized"
-    valid_keys = {"Binoculars", "Rotten Egg Launcher", "Rocket Spring", "Slime Shooter", "Octopus Climbing Device",
+    default = [
-                "Marine Mobile", "Grinch Copter"}
+        "Binoculars",
+        "Rotten Egg Launcher",
+        "Rocket Spring",
+        "Slime Shooter",
+        "Octopus Climbing Device",
+        "Marine Mobile",
+        "Grinch Copter"
+    ]
 
 class Moverando(OptionSet):
     """Randomizes Grinch's moveset along with randomizing max into the pool. [NOT IMPLEMENTED]
@@ -91,7 +97,13 @@ class Moverando(OptionSet):
     Valid keys: "Pancake", "Seize", "Max", "Bad Breath", "Sneak"
     """
     display_name = "Moves Randomized"
-    valid_keys = {"Pancake", "Seize", "Max", "Bad Breath", "Sneak"}
+    default = [
+        "Pancake",
+        "Seize",
+        "Max",
+        "Bad Breath",
+        "Sneak"
+    ]
 
 class UnlimitedEggs(Toggle):
     """Determine whether or not you run out of rotten eggs when you utilize your gadgets."""
@@ -114,6 +126,7 @@ class GrinchOptions(PerGameCommonOptions):#DeathLinkMixin
     progressive_gadget: ProgressiveGadget
     supadow_minigames: Supadow
     giftsanity: Gifts
+    gadget_rando: GadgetRando
     move_rando: Moverando
     unlimited_eggs: UnlimitedEggs
     ring_link: RingLinkOption

worlds/grinch/__init__.py

@@ -8,7 +8,7 @@ from .Client import *
 from typing import ClassVar
 
 from worlds.AutoWorld import World
-import Options
+from Options import OptionError
 
 from .Options import GrinchOptions
 from .Rules import access_rules_dict
@@ -31,7 +31,7 @@ class GrinchWorld(World):
 
     def generate_early(self) -> None: #Special conditions changed before generation occurs
         if self.options.ring_link == 1 and self.options.unlimited_eggs == 1:
-            raise Options.OptionError("Cannot enable both unlimited rotten eggs and ring links. You can only enable one of these at a time."+
+            raise OptionError("Cannot enable both unlimited rotten eggs and ring links. You can only enable one of these at a time." +
                                       f"The following player's YAML needs to be fixed: {self.player_name}")