Skip to content

Commit

Permalink
Updated randomizer version, small buff to utility function to check f…
Browse files Browse the repository at this point in the history
…or unconsidered settings in the weights file
  • Loading branch information
matthewkirby committed Oct 14, 2024
1 parent b1e31cd commit 07ba81b
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 12 deletions.
9 changes: 7 additions & 2 deletions multiselects.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,15 @@
'20_skulltulas', '30_skulltulas', '40_skulltulas', '50_skulltulas', 'frogs2', 'mask_shop',
'unique_merchants'],
"adult_trade_start": ['Pocket Egg', 'Pocket Cucco', 'Cojiro', 'Odd Mushroom', 'Odd Potion',
'Poachers Saw', 'Broken Sword', 'Prescription', 'Eyeball Frog', 'Eyedrops', 'Claim Check']
'Poachers Saw', 'Broken Sword', 'Prescription', 'Eyeball Frog', 'Eyedrops', 'Claim Check'],
"potcrate_textures_specific": ['major', 'bosskeys', 'keys', 'tokens', 'hearts'],
"chest_textures_specific": ['major', 'bosskeys', 'keys', 'tokens', 'hearts'],
"empty_dungeons_rewards": ['Kokiri Emerald', 'Goron Ruby', 'Zora Sapphire', 'Light Medallion',
'Forest Medallion', 'Fire Medallion', 'Water Medallion', 'Shadow Medallion',
'Spirit Medallion']
}

invalid_settings = ["mq_dungeons_specific", "empty_dungeons_specific", "misc_hints"]
invalid_settings = ["mq_dungeons_specific", "empty_dungeons_specific", "misc_hints", "empty_dungeons_rewards"]


def _validate_ms_weights(ms_weights):
Expand Down
8 changes: 3 additions & 5 deletions rsl_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
sys.path.append("randomizer")
# from randomizer.SettingsList import get_setting_info
from randomizer.SettingsList import SettingInfos
from multiselects import ms_option_lookup


def randomizer_settings_func(rootdir=os.getcwd(), plando_filename='random_settings.json', worldcount=1):
Expand Down Expand Up @@ -73,11 +74,8 @@ def find_rom_file():
# Compare weights file to settings list to check for changes to the randomizer settings table
def check_for_setting_changes(weights, randomizer_settings):
""" Function to check for new settings and options when the randomizer is updated. """
ignore_list = ["tricks_list_msg", "bingosync_url", "dungeon_shortcuts", "misc_hints", "mix_entrance_pools", "mq_dungeons_specific",
"key_rings", "empty_dungeons_specific", "empty_dungeons_count", "adult_trade_start", "spawn_positions", "hint_dist",
"custom_ice_trap_count", "custom_ice_trap_percent"]
multiselect_list = ["silver_rupee_pouches", "shuffle_child_trade", "starting_inventory", "minor_items_as_major_chest"]
ignore_list += multiselect_list
ignore_list = ["custom_ice_trap_percent", "custom_ice_trap_count", "bingosync_url", "starting_inventory",
"tricks_list_msg", "empty_dungeons_count", "hint_dist"] + list(ms_option_lookup.keys())

# Find new or changed settings by name
old_settings = list(set(weights.keys()) - set(randomizer_settings.keys()))
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.1"
__version__ = "2.7.2"

# Randomizer Info
randomizer_repo = 'rrealmuto/OoT-Randomizer'
randomizer_version = '8.1.29 Rob-101'
randomizer_commit = 'c342eb28bceb1bc4609a955b090a48e6c8632647'
randomizer_version = '8.1.81 Rob-117'
randomizer_commit = '10c20567d10cf1a1f477f1c5752e170ec518338d'

# Requirements
MIN_PY_VERSION = (3, 9)
28 changes: 26 additions & 2 deletions weights/rsl_season6.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@
"spawn_positions": 50,
"shuffle_child_trade": 20,
"minor_items_as_major_chest": 0,
"adult_trade_start": 100
"adult_trade_start": 100,
"potcrate_textures_specific": 100,
"chest_textures_specific": 100
},
"weights": {
"shuffle_loach_reward": {
Expand Down Expand Up @@ -278,7 +280,8 @@
"empty_dungeons_mode": {
"none": 1,
"specific": 0,
"count": 0
"count": 0,
"rewards": 0
},
"key_rings_choice": {
"off": 0,
Expand Down Expand Up @@ -758,6 +761,27 @@
"shuffle_empty_crates": {
"true": 0,
"false": 1
},
"soa_unlocks_chest_texture": {
"true": 0,
"false": 1
},
"soa_unlocks_potcrate_texture": {
"true": 0,
"false": 1
},
"skip_reward_from_rauru": {
"true": 1,
"false": 0
},
"shuffle_dungeon_rewards": {
"vanilla": 0,
"reward": 1,
"dungeon": 0,
"regional": 0,
"overworld": 0,
"any_dungeon": 0,
"anywhere": 0
}
}
}

0 comments on commit 07ba81b

Please sign in to comment.