From 705cb2e8160e4169a6ecb82598f7afc3ab8418df Mon Sep 17 00:00:00 2001
From: FlySniper <brajcan@hotmail.com>
Date: Thu, 16 May 2024 12:46:13 -0400
Subject: [PATCH] Wargroove: Switched to options API. (#3306)

* Wargroove: Switched to options API.

* Update Options.py

* Update __init__.py

* Options is plural

* Wargroove: Options updates with some small fixes.

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---
 worlds/wargroove/Options.py  | 14 +++++++-------
 worlds/wargroove/__init__.py | 24 +++++++++++-------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/worlds/wargroove/Options.py b/worlds/wargroove/Options.py
index c8b8b37e..1af07720 100644
--- a/worlds/wargroove/Options.py
+++ b/worlds/wargroove/Options.py
@@ -1,5 +1,6 @@
 import typing
-from Options import Choice, Option, Range
+from dataclasses import dataclass
+from Options import Choice, Option, Range, PerGameCommonOptions
 
 
 class IncomeBoost(Range):
@@ -30,9 +31,8 @@ class CommanderChoice(Choice):
     option_unlockable_factions = 1
     option_random_starting_faction = 2
 
-
-wargroove_options: typing.Dict[str, type(Option)] = {
-    "income_boost": IncomeBoost,
-    "commander_defense_boost": CommanderDefenseBoost,
-    "commander_choice": CommanderChoice
-}
+@dataclass
+class WargrooveOptions(PerGameCommonOptions):
+    income_boost: IncomeBoost
+    commander_defense_boost: CommanderDefenseBoost
+    commander_choice: CommanderChoice
diff --git a/worlds/wargroove/__init__.py b/worlds/wargroove/__init__.py
index abca210b..f204f468 100644
--- a/worlds/wargroove/__init__.py
+++ b/worlds/wargroove/__init__.py
@@ -7,8 +7,8 @@ from .Items import item_table, faction_table
 from .Locations import location_table
 from .Regions import create_regions
 from .Rules import set_rules
-from ..AutoWorld import World, WebWorld
-from .Options import wargroove_options
+from worlds.AutoWorld import World, WebWorld
+from .Options import WargrooveOptions
 
 
 class WargrooveSettings(settings.Group):
@@ -38,11 +38,11 @@ class WargrooveWorld(World):
     Command an army, in this retro style turn based strategy game!
     """
 
-    option_definitions = wargroove_options
+    options: WargrooveOptions
+    options_dataclass = WargrooveOptions
     settings: typing.ClassVar[WargrooveSettings]
     game = "Wargroove"
     topology_present = True
-    data_version = 1
     web = WargrooveWeb()
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
@@ -50,16 +50,17 @@ class WargrooveWorld(World):
 
     def _get_slot_data(self):
         return {
-            'seed': "".join(self.multiworld.per_slot_randoms[self.player].choice(string.ascii_letters) for i in range(16)),
-            'income_boost': self.multiworld.income_boost[self.player],
-            'commander_defense_boost': self.multiworld.commander_defense_boost[self.player],
-            'can_choose_commander': self.multiworld.commander_choice[self.player] != 0,
+            'seed': "".join(self.random.choice(string.ascii_letters) for i in range(16)),
+            'income_boost': self.options.income_boost.value,
+            'commander_defense_boost': self.options.commander_defense_boost.value,
+            'can_choose_commander': self.options.commander_choice.value != 0,
+            'commander_choice': self.options.commander_choice.value,
             'starting_groove_multiplier': 20  # Backwards compatibility in case this ever becomes an option
         }
 
     def generate_early(self):
         # Selecting a random starting faction
-        if self.multiworld.commander_choice[self.player] == 2:
+        if self.options.commander_choice.value == 2:
             factions = [faction for faction in faction_table.keys() if faction != "Starter"]
             starting_faction = WargrooveItem(self.multiworld.random.choice(factions) + ' Commanders', self.player)
             self.multiworld.push_precollected(starting_faction)
@@ -68,7 +69,7 @@ class WargrooveWorld(World):
         # Fill out our pool with our items from the item table
         pool = []
         precollected_item_names = {item.name for item in self.multiworld.precollected_items[self.player]}
-        ignore_faction_items = self.multiworld.commander_choice[self.player] == 0
+        ignore_faction_items = self.options.commander_choice.value == 0
         for name, data in item_table.items():
             if data.code is not None and name not in precollected_item_names and not data.classification == ItemClassification.filler:
                 if name.endswith(' Commanders') and ignore_faction_items:
@@ -105,9 +106,6 @@ class WargrooveWorld(World):
 
     def fill_slot_data(self) -> dict:
         slot_data = self._get_slot_data()
-        for option_name in wargroove_options:
-            option = getattr(self.multiworld, option_name)[self.player]
-            slot_data[option_name] = int(option.value)
         return slot_data
 
     def get_filler_item_name(self) -> str: