Skip to content

Commit 03b7479

Browse files
committed
Merge 'Disable all sections on Main Rules tab when randomized' (OoTRandomizer#2414)
2 parents a586e28 + e35ed4f commit 03b7479

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* Fix the “VC Crash” bug.
3131
* Fix Spirit Temple music not resuming after Nabooru is defeated.
3232
* Fix Grog not spawning when Odd Mushroom reverts on savewarp.
33+
* Fix some settings on the `Main Rules` tab not being disabled when `Randomize Main Rule Settings` is enabled.
3334

3435
## New Speedups
3536
* The first text box from each carpenter in the Thieves' Hideout is skipped.

SettingsList.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -623,17 +623,7 @@ class SettingInfos:
623623
default = False,
624624
disable = {
625625
True: {
626-
'sections': ['shuffle_section'],
627-
'settings': [
628-
'open_forest', 'open_kakariko', 'open_door_of_time', 'zora_fountain', 'gerudo_fortress', 'dungeon_shortcuts_choice',
629-
'dungeon_shortcuts', 'trials_random', 'trials',
630-
'starting_age', 'shuffle_interior_entrances', 'shuffle_hideout_entrances', 'shuffle_gerudo_fortress_heart_piece',
631-
'shuffle_grotto_entrances', 'shuffle_dungeon_entrances',
632-
'shuffle_bosses', 'shuffle_overworld_entrances', 'shuffle_gerudo_valley_river_exit', 'owl_drops', 'warp_songs', 'spawn_positions',
633-
'triforce_hunt', 'triforce_count_per_world', 'triforce_goal_per_world', 'free_bombchu_drops',
634-
'shuffle_mapcompass', 'shuffle_smallkeys', 'shuffle_hideoutkeys', 'shuffle_tcgkeys', 'key_rings_choice', 'key_rings',
635-
'shuffle_silver_rupees', 'silver_rupee_pouches_choice', 'silver_rupee_pouches', 'shuffle_bosskeys', 'enhance_map_compass',
636-
],
626+
'sections': ['open_section', 'world_section', 'shuffle_section', 'shuffle_dungeon_section'],
637627
},
638628
},
639629
shared = True,

version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '8.2.75'
1+
__version__ = '8.2.76'
22

33
# This is a supplemental version number for branches based off of main dev.
44
supplementary_version = 0

0 commit comments

Comments
 (0)