Merge 'Advanced Logic Fixes' (#2435)

Author: fenhl

SettingsListTricks.py

@@ -1997,14 +1997,6 @@
                     are the Desert Colossus GS on the rock, and grabbing
                     the Lake Hylia underwater rupees with the Boomerang.
                     '''},
-    '(Advanced) Glitchless Megaflip': {
-        'name'    : 'logic_glitchless_megaflip',
-        'tags'    : ("Glitchless",),
-        'tooltip' : '''\
-                    Perform a megaflip using enemy damage boosting
-                    for a glitchless variation. This is niche and is not
-                    linked to the glitch megaflip version.
-                    '''},
     '(Glitch) Hookshot Jumps': {
         'name'    : 'glitch_hookshot_jump',
         'tags'    : ("Glitch","Adult",),
@@ -2134,7 +2126,7 @@
                     Cross the GV bridge with Hookshot Extension.
                     '''},
     '(Advanced) GV Broken Bridge Cucco Jump': {
-        'name'    : 'logic_cucco_jump',
+        'name'    : 'adv_cucco_jump',
         'tags'    : ("Glitch","Child",),
         'tooltip' : '''\
                     Jump over the gerudo guard and gate at
@@ -2671,7 +2663,7 @@
                     Does not require other glitches to be enabled.
                     '''},
     '(Advanced) ZF Great Fairy Fountain without Explosives': {
-        'name'    : 'logic_zf_fairy_no_explosives',
+        'name'    : 'adv_zf_fairy_no_explosives',
         'tags'    : ("Glitchless","Adult","Entrance Shuffle",),
         'tooltip' : '''\
                     Climb onto the wall, and walk along the floor
@@ -2762,14 +2754,6 @@
                     It's possible to jump around the Skulltulas
                     blocking the path above the stairs.
                     '''},
-    '(Advanced) MQ DC Upper Lizalfos Boulder Skip': {
-        'name'    : 'logic_dc_mq_upper_lizalfos_boulder_skip',
-        'tags'    : ("Glitchless","Adult","Dodongo's Cavern MQ","Bouldersanity",),
-        'tooltip' : '''\
-                    Megajump with hover boots from in front of the boulders and
-                    jumpslash onto the platform on the other side to skip
-                    the boulder requirements to pass.
-                    '''},
     '(Glitch) Jabu First Switch Hover': {
         'name'    : 'glitch_jabu_switch_hover',
         'tags'    : ("Glitch","Child","Adult","Jabu Jabu's Belly",),
@@ -2799,7 +2783,7 @@
                     Hover to reach the rooms after Big Octo.
                     '''},
     '(Advanced) Jabu Jabu GS Near Boss with Jumpslash': {
-        'name'    : 'logic_jabu_gs_near_boss_js',
+        'name'    : 'adv_jabu_gs_near_boss_js',
         'tags'    : ("Child","Adult","Jabu Jabu's Belly",),
         'tooltip' : '''\
                     You can kill this Gold Skulltula through
@@ -2985,7 +2969,7 @@
                     bounds water.
                     '''},
     '(Advanced) Shadow Temple Double Damage Boosts': {
-        'name'    : 'logic_shadow_double_boosts',
+        'name'    : 'adv_shadow_double_boosts',
         'tags'    : ("Glitch","Adult","Shadow Temple",),
         'tooltip' : '''\
                     Hoverboots no longer needed to traverse Shadow Temple.
@@ -3095,8 +3079,8 @@
                     Point Glich and survive a void.
                     '''},
     '(Advanced) Spirit Compass with just Hoverboots': {
-        'name'    : 'glitch_spirit_compass_hoverboots_only',
-        'tags'    : ("Glitch","Adult","Spirit Temple",),
+        'name'    : 'adv_spirit_compass_hoverboots_only',
+        'tags'    : ("Glitchless","Adult","Spirit Temple",),
         'tooltip' : '''\
                     Glitchless movement to reach the compass chest without hookshot.
                     '''},
@@ -3200,14 +3184,14 @@
                     In MQ, this goes to the compass room.
                     '''},
     '(Advanced) Ice Cavern HP without Bottle': {
-        'name'    : 'adv_ice_HP_no_bottle',
+        'name'    : 'adv_ice_hp_no_bottle',
         'tags'    : ("Advanced","Adult","Ice Cavern",),
         'tooltip' : '''\
                     Bomb push into the ice to obtain the freestanding item.
                     This puts the trick directly into logic.
                     '''},
     '(Advanced) Ice Cavern Push Block Silver Rupee Jumpslash': {
-        'name'    : 'logic_ice_push_block_silver',
+        'name'    : 'adv_ice_push_block_silver',
         'tags'    : ("Glitch","Adult","Ice Cavern",),
         'tooltip' : '''\
                     Previously, a bottle is required to dispel the ice.
@@ -3327,11 +3311,11 @@
                     variations that can make it easier if they are available.
                     '''},
     '(Advanced) Fire Trial Longshot Skip': {
-        'name'    : 'logic_fire_trial_longshot_skip',
-        'tags'    : ("Glitch","Adult","Inside Ganon's Castle",),
+        'name'    : 'adv_fire_trial_longshot_skip',
+        'tags'    : ("Glitchless","Adult","Inside Ganon's Castle",),
         'tooltip' : '''\
                     Damage boost hoverslide to the door without the need
-                    for longshot. This is equivalent in glitched or GGJ playthrough.
-                    Glitched rulesets can megaflip or HESS or other alteratives.
+                    for the Longshot. Enabling damage boosts in general
+                    is not required, this trick stands alone.
                     '''}
 }

State.py

@@ -10,6 +10,7 @@
     from Location import Location
     from Search import Search
     from World import World
+    from RulesCommon import AccessRule
 
 Triforce_Piece: int = ItemInfo.solver_ids['Triforce_Piece']
 Triforce: int = ItemInfo.solver_ids['Triforce']

Unittest.py

@@ -825,7 +825,10 @@ def test_testcases(self):
                     if settings.logic_rules == 'advanced' and logic_rules_setting == 'advanced':
                         continue
                     settings.logic_rules = logic_rules_setting
-                    main(settings)
+                    try:
+                        main(settings)
+                    except EntranceShuffleError:
+                        self.skipTest("Entrance shuffle error, see https://github.com/OoTRandomizer/OoT-Randomizer/issues/2181 for a potential fix.")
                     # settings.output_file contains the first part of the filename
                     spoiler = load_spoiler('%s_Spoiler.json' % settings.output_file)
                     self.verify_woth(spoiler)

data/Glitched World/Ganons Castle.json

@@ -181,8 +181,9 @@
         "exits": {
             "Ganons Castle Fire Trial Ending": "
                 is_adult and
-                (Longshot or (Hover_Boots and Goron_Tunic and (can_mega or can_superslide or can_hess) )
-                    or (Hover_Boots and Goron_Tunic and has_bombchus and Bombs and can_live_dmg(0.5,False,False) and can_shield and logic_fire_trial_longshot_skip)
+                (Longshot
+                    or (Hover_Boots and Goron_Tunic and (can_mega or can_superslide or can_hess) )
+                    or (Hover_Boots and Goron_Tunic and has_bombchus and Bombs and can_live_dmg(0.5,False,False) and can_shield and adv_fire_trial_longshot_skip)
                 ) and
                 (Silver_Rupee_Ganons_Castle_Fire_Trial, 5) and
                 (shuffle_silver_rupees or Goron_Tunic)"

data/Glitched World/Ice Cavern.json

@@ -72,7 +72,7 @@
         "locations": {
             "Ice Cavern Compass Chest": "Blue_Fire or
                 (has_explosives and can_live_dmg(0.5,False))",
-            "Ice Cavern Freestanding PoH": "Blue_Fire or (adv_ice_HP_no_bottle and
+            "Ice Cavern Freestanding PoH": "Blue_Fire or (adv_ice_hp_no_bottle and
                     Bombs and can_shield and can_live_dmg(0.5,False) and is_adult)
                     or (logic_boomerang_boulders and can_use(Boomerang))",
             "Ice Cavern GS Heart Piece Room": "can_use(Hookshot) or can_use(Boomerang)",
@@ -91,7 +91,7 @@
             "Ice Cavern Push Block Silver Rupee Back Center": "True",
             "Ice Cavern Push Block Silver Rupee Front Center": "True",
             "Ice Cavern Push Block Silver Rupee Red Ice": "Blue_Fire or
-                (can_jumpslash and logic_ice_push_block_silver)",
+                (can_jumpslash and adv_ice_push_block_silver)",
             "Ice Cavern Push Block Silver Rupee Front Left": "True",
             "Ice Cavern GS Push Block Room": "
                 can_use(Hookshot) or can_use(Boomerang) or

data/Glitched World/Jabu Jabus Belly.json

@@ -80,7 +80,7 @@
         "savewarp": "Zoras Fountain -> Jabu Jabus Belly Beginning",
         "locations": {
             "Jabu Jabus Belly GS Near Boss": "can_use_projectile or can_use(Dins_Fire) or
-                (logic_jabu_gs_near_boss_js and (is_adult or Kokiri_Sword or Sticks))"
+                (adv_jabu_gs_near_boss_js and (is_adult or Kokiri_Sword or Sticks))"
         },
         "exits": {
             "Jabu Jabus Belly Main": "True",

data/Glitched World/Overworld.json

@@ -716,10 +716,8 @@
                 )
                 ) or
                 (is_child and
-                ((logic_cucco_jump and Kokiri_Sword) or can_mega or can_damage_boost)
-                )",
-            "GV Octorok Grotto": "(glitch_ledge_cancel and is_adult and has_explosives and can_shield and can_live_dmg(0.5,False))
-                or can_mega"
+                ((adv_cucco_jump and Kokiri_Sword) or can_mega or can_damage_boost)
+                )"
         }
     },
     {
@@ -731,9 +729,9 @@
             "GV Waterfall Freestanding PoH": "True",
             "GV Cow": "is_child and can_play(Eponas_Song)",
             "GV Crate Near Cow": "is_child and can_break_crate",
+            "GV GS Bean Patch": "can_plant_bugs and can_child_attack",
             "GV Adult Upper Waterfall Wonderitem": "is_adult",
             "GV Adult Lower Waterfall Wonderitem": "is_adult",
-            "GV GS Bean Patch": "can_plant_bugs and can_child_attack",
             "GV Gossip Stone": "True",
             "Gossip Stone Fairy": "can_summon_gossip_fairy and has_bottle",
             "Bean Plant Fairy": "is_child and can_plant_bean and can_play(Song_of_Storms) and has_bottle"
@@ -760,7 +758,9 @@
         "time_passes": true,
         "exits": {
             "GV Lower Stream": "True",
-            "GV Octorok Grotto": "can_use(Silver_Gauntlets) or can_weirdslide",
+            "GV Octorok Grotto": "can_use(Silver_Gauntlets) or can_weirdslide
+                or at('Gerudo Valley',(glitch_ledge_cancel and is_adult and has_explosives and can_shield and can_live_dmg(0.5,False))
+                    or can_mega)",
             "GV Crate Ledge": "can_use(Longshot) or can_hover or
                 (adv_hovers_recoil and can_use(Hover_Boots))",
             "GV Upper Stream": "can_mega or (adv_damage_boost and can_live_dmg(0.5,False) and has_explosives)
@@ -2219,7 +2219,7 @@
                 or
                 (logic_graveyard_poh and can_use(Boomerang))
                 or can_hover",
-            "Graveyard Freestanding PoH Crate": "(is_adult and can_break_crate and (here(can_plant_bean) or Longshot or (can_damage_boost and logic_graveyard_hp_damage_boost) or can_hookshot_jump))
+            "Graveyard Freestanding PoH Crate": "(is_adult and can_break_crate and (here(can_plant_bean) or Longshot or (can_damage_boost and adv_graveyard_hp_damage_boost) or can_hookshot_jump))
                 or can_hover",
             "Graveyard Dampe Gravedigging Tour": "is_child and at_dampe_time",
             "Graveyard GS Wall": "is_child and (Boomerang or can_hover) and at_night",
@@ -3036,7 +3036,7 @@
                     or (glitch_child_ice and can_shield and can_jumpslash)
                 ))",
             "ZF Great Fairy Fountain": "has_explosives or
-                (logic_zf_fairy_no_explosives and can_use(Silver_Gauntlets) and
+                (adv_zf_fairy_no_explosives and can_use(Silver_Gauntlets) and
                     Megaton_Hammer)",
             "ZF Underwater": "is_adult and Iron_Boots and (logic_fewer_tunic_requirements or Zora_Tunic)",
             "ZF Hidden Cave Adult": "is_adult and ( (can_use(Silver_Gauntlets) and can_blast_or_smash)

data/Glitched World/Shadow Temple.json

@@ -31,7 +31,7 @@
         },
         "exits": {
             "Shadow Temple First Beamos": "can_use(Hover_Boots) or can_mega or
-                (logic_shadow_double_boosts and can_damage_boost and can_live_dmg(1.0,False))"
+                (adv_shadow_double_boosts and can_damage_boost and can_live_dmg(1.0,False))"
         }
     },
     {

data/Glitched World/Spirit Temple.json

@@ -141,7 +141,7 @@
         "locations": {
             "Spirit Temple Compass Chest": "can_play(Zeldas_Lullaby) and (
                 can_use(Hookshot) or
-                (glitch_spirit_compass_hoverboots_only and can_use(Hover_Boots)) or
+                (adv_spirit_compass_hoverboots_only and can_use(Hover_Boots)) or
                 (adv_hovers_recoil and can_use(Hover_Boots) and (Megaton_Hammer or (has_explosives and can_live_dmg(0.5,False,True))))
                 or can_hover
                 or (can_use(Hover_Boots) and (can_mega or can_superslide or can_hess))

version.py

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