DKC3: Option Groups (#3322)

* DKC3: Option Groups

* Retarget OptionGroup import

worlds/dkc3/Options.py

@@ -1,13 +1,15 @@
 from dataclasses import dataclass
 import typing
 
-from Options import Choice, Range, Option, Toggle, DeathLink, DefaultOnToggle, OptionList, PerGameCommonOptions
+from Options import Choice, Range, Toggle, DeathLink, DefaultOnToggle, OptionGroup, PerGameCommonOptions
 
 
 class Goal(Choice):
     """
     Determines the goal of the seed
+
     Knautilus: Scuttle the Knautilus in Krematoa and defeat Baron K. Roolenstein
+
     Banana Bird Hunt: Find a certain number of Banana Birds and rescue their mother
     """
     display_name = "Goal"
@@ -26,6 +28,7 @@ class IncludeTradeSequence(Toggle):
 class DKCoinsForGyrocopter(Range):
     """
     How many DK Coins are needed to unlock the Gyrocopter
+
     Note: Achieving this number before unlocking the Turbo Ski will cause the game to grant you a
     one-time upgrade to the next non-unlocked boat, until you return to Funky. Logic does not assume
     that you will use this.
@@ -93,6 +96,7 @@ class LevelShuffle(Toggle):
 class Difficulty(Choice):
     """
     Which Difficulty Level to use
+
     NORML: The Normal Difficulty
     HARDR: Many DK Barrels are removed
     TUFST: Most DK Barrels and all Midway Barrels are removed
@@ -159,19 +163,40 @@ class StartingLifeCount(Range):
     default = 5
 
 
+dkc3_option_groups = [
+    OptionGroup("Goal Options", [
+        Goal,
+        KrematoaBonusCoinCost,
+        PercentageOfExtraBonusCoins,
+        NumberOfBananaBirds,
+        PercentageOfBananaBirds,
+    ]),
+    OptionGroup("Aesthetics", [
+        Autosave,
+        MERRY,
+        MusicShuffle,
+        KongPaletteSwap,
+        StartingLifeCount,
+    ]),
+]
+
+
 @dataclass
 class DKC3Options(PerGameCommonOptions):
     #death_link: DeathLink                                 # Disabled
-    goal: Goal
     #include_trade_sequence: IncludeTradeSequence          # Disabled
-    dk_coins_for_gyrocopter: DKCoinsForGyrocopter
+
+    goal: Goal
     krematoa_bonus_coin_cost: KrematoaBonusCoinCost
     percentage_of_extra_bonus_coins: PercentageOfExtraBonusCoins
     number_of_banana_birds: NumberOfBananaBirds
     percentage_of_banana_birds: PercentageOfBananaBirds
+
+    dk_coins_for_gyrocopter: DKCoinsForGyrocopter
     kongsanity: KONGsanity
     level_shuffle: LevelShuffle
     difficulty: Difficulty
+
     autosave: Autosave
     merry: MERRY
     music_shuffle: MusicShuffle