Merge 'logic bugfix for entering botw' (OoTRandomizer#2530)

Author: fenhl

CHANGELOG.md

@@ -5,7 +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.
+* New `Water Hop` trick and `BotW Cucco Dive` glitch added to advanced logic.
 * Improve Debug menu with new options.
 * Refill items sold as special deals are now less likely to cost more than the "market price" of a repeatable purchase.
 * The heart chest texture has been tweaked to display heart icons on the lid rather than triangles.

SettingsListTricks.py

@@ -2378,6 +2378,14 @@
                     Drop a chu, then perform a ledgeclip from the edge near windmill
                     entrance to clip into BotW as adult. Alternative to Odie clip.
                     '''},
+    '(Glitch) BotW Cucco Dive': {
+        'name'    : 'glitch_botw_cucco_dive',
+        'tags'    : ("Glitch","Child","Bottom of the Well",),
+        'tooltip' : '''\
+                    Using ISG (individual trick not required) or Nuts, you can trigger
+                    the angry cucco cutscene as you enter the water, allowing Link to
+                    fall through it and enter the Bottom of the Well.
+                    '''},
     '(Glitch) BotW Blank A': {
         'name'    : 'glitch_botw_blank_a',
         'tags'    : ("Glitch","Child","Bottom of the Well",),

data/Glitched World/Overworld.json

@@ -1971,7 +1971,9 @@
                 or
                 (is_child and
                     ( (glitch_navi_dive and can_jumpslash)
-                    or (at_day and (can_isg or Nuts))
+                    or (at_day and glitch_botw_cucco_dive and
+                        (Nuts or (can_shield and (Sticks or Kokiri_Sword or can_use(Megaton_Hammer))))
+                        )
                     )
                 )
                 or

version.py

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