Skip to content

Commit

Permalink
Version bump and metadeta update for new season
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewkirby committed Jan 27, 2025
1 parent cc7e5b7 commit 104253e
Show file tree
Hide file tree
Showing 6 changed files with 816 additions and 7 deletions.
4 changes: 2 additions & 2 deletions RandomSettingsGenerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
global_override_fname = None

# Please set the weights file you with to load
WEIGHTS = "RSL" # The default Random Settings League Season 6 weights
WEIGHTS = "RSL" # The default Random Settings League Season 7 weights
# Every setting with even weights
# WEIGHTS = "full-random"
# Provide your own weights file. If the specified file does not exist, this will create it
Expand Down Expand Up @@ -110,7 +110,7 @@ def main():

# If we only want to check for new/changed settings
if args["check_new_settings"]:
_, _, rslweights = rs.load_weights_file("weights/rsl_season6.json")
_, _, rslmultis, rslweights = rs.load_weights_file("weights/rsl_season7.json")
tools.check_for_setting_changes(rslweights, rs.generate_balanced_weights(None))
return

Expand Down
2 changes: 1 addition & 1 deletion conditionals.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def limit_overworld_entrances_in_mixed_entrance_pools(random_settings, **kwargs)
overworld_probability = string_to_int(kwargs['cparams'][0])
includeOverworld = random.random()*100 < overworld_probability
# If needed, remove overworld from mixed pools
if not includeOverworld:
if not includeOverworld and "Overworld" in random_settings["mix_entrance_pools"]:
random_settings["mix_entrance_pools"].remove("Overworld")


Expand Down
2 changes: 1 addition & 1 deletion roll_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def draw_dungeon_shortcuts(random_settings):
def generate_weights_override(weights, override_weights_fname):
# Load the weight dictionary
if weights == "RSL":
weight_options, conditionals, weight_multiselect, weight_dict = load_weights_file("weights/rsl_season6.json")
weight_options, conditionals, weight_multiselect, weight_dict = load_weights_file("weights/rsl_season7.json")
elif weights == "full-random":
weight_options = None
weight_dict = generate_balanced_weights(None)
Expand Down
6 changes: 3 additions & 3 deletions rslversion.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
__version__ = "2.7.4"
__version__ = "2.8.0"

# Randomizer Info
randomizer_repo = 'rrealmuto/OoT-Randomizer'
randomizer_version = '8.1.81 Rob-117'
randomizer_commit = '10c20567d10cf1a1f477f1c5752e170ec518338d'
randomizer_version = '8.2.50 Rob-128'
randomizer_commit = '2030053144ce99f3364244117db64ba9585a1513'

# Requirements
MIN_PY_VERSION = (3, 9)
Loading

0 comments on commit 104253e

Please sign in to comment.