Merge 'advanced logic forest temple fixes' (#2540)

Author: cjohnson57

CHANGELOG.md

@@ -21,6 +21,7 @@
 * Improve the error message when a settings string from the wrong randomizer version is imported.
 * Fix wrong Goal hints being generated for worlds other than the first in multiworld seeds.
 * Added some missing or incorrectly named locations in advanced logic.
+* Various minor fixes for advanced logic.
 
 ## Other Changes
 * It is no longer required to have either the goron tunic or the Fewer Tunic Requirements trick for adult to go from the Bolero warp pad to the Fire temple in logic.

data/Glitched World/Forest Temple MQ.json

@@ -38,8 +38,7 @@
             "Forest Temple Basement": "
                 (Forest_Temple_Jo_and_Beth and Forest_Temple_Amy_and_Meg) or forest_temple_shortcuts
                 or (glitch_forest_temple_basement and can_use(Hover_Boots) and Bombs and can_mega and can_live_dmg(1.0,True,False))",
-            "Forest Temple Green Poe Room": "can_hover or (can_use(Hover_Boots) and has_explosives and
-                can_live_dmg(0.5))"
+            "Forest Temple Green Poe Room": "can_hover or can_hovers_recoil"
         }
     },
     {
@@ -106,7 +105,7 @@
                 can_use(Iron_Boots) or can_use(Longshot) or (Progressive_Scale, 2) or
                 (logic_forest_well_swim and can_use(Hookshot))",
             "Forest Temple Outdoors High Balconies": "can_use(Fire_Arrows) or (can_gdv and can_isg)",
-            "Forest Temple Outside Upper Ledge": "can_hover or can_megajump",
+            "Forest Temple Outside Upper Ledge": "can_hover or (can_megajump and glitch_clipping)",
             "Forest Temple NW Outdoors Freestandings": "logic_forest_courtyard_hearts and can_use(Boomerang)"
         }
     },

data/Glitched World/Forest Temple.json

@@ -38,8 +38,7 @@
             "Forest Temple Basement": "
                 (Forest_Temple_Jo_and_Beth and Forest_Temple_Amy_and_Meg) or forest_temple_shortcuts
                 or (glitch_forest_temple_basement and can_use(Hover_Boots) and Bombs and can_mega and can_live_dmg(1.0,True,False))",
-            "Forest Temple Falling Room": "can_hover or (can_use(Hover_Boots) and has_explosives and
-                can_live_dmg(0.5,False,True))"
+            "Forest Temple Falling Room": "can_hover or can_hovers_recoil"
         }
     },
     {
@@ -63,7 +62,7 @@
             "Forest Temple Outdoors High Balconies": "can_kill_blue_bubble",
             "Forest Temple NW Outdoors Freestandings": "logic_forest_courtyard_hearts and can_use(Boomerang)",
             # Low grav ?
-            "Forest Temple Outside Upper Ledge": "can_hover or can_megajump"
+            "Forest Temple Outside Upper Ledge": "can_hover or (can_megajump and glitch_clipping)"
         }
     },
     {

version.py

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