Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RoR2: update options #2391

Merged
merged 3 commits into from
Oct 31, 2023
Merged

RoR2: update options #2391

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47ab40f
move weights into ROR2Options
kindasneaki Oct 28, 2023
ffb1ee4
Change option defaults
kindasneaki Oct 28, 2023
5b70370
remove a space.
kindasneaki Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions worlds/ror2/Options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Goal(Choice):
display_name = "Game Mode"
option_classic = 0
option_explore = 1
default = 0
default = 1


class TotalLocations(Range):
Expand Down Expand Up @@ -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."""
Expand All @@ -57,13 +58,15 @@ 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"
range_start = 0
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"
Expand All @@ -83,6 +86,7 @@ class ItemPickupStep(Range):
range_end = 5
default = 1


class ShrineUseStep(Range):
"""
Explore Mode:
Expand Down Expand Up @@ -131,7 +135,6 @@ class DLC_SOTV(Toggle):
display_name = "Enable DLC - SOTV"



class GreenScrap(Range):
"""Weight of Green Scraps in the item pool.

Expand Down Expand Up @@ -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
Expand All @@ -310,4 +296,16 @@ class ROR2Options(PerGameCommonOptions, ROR2Weights):
shrine_use_step: ShrineUseStep
enable_lunar: AllowLunarItems
item_weights: ItemWeights
item_pool_presets: ItemPoolPresetToggle
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
Loading