RoR2: update options (#2391)

worlds/ror2/Options.py

@@ -16,7 +16,7 @@ class Goal(Choice):
     display_name = "Game Mode"
     option_classic = 0
     option_explore = 1
-    default = 0
+    default = 1
 
 
 class TotalLocations(Range):
@@ -48,7 +48,8 @@ class ScavengersPerEnvironment(Range):
     display_name = "Scavenger per Environment"
     range_start = 0
     range_end = 1
-    default = 1
+    default = 0
+
 
 class ScannersPerEnvironment(Range):
     """Explore Mode: The number of scanners locations per environment."""
@@ -57,6 +58,7 @@ class ScannersPerEnvironment(Range):
     range_end = 1
     default = 1
 
+
 class AltarsPerEnvironment(Range):
     """Explore Mode: The number of altars locations per environment."""
     display_name = "Newts Per Environment"
@@ -64,6 +66,7 @@ class AltarsPerEnvironment(Range):
     range_end = 2
     default = 1
 
+
 class TotalRevivals(Range):
     """Total Percentage of `Dio's Best Friend` item put in the item pool."""
     display_name = "Total Revives as percentage"
@@ -83,6 +86,7 @@ class ItemPickupStep(Range):
     range_end = 5
     default = 1
 
+
 class ShrineUseStep(Range):
     """
     Explore Mode:
@@ -131,7 +135,6 @@ class DLC_SOTV(Toggle):
     display_name = "Enable DLC - SOTV"
 
 
-
 class GreenScrap(Range):
     """Weight of Green Scraps in the item pool.
 
@@ -274,25 +277,8 @@ class ItemWeights(Choice):
     option_void = 9
 
 
-
-
-# define a class for the weights of the generated item pool.
 @dataclass
-class ROR2Weights:
-    green_scrap: GreenScrap
-    red_scrap: RedScrap
-    yellow_scrap: YellowScrap
-    white_scrap: WhiteScrap
-    common_item: CommonItem
-    uncommon_item: UncommonItem
-    legendary_item: LegendaryItem
-    boss_item: BossItem
-    lunar_item: LunarItem
-    void_item: VoidItem
-    equipment: Equipment
-
-@dataclass
-class ROR2Options(PerGameCommonOptions, ROR2Weights):
+class ROR2Options(PerGameCommonOptions):
     goal: Goal
     total_locations: TotalLocations
     chests_per_stage: ChestsPerEnvironment
@@ -311,3 +297,15 @@ class ROR2Options(PerGameCommonOptions, ROR2Weights):
     enable_lunar: AllowLunarItems
     item_weights: ItemWeights
     item_pool_presets: ItemPoolPresetToggle
+    # define the weights of the generated item pool.
+    green_scrap: GreenScrap
+    red_scrap: RedScrap
+    yellow_scrap: YellowScrap
+    white_scrap: WhiteScrap
+    common_item: CommonItem
+    uncommon_item: UncommonItem
+    legendary_item: LegendaryItem
+    boss_item: BossItem
+    lunar_item: LunarItem
+    void_item: VoidItem
+    equipment: Equipment