Merge 'Add water hop to morpha and compass chest + MQ' (OoTRandomizer#2496)

Author: fenhl

CHANGELOG.md

@@ -5,6 +5,7 @@
 * The `Free Reward from Rauru` has a new `Yes (Forced)` option which forces the check to be a dungeon reward even if these are otherwise shuffled.
 * The `Maps & Compasses` shuffle setting has been split into separate `Maps` and `Compasses` settings.
 * The Farore's Wind text box now distinguishes between Ganon's Castle and Ganon's Tower.
+* New `Water Hop` trick added to advanced logic.
 
 ## Bug fixes
 * Fix a potential softlock when talking to Pierre (the upper scarecrow) as child in Lake Hylia.

SettingsListTricks.py

@@ -2872,6 +2872,18 @@
                     You can also do the same by abusing invincibility frames
                     if not on ohko.
                     '''},
+    '(Advanced) Water Hop': {
+        'name'    : 'adv_water_hop',
+        'tags'    : ("Advanced",),
+        'tooltip' : '''\
+                    By equipping the Iron Boots right before surfacing,
+                    you can keep the momentum from the swim up from a dive
+                    to propel yourself out of the water higher than usual
+                    allowing ledges to be grabbed.
+
+                    Notably allows for access to Morpha's ledge and the
+                    Eastern Middle Layer ledge in Water Temple.
+                    '''},
     '(Glitch) Water Temple Antigrav to Boss Key Area': {
         'name'    : 'glitch_water_bk_area_antigrav',
         'tags'    : ("Glitch","Adult","Water Temple","Water Temple MQ",),

data/Glitched World/Water Temple MQ.json

@@ -51,9 +51,11 @@
                 is_adult and (Zora_Tunic or logic_fewer_tunic_requirements) and Iron_Boots
                 )",
             "Water Temple Storage Room": "is_adult and Iron_Boots and
-                (Zora_Tunic or logic_fewer_tunic_requirements) and Hookshot",
+                (Zora_Tunic or logic_fewer_tunic_requirements) and
+                (Hookshot or adv_water_hop)",
             "Water Temple Before Boss Lower": "can_use(Longshot) or
                 (adv_hovers_recoil and can_use(Hover_Boots) and Megaton_Hammer) or
+                (adv_water_hop and can_use(Iron_Boots) and Raise_Water_Level) or
                 ((can_mega or can_hess or can_superslide) and can_use(Hover_Boots)) or
                 can_hover",
             "Water Temple After Waterfall Room": "

data/Glitched World/Water Temple.json

@@ -33,9 +33,13 @@
                 ((logic_water_temple_torch_longshot and Longshot) or Iron_Boots)
                 )",
             "Water Temple Compass Room": "is_adult and Iron_Boots and
-                (Zora_Tunic or logic_fewer_tunic_requirements) and Hookshot",
+                (Zora_Tunic or logic_fewer_tunic_requirements) and
+                (Hookshot
+                    or (adv_water_hop and can_live_dmg(1.0,false,false))
+                )",
             "Water Temple Before Boss": "can_use(Longshot) or
                 (adv_hovers_recoil and can_use(Hover_Boots) and Megaton_Hammer) or
+                (adv_water_hop and can_use(Iron_Boots) and Raise_Water_Level) or
                 ((can_mega or can_hess or can_superslide) and can_use(Hover_Boots)) or
                 can_hover",
             "Water Temple North Basement": "can_use(Iron_Boots) and (Zora_Tunic or logic_fewer_tunic_requirements)

version.py

@@ -1,4 +1,4 @@
-__version__ = '9.0.12'
+__version__ = '9.0.13'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0