From e1fe999e44ce77330c2456d2e8c489cab21adf55 Mon Sep 17 00:00:00 2001
From: agilbert1412 <alexgilbert@yahoo.com>
Date: Thu, 23 May 2024 03:22:28 +0300
Subject: [PATCH] Stardew valley: Create Option Groups (#3376)

* - Fix link in Stardew Setup Guide

* - Create option groups for Stardew Valley

* - Cleaned up the imports

* - Fixed double quotes and trailing comma

* - Improve order in the multipliers category
---
 worlds/stardew_valley/__init__.py      |  2 +
 worlds/stardew_valley/option_groups.py | 65 ++++++++++++++++++++++++++
 worlds/stardew_valley/options.py       | 14 +++---
 3 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 worlds/stardew_valley/option_groups.py

diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 6a82a2a26dd8..dafb1c64730f 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -13,6 +13,7 @@
 from .logic.bundle_logic import BundleLogic
 from .logic.logic import StardewLogic
 from .logic.time_logic import MAX_MONTHS
+from .option_groups import sv_option_groups
 from .options import StardewValleyOptions, SeasonRandomization, Goal, BundleRandomization, BundlePrice, NumberOfLuckBuffs, NumberOfMovementBuffs, \
     BackpackProgression, BuildingProgression, ExcludeGingerIsland, TrapItems, EntranceRandomization
 from .presets import sv_options_presets
@@ -39,6 +40,7 @@ class StardewWebWorld(WebWorld):
     theme = "dirt"
     bug_report_page = "https://github.com/agilbert1412/StardewArchipelago/issues/new?labels=bug&title=%5BBug%5D%3A+Brief+Description+of+bug+here"
     options_presets = sv_options_presets
+    option_groups = sv_option_groups
 
     tutorials = [
         Tutorial(
diff --git a/worlds/stardew_valley/option_groups.py b/worlds/stardew_valley/option_groups.py
new file mode 100644
index 000000000000..50709c10fd49
--- /dev/null
+++ b/worlds/stardew_valley/option_groups.py
@@ -0,0 +1,65 @@
+from Options import OptionGroup, DeathLink, ProgressionBalancing, Accessibility
+from .options import (Goal, StartingMoney, ProfitMargin, BundleRandomization, BundlePrice,
+                      EntranceRandomization, SeasonRandomization, Cropsanity, BackpackProgression,
+                      ToolProgression, ElevatorProgression, SkillProgression, BuildingProgression,
+                      FestivalLocations, ArcadeMachineLocations, SpecialOrderLocations,
+                      QuestLocations, Fishsanity, Museumsanity, Friendsanity, FriendsanityHeartSize,
+                      NumberOfMovementBuffs, NumberOfLuckBuffs, ExcludeGingerIsland, TrapItems,
+                      MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier,
+                      FriendshipMultiplier, DebrisMultiplier, QuickStart, Gifting, FarmType,
+                      Monstersanity, Shipsanity, Cooksanity, Chefsanity, Craftsanity, Mods)
+
+sv_option_groups = [
+    OptionGroup("General", [
+        Goal,
+        FarmType,
+        BundleRandomization,
+        BundlePrice,
+        EntranceRandomization,
+        ExcludeGingerIsland,
+    ]),
+    OptionGroup("Major Unlocks", [
+        SeasonRandomization,
+        Cropsanity,
+        BackpackProgression,
+        ToolProgression,
+        ElevatorProgression,
+        SkillProgression,
+        BuildingProgression,
+    ]),
+    OptionGroup("Extra Shuffling", [
+        FestivalLocations,
+        ArcadeMachineLocations,
+        SpecialOrderLocations,
+        QuestLocations,
+        Fishsanity,
+        Museumsanity,
+        Friendsanity,
+        FriendsanityHeartSize,
+        Monstersanity,
+        Shipsanity,
+        Cooksanity,
+        Chefsanity,
+        Craftsanity,
+    ]),
+    OptionGroup("Multipliers and Buffs", [
+        StartingMoney,
+        ProfitMargin,
+        ExperienceMultiplier,
+        FriendshipMultiplier,
+        DebrisMultiplier,
+        NumberOfMovementBuffs,
+        NumberOfLuckBuffs,
+        TrapItems,
+        MultipleDaySleepEnabled,
+        MultipleDaySleepCost,
+        QuickStart,
+    ]),
+    OptionGroup("Advanced Options", [
+        Gifting,
+        DeathLink,
+        Mods,
+        ProgressionBalancing,
+        Accessibility,
+    ]),
+]
diff --git a/worlds/stardew_valley/options.py b/worlds/stardew_valley/options.py
index 191a634496e4..ba1ebfb9c177 100644
--- a/worlds/stardew_valley/options.py
+++ b/worlds/stardew_valley/options.py
@@ -697,8 +697,6 @@ class Mods(OptionSet):
 class StardewValleyOptions(PerGameCommonOptions):
     goal: Goal
     farm_type: FarmType
-    starting_money: StartingMoney
-    profit_margin: ProfitMargin
     bundle_randomization: BundleRandomization
     bundle_price: BundlePrice
     entrance_randomization: EntranceRandomization
@@ -722,16 +720,18 @@ class StardewValleyOptions(PerGameCommonOptions):
     craftsanity: Craftsanity
     friendsanity: Friendsanity
     friendsanity_heart_size: FriendsanityHeartSize
+    exclude_ginger_island: ExcludeGingerIsland
+    quick_start: QuickStart
+    starting_money: StartingMoney
+    profit_margin: ProfitMargin
+    experience_multiplier: ExperienceMultiplier
+    friendship_multiplier: FriendshipMultiplier
+    debris_multiplier: DebrisMultiplier
     movement_buff_number: NumberOfMovementBuffs
     luck_buff_number: NumberOfLuckBuffs
-    exclude_ginger_island: ExcludeGingerIsland
     trap_items: TrapItems
     multiple_day_sleep_enabled: MultipleDaySleepEnabled
     multiple_day_sleep_cost: MultipleDaySleepCost
-    experience_multiplier: ExperienceMultiplier
-    friendship_multiplier: FriendshipMultiplier
-    debris_multiplier: DebrisMultiplier
-    quick_start: QuickStart
     gifting: Gifting
     mods: Mods
     death_link: DeathLink