Merge branch 'Dev' into dev-fenhl

# Conflicts: # ItemPool.py # Patches.py # SettingsList.py # data/World/Overworld.json # data/presets_default.json
fenhl · Dec 12, 2024 · 68ddd23 · 68ddd23
2 parents 6315d85 + 16c48c4
commit 68ddd23
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,6 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
 
 * New settings and options:
   * “Pre-completed Dungeons Mode” set to “Specific Rewards” is compatible with “Shuffle Dungeon Rewards” ([#2330](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2330))
-  * New “Shuffle Gerudo Fortress Heart Piece” setting to control the behavior of this check with “Shuffle Thieves' Hideout Entrances” ([#2179](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2179))
   * New “Frogs Ocarina Game” option for the “Randomize Ocarina Song Notes” setting ([#2064](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2064))
   * New “Special Deal Prices”, “Minimum Special Deal Price”, and “Maximum Special Deal Price” settings replacing “Shopsanity Prices” ([#2037](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2037))
   * New plando-only “Chest, Pot, Crate, & Beehive Appearance Does Not Match Contents” setting which makes each chest etc. randomly choose any appearance except the correct one ([#1950](https://github.com/OoTRandomizer/OoT-Randomizer/pull/1950))
@@ -77,7 +76,6 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
   * Fix precompleted dungeon rewards not accounting for boss entrance randomizer ([#2330](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2330))
   * Blue warps setting time of day even on repeated use is now in logic ([#2304](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2304))
   * A trade item obtained from a skipped location is no longer lost upon obtaining a different item from the same trade quest ([#2217](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2217))
-  * The heart piece in Gerudo Fortress now behaves correctly when already at 20 hearts, and is considered in glitched logic (part of [#2179](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2179))
 
 Differences between [`Dev-R`](https://github.com/Roman971/OoT-Randomizer) and [`Dev`](https://github.com/OoTRandomizer/OoT-Randomizer):
 
@@ -205,6 +203,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * New `Require Lens of Truth for Treasure Chest Game` setting.
 * New option `Market Big Poes` for the `Misc. Hints` setting.
 * New setting `Shuffle Ganon's Tower Entrance` to allow shuffling the boss entrance to Ganon himself.
+* New setting to control the behavior of the child-only heart piece in Gerudo Fortress when Thieves' Hideout entrances are shuffled.
 
 #### Bug fixes
 * Ocarina buttons required to play the Song of Time are now part of the `path of time` goal.

diff --git a/SettingsList.py b/SettingsList.py
@@ -1860,6 +1860,41 @@ class SettingInfos:
         },
     )
 
+    shuffle_gerudo_fortress_heart_piece = Combobox(
+        gui_text       = 'Shuffle Gerudo Fortress Heart Piece',
+        default        = 'remove',
+        choices        = {
+            'remove':  'Remove',
+            'vanilla': 'Vanilla',
+            'shuffle': 'Shuffle',
+        },
+        gui_tooltip    = '''\
+            There is an extra heart piece on the balcony above the jail in
+            Gerudo's Fortress if accessed as child. Normally, this is not
+            reachable without glitches, so it's not shuffled and not
+            considered in logic. With the Thieves' Hideout entrances
+            shuffled, it becomes reachable, so use this setting to decide
+            how to handle that.
+
+            'Remove':
+            The heart piece is completely removed from the game. There is
+            no freestanding item to collect above the jail.
+
+            'Vanilla':
+            The heart piece exists as an unshuffled heart piece. It is
+            considered in logic for the purpose of heart win conditions.
+
+            'Shuffle':
+            There is a shuffled item above the jail and the extra heart
+            piece is shuffled into the item pool. Both are considered in
+            logic.
+        ''',
+        shared         = True,
+        gui_params     = {
+            "hide_when_disabled": True,
+        },
+    )
+
     shuffle_grotto_entrances = Checkbutton(
         gui_text       = 'Shuffle Grotto Entrances',
         gui_tooltip    = '''\

diff --git a/data/World/Overworld.json b/data/World/Overworld.json
@@ -12,6 +12,7 @@
             "Root Exits": "is_starting_age or Time_Travel",
             "HC Garden Skippable Locations": "skip_child_zelda",
             "Beyond Door of Time Skippable Locations": "skip_reward_from_rauru",
+            # Hack to make ALR work if hideout entrances are unshuffled
             "GF Above Jail Child Locations": "shuffle_gerudo_fortress_heart_piece == 'remove' or not shuffle_hideout_entrances"
         }
     },
@@ -862,7 +863,6 @@
         }
     },
     {
-        # Hack to make ALR work if hideout entrances are unshuffled
         "region_name": "GF Above Jail Child Locations",
         "scene": "Gerudo Fortress",
         "hint": "GERUDO_FORTRESS",

diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.2.38'
+__version__ = '8.2.39'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 1