From 47ab40f50ece17c458422ab1d09c305b00a01e2a Mon Sep 17 00:00:00 2001 From: kindasneaki Date: Fri, 27 Oct 2023 23:05:28 -0600 Subject: [PATCH 1/3] move weights into ROR2Options --- worlds/ror2/Options.py | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py index 79739e85efcb..4f9f874d2a06 100644 --- a/worlds/ror2/Options.py +++ b/worlds/ror2/Options.py @@ -57,6 +57,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 +65,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 +85,7 @@ class ItemPickupStep(Range): range_end = 5 default = 1 + class ShrineUseStep(Range): """ Explore Mode: @@ -131,7 +134,6 @@ class DLC_SOTV(Toggle): display_name = "Enable DLC - SOTV" - class GreenScrap(Range): """Weight of Green Scraps in the item pool. @@ -274,25 +276,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 @@ -310,4 +295,16 @@ class ROR2Options(PerGameCommonOptions, ROR2Weights): shrine_use_step: ShrineUseStep enable_lunar: AllowLunarItems item_weights: ItemWeights - item_pool_presets: ItemPoolPresetToggle \ No newline at end of file + 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 From ffb1ee4f5ca068f00c2b1af5328992a43b95edb9 Mon Sep 17 00:00:00 2001 From: kindasneaki Date: Fri, 27 Oct 2023 23:05:51 -0600 Subject: [PATCH 2/3] Change option defaults --- worlds/ror2/Options.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py index 4f9f874d2a06..1b709405356e 100644 --- a/worlds/ror2/Options.py +++ b/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.""" From 5b70370ea35f1a6fd10c2e105a8a9924ac09444b Mon Sep 17 00:00:00 2001 From: kindasneaki Date: Fri, 27 Oct 2023 23:09:04 -0600 Subject: [PATCH 3/3] remove a space. --- worlds/ror2/Options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py index 1b709405356e..0ed0a87b17d6 100644 --- a/worlds/ror2/Options.py +++ b/worlds/ror2/Options.py @@ -297,7 +297,7 @@ class ROR2Options(PerGameCommonOptions): enable_lunar: AllowLunarItems item_weights: ItemWeights item_pool_presets: ItemPoolPresetToggle - # define the weights of the generated item pool. + # define the weights of the generated item pool. green_scrap: GreenScrap red_scrap: RedScrap yellow_scrap: YellowScrap