Merge 'Remove FTR and Tunic checks from Bolero>Fire' (#2545)

Author: cjohnson57

CHANGELOG.md

@@ -21,6 +21,9 @@
 * 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.
 
+## 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.
+
 # 9.0
 
 ## New Settings and Options

SettingsListTricks.py

@@ -34,10 +34,11 @@
                     "Child", "Adult",),
         'tooltip' : '''\
                     Allows the following possible without Tunics:
-                    - Enter Fire Temple as adult.
                     - Zora's Fountain bottom Freestandings. You
                     might not have enough time to resurface, and
                     you may need to make multiple trips.
+                    - Enter Fire Temple from Goron City, the grotto,
+                    or the great fairy fountain.
                     - Traverse the first floor of the Fire Temple,
                     except the elevator room and Volvagia.
                     - Go underwater in the Water Temple. (The area

data/Glitched World/Overworld.json

@@ -2773,9 +2773,7 @@
                 is_adult and (Hover_Boots or Hookshot or here(can_plant_bean) or plant_beans or (can_hover and can_use(Goron_Tunic)))",
             "DMC Upper Nearby": "is_adult and (here(can_plant_bean) or plant_beans)",
             # Check boulder color
-            "DMC Fire Temple Entrance": "
-                (is_child and shuffle_dungeon_entrances) or
-                (is_adult and (logic_fewer_tunic_requirements or Goron_Tunic))",
+            "DMC Fire Temple Entrance": "is_adult or shuffle_dungeon_entrances",
             "DMC Pierre Platform": "can_use(Distant_Scarecrow)"
         }
     },

data/World/Overworld.json

@@ -2453,9 +2453,7 @@
             "DMC Lower Nearby": "
                 is_adult and (Hover_Boots or Hookshot or here(can_plant_bean) or plant_beans)",
             "DMC Upper Nearby": "is_adult and (here(can_plant_bean) or plant_beans)",
-            "DMC Fire Temple Entrance": "
-                (is_child and shuffle_dungeon_entrances) or
-                (is_adult and (logic_fewer_tunic_requirements or Goron_Tunic))",
+            "DMC Fire Temple Entrance": "is_adult or shuffle_dungeon_entrances",
             "DMC Pierre Platform": "can_use(Distant_Scarecrow)"
         }
     },

version.py

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