Glitch logic 0.29

maps/graph_edges/glitched_logic/dgb_jumpless_mega_rush.py

@@ -0,0 +1,9 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Jumpless Mega Rush
+Can climb the bookshelf by partially clipping into each shelf and using Parakarry.
+"""
+edges_dgb_add_jumpless_mega_rush = [
+    #* Hidden Bedroom (2F) Door Bottom -> ItemA (MegaRush)
+    {"from": {"map": "DGB_13", "id": 0}, "to": {"map": "DGB_13", "id": "ItemA"}, "reqs": [["Parakarry"]], "mapchange": False},
+]

maps/graph_edges/glitched_logic/flo_bubble_berry_tree_early.py

@@ -8,6 +8,12 @@
     {"from": {"map": "FLO_24", "id": 0}, "to": {"map": "FLO_24", "id": "Tree1_Drop1A"}, "reqs": [["can_shake_trees"], ["Lakilester"]], "mapchange": False},
     #* (SE) Water Level Room Exit Left -> Tree1_Drop1B (BubbleBerry)
     {"from": {"map": "FLO_24", "id": 0}, "to": {"map": "FLO_24", "id": "Tree1_Drop1B"}, "reqs": [["can_shake_trees"], ["Lakilester"]], "mapchange": False},
+
+    # Laki can be used to cross this room regardless of water level
+    #? (SE) Water Level Room Exit Left -> (SE) Water Level Room Exit Right
+    {"from": {"map": "FLO_24", "id": 0}, "to": {"map": "FLO_24", "id": 1}, "reqs": [["Lakilester"]]}, 
+    #? (SE) Water Level Room Exit Right -> (SE) Water Level Room Exit Left
+    {"from": {"map": "FLO_24", "id": 1}, "to": {"map": "FLO_24", "id": 0}, "reqs": [["Lakilester"]]}
 ]
 
 edges_flo_add_bubble_berry_tree_early_ultra_boots = [

maps/graph_edges/glitched_logic/global_reach_high_blocks_with_super_boots.py

@@ -3,6 +3,9 @@
 for Glitched Logic: Reach High Blocks With Super Boots
 """
 edges_global_reach_high_blocks_with_super_boots = [
+    #* Path to Fortress 1 Exit Left -> ItemF (ThunderBolt)
+    {"from": {"map": "NOK_14", "id": 0}, "to": {"map": "NOK_14", "id": "ItemF"}, "reqs": [["SuperBoots"]], "mapchange": False}, 
+
     #* S1E2 Small Bluffs Exit West -> ItemA (StopWatch)
     {"from": {"map": "SBK_45", "id": 0}, "to": {"map": "SBK_45", "id": "ItemA"}, "reqs": [["SuperBoots"]], "mapchange": False},
 

maps/graph_edges/glitched_logic/hos_jumpless_summit_climb.py

@@ -0,0 +1,9 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Jumpless Summit Climb
+Shooting Star Summit peak can be reached with just Parakarry
+"""
+edges_hos_add_jumpless_summit_climb = [
+    #? Shooting Star Summit Exit Bottom Left -> Shooting Star Summit Ride Up To Starway
+    {"from": {"map": "HOS_01", "id": 0}, "to": {"map": "HOS_01", "id": 1}, "reqs": [["Parakarry"]], "mapchange": False} 
+]

maps/graph_edges/glitched_logic/isk_ruins_puzzle_solution_early.py

@@ -0,0 +1,10 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Ruins Puzzle Solution Early.
+This trick uses Lakilester to clip into the stairs of the lower part of the room,
+and fall out of bounds, landing in the upper part where the switch is located.
+"""
+edges_isk_add_ruins_puzzle_solution_early= [
+    #? Sand Drainage Room 3 Exit Top Left -> Sand Drainage Room 3 Exit Upper Room Left
+    {"from": {"map": "ISK_12", "id": 1}, "to": {"map": "ISK_12", "id": 0}, "reqs": [["Lakilester"], ["Boots"]], "mapchange": False},
+]

maps/graph_edges/glitched_logic/iwa_mt_rugged_station_jumpless_climb.py

@@ -9,5 +9,5 @@
 
 edges_iwa_add_mt_rugged_station_jumpless_climb_laki= [
     #? Train Station Ride The Train -> Train Station Exit Top Right
-    {"from": {"map": "IWA_10", "id": 0}, "to": {"map": "IWA_10", "id": 1}, "reqs": [["Lakilester"], ["SpeedySpin"]], "mapchange": False},
+    {"from": {"map": "IWA_10", "id": 0}, "to": {"map": "IWA_10", "id": 1}, "reqs": [["Lakilester"], ["SpeedySpin"], ["Hammer"]], "mapchange": False},
 ]

maps/graph_edges/glitched_logic/iwa_parakarryless_mt_rugged_seed_clippy.py

@@ -0,0 +1,8 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Parakarry-less Mt. Rugged Seed using Clippy.
+"""
+edges_iwa_add_parakarryless_mt_rugged_seed_clippy = [
+    #* Mt Rugged 3 Exit Bottom Left -> GiftA (MagicalSeed2)
+    {"from": {"map": "IWA_02", "id": 0},"to": {"map": "IWA_02", "id": "GiftA"}, "reqs": [["Boots"], ["Lakilester"]], "mapchange" : False},
+]

maps/graph_edges/glitched_logic/jan_raph_skip_lakilester.py

@@ -0,0 +1,9 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Raph Skip (Laki Teleport)
+A very precise laki teleport can be used to get through the bushes and to Raphael's tree.
+"""
+edges_jan_add_raph_skip_lakilester = [
+    #? Path to the Volcano Exit Left -> Path to the Volcano Exit Top
+    {"from": {"map": "JAN_22", "id": 0}, "to": {"map": "JAN_22", "id": 1}, "reqs": [["Lakilester"]], "mapchange": False},
+]

maps/graph_edges/glitched_logic/kmr_prologue_gel_early.py

@@ -4,5 +4,12 @@
 """
 edges_kmr_add_prologue_gel_early = [
     #* Bottom of the Cliff Exit Right -> HiddenYBlockA (RepelGel)
-    {"from": {"map": "KMR_03", "id": 1}, "to": {"map": "KMR_03", "id": "HiddenYBlockA"}, "reqs": [["Kooper", "Bombette", "Parakarry", "Lakilester"],["Boots"]], "mapchange": False}
+    # getting on top of stone block and using any of kooper / bombette / parakarry / lakilester methods
+    {"from": {"map": "KMR_03", "id": 1}, "to": {"map": "KMR_03", "id": "HiddenYBlockA"}, "reqs": [["Kooper", "Bombette", "Parakarry", "Lakilester"],["Boots"]], "mapchange": False},
+
+    # parakarry clip into stone block and hit with kooper jump
+    {"from": {"map": "KMR_03", "id": 1}, "to": {"map": "KMR_03", "id": "HiddenYBlockA"}, "reqs": [["Kooper"], ["Parakarry"]], "mapchange": False},
+
+    # parakarry clip into stone block, laki jump on top, use bombette to hit repel gel block
+    {"from": {"map": "KMR_03", "id": 1}, "to": {"map": "KMR_03", "id": "HiddenYBlockA"}, "reqs": [["Bombette"], ["Parakarry"], ["Lakilester"]], "mapchange": False}
 ]

maps/graph_edges/glitched_logic/kpa_basement_skip.py

@@ -0,0 +1,24 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Basement Skip
+"""
+edges_kpa_add_basement_skip_parakarry = [
+    #? Front Door Exterior Lava Door Right -> Front Door Exterior Hangar Door Bottom Left (ultra boots clip and parakarry)
+    {"from": {"map": "KPA_62",  "id": 2}, "to": {"map": "KPA_62",  "id": 0}, "reqs": [["Lakilester","GF_KPA16_ShutOffLava"],["Parakarry"],["UltraBoots"]], "pseudoitems": ["RF_Ch8_FirstGuardDoor"], "mapchange": False}, 
+    #? Guard Door 1 Door Left -> Guard Door 1 Fall In Trap Door
+    {"from": {"map": "KPA_81",  "id": 0}, "to": {"map": "KPA_81",  "id": 1}, "reqs": [["Bombette"], ["Lakilester"], ["Parakarry"], ["UltraBoots"]], "mapchange": False}, 
+]
+
+edges_kpa_add_basement_skip_lakilester = [
+    #? Front Door Exterior Lava Door Right -> Front Door Exterior Hangar Door Bottom Left (laki teleport)
+    {"from": {"map": "KPA_62",  "id": 2}, "to": {"map": "KPA_62",  "id": 0}, "reqs": [["Lakilester"],["can_climb_steps"]], "pseudoitems": ["RF_Ch8_FirstGuardDoor"], "mapchange": False}, 
+    #? Guard Door 1 Door Left -> Guard Door 1 Fall In Trap Door
+    {"from": {"map": "KPA_81",  "id": 0}, "to": {"map": "KPA_81",  "id": 1}, "reqs": [["Bombette"], ["Lakilester"], ["can_climb_steps"]], "mapchange": False}, 
+]
+
+edges_kpa_add_basement_skip_hammer = [
+    #? Front Door Exterior Lava Door Right -> Front Door Exterior Hangar Door Bottom Left (hammer clip)
+    {"from": {"map": "KPA_62",  "id": 2}, "to": {"map": "KPA_62",  "id": 0}, "reqs": [["Lakilester","GF_KPA16_ShutOffLava"],["can_climb_steps"],["Hammer"]], "pseudoitems": ["RF_Ch8_FirstGuardDoor"], "mapchange": False}, 
+    #? Guard Door 1 Door Left -> Guard Door 1 Fall In Trap Door
+    {"from": {"map": "KPA_81",  "id": 0}, "to": {"map": "KPA_81",  "id": 1}, "reqs": [["Bombette"], ["Lakilester"], ["Hammer"], ["can_climb_steps"]], "mapchange": False}, 
+]

maps/graph_edges/glitched_logic/kpa_cannonless.py

@@ -0,0 +1,9 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Cannonless
+Cannonless allows the cannon room to be crossed jumpless using Parakarry and Lakilester.
+"""
+edges_kpa_add_cannonless = [
+    #? Bill Blaster Hall Door Left -> Bill Blaster Hall Door Top Right
+    {"from": {"map": "KPA_130",  "id": 0}, "to": {"map": "KPA_130",  "id": 1}, "reqs": [["Lakilester"],["can_climb_steps"]], "mapchange": False}, 
+]

maps/graph_edges/glitched_logic/kpa_fast_flood_room.py

@@ -1,13 +1,29 @@
 """
 This file represents edges of the world graph that have to be added
 for Glitched Logic: Fast Flood Room
+
+Kooperless Flood Room: https://www.youtube.com/watch?v=uWv5VNh7NtI
 """
+edges_kpa_add_fast_flood_room_kooperless = [
+    # KPA_133 Left Water Puzzle
+    #? Left Water Puzzle Door Bottom Right Upper Half -> Left Water Puzzle Door Bombable Wall
+    {"from": {"map": "KPA_133", "id": 2}, "to": {"map": "KPA_133", "id": 3}, "reqs": [["Lakilester"],["Bombette"], ["can_climb_steps"]], "mapchange": False},
+    #* Left Water Puzzle Door Bombable Wall -> ItemA (BowserCastleKey)
+    {"from": {"map": "KPA_133", "id": 3}, "to": {"map": "KPA_133", "id": "ItemA"}, "reqs": [["Lakilester"]], "mapchange": False},
+
+    # KPA_134 Right Water Puzzle
+    #? Right Water Puzzle Door Bottom Left -> Right Water Puzzle Door Bottom Left Upper Half
+    {"from": {"map": "KPA_134", "id": 0}, "to": {"map": "KPA_134", "id": 2}, "reqs": [["Lakilester"],["can_climb_steps"],["can_hit_floating_blocks"]], "mapchange": False},
+    #? Right Water Puzzle Door Bottom Left Upper Half -> Right Water Puzzle Door Bottom Left
+    {"from": {"map": "KPA_134", "id": 2}, "to": {"map": "KPA_134", "id": 0}, "reqs": [["Lakilester"],["can_hit_floating_blocks"]], "mapchange": False},
+]
+
 edges_kpa_add_fast_flood_room_kooper = [
     # KPA_133 Left Water Puzzle
     #? Left Water Puzzle Door Bottom Right Upper Half -> Left Water Puzzle Door Bombable Wall
     {"from": {"map": "KPA_133", "id": 2}, "to": {"map": "KPA_133", "id": 3}, "reqs": [["Lakilester"],["Bombette"], ["can_climb_steps"]], "mapchange": False},
     #* Left Water Puzzle Door Bombable Wall -> ItemA (BowserCastleKey)
-    {"from": {"map": "KPA_133", "id": 3}, "to": {"map": "KPA_133", "id": "ItemA"}, "reqs": [["Lakilester"],["Kooper"]], "mapchange": False},
+    {"from": {"map": "KPA_133", "id": 3}, "to": {"map": "KPA_133", "id": "ItemA"}, "reqs": [["Lakilester"],["Kooper"],["Boots"]], "mapchange": False},
 
     # KPA_134 Right Water Puzzle
     #? Right Water Puzzle Door Bottom Left -> Right Water Puzzle Door Bottom Left Upper Half

maps/graph_edges/glitched_logic/kpa_hub1_stair_clip.py

@@ -0,0 +1,15 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Hub 1 Stair Clip
+By precisely walking into the left corner of the lower stair, 
+Mario can clip out of bounds and fall to the upper level.
+
+Stair Clip: https://youtu.be/pJaLTptaDGM 
+"""
+edges_kpa_add_hub1_stair_clip = [
+    #? Lower Grand Hall Door Bottom Left -> Lower Grand Hall Door Top Right
+    {"from": {"map": "KPA_32",  "id": 0}, "to": {"map": "KPA_32",  "id": 2}, "reqs": [], "mapchange": False}, 
+    #? Lower Grand Hall Door Bottom Left -> Lower Grand Hall Door Top Left 
+    # (no existing connection from 2->3 so connect to both upper doors)
+    {"from": {"map": "KPA_32",  "id": 0}, "to": {"map": "KPA_32",  "id": 3}, "reqs": [], "mapchange": False}, 
+]

maps/graph_edges/glitched_logic/kpa_wattless_dark_basement.py

@@ -0,0 +1,19 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Wattless Dark Basement
+"""
+edges_kpa_add_wattless_dark_basement = [
+    #? Dark Cave 1 Door Bottom Left -> Dark Cave 1 Exit Top Left
+    {"from": {"map": "KPA_01",  "id": 0}, "to": {"map": "KPA_01",  "id": 1}, "reqs": [["Parakarry"]]}, 
+    #? Dark Cave 1 Exit Top Left -> Dark Cave 1 Door Bottom Left
+    {"from": {"map": "KPA_01",  "id": 1}, "to": {"map": "KPA_01",  "id": 0}, "reqs": []}, 
+    #* Dark Cave 1 Exit Top Left -> YBlockA (POWBlock)
+    {"from": {"map": "KPA_01",  "id": 1}, "to": {"map": "KPA_01",  "id": "YBlockA"}, "reqs": [["Parakarry"],["can_hit_floating_blocks"]]}, 
+
+    #? Dark Cave 2 Exit Right -> Dark Cave 2 Door Top Left
+    {"from": {"map": "KPA_03",  "id": 0}, "to": {"map": "KPA_03",  "id": 1}, "reqs": [["Parakarry"]]}, 
+    #? Dark Cave 2 Door Top Left -> Dark Cave 2 Exit Right
+    {"from": {"map": "KPA_03",  "id": 1}, "to": {"map": "KPA_03",  "id": 0}, "reqs": [["can_climb_steps"]]}, 
+    #* Dark Cave 2 Exit Right -> YBlockA (ShootingStar)]
+    {"from": {"map": "KPA_03",  "id": 0}, "to": {"map": "KPA_03",  "id": "YBlockA"}, "reqs": [["can_hit_floating_blocks"]]}, 
+]

maps/graph_edges/glitched_logic/mac_jumpless_dane_t_letters.py

@@ -0,0 +1,13 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Jumpless Dane T Letters.
+From the train station platform, Parakarry can be used to climb the opposite ledge before
+the camera finishes turning, allowing Dane T's two letters to be delivered without boots.
+
+Jumpless Ledge: https://youtu.be/uhiUKmlG3VY 
+"""
+edges_mac_jumpless_dane_t_letters = [
+    #* Station District -> Dane T letter turn in
+    {"from": {"map": "MAC_03", "id": 0}, "to": {"map": "MAC_03", "id": "GiftA"}, "reqs": [["Parakarry"],["Letter20"]], "mapchange": False},
+    {"from": {"map": "MAC_03", "id": 0}, "to": {"map": "MAC_03", "id": "GiftB"}, "reqs": [["Parakarry"],["Letter22"]], "mapchange": False}
+]

maps/graph_edges/glitched_logic/mac_toad_town_sushie_glitch.py

@@ -4,10 +4,22 @@
 An additional partner is required to switch in battle and exit the sushie glitch
 state.
 """
-edges_mac_add_toad_town_sushie_glitch = [
+edges_mac_add_toad_town_sushie_glitch_gearless = [
     #? Gate District Exit Left -> Gate District Exit Right
-    {"from": {"map": "MAC_00", "id": 0}, "to": {"map": "MAC_00", "id": 1}, "reqs": [["Sushie"], ["Hammer", "Boots"], ["can_end_sushie_glitch"]], "pseudoitems": ["RF_ToadTownSushieGlitch"], "mapchange": False},
+    {"from": {"map": "MAC_00", "id": 0}, "to": {"map": "MAC_00", "id": 1}, "reqs": [["Sushie"], ["can_end_sushie_glitch"]], "pseudoitems": ["RF_ToadTownSushieGlitch"], "mapchange": False}
+]
+
+edges_mac_add_toad_town_sushie_glitch_jump_or_hammer = [
+    #? Gate District Exit Left -> Gate District Exit Right
+    {"from": {"map": "MAC_00", "id": 0}, "to": {"map": "MAC_00", "id": 1}, "reqs": [["Sushie"], ["Hammer", "Boots"], ["can_end_sushie_glitch"]], "pseudoitems": ["RF_ToadTownSushieGlitch"], "mapchange": False}
+]
 
+edges_mac_add_toad_town_sushie_glitch_full_gear = [
+    #? Gate District Exit Left -> Gate District Exit Right
+    {"from": {"map": "MAC_00", "id": 0}, "to": {"map": "MAC_00", "id": 1}, "reqs": [["Sushie"], ["Hammer"], ["Boots"], ["can_end_sushie_glitch"]], "pseudoitems": ["RF_ToadTownSushieGlitch"], "mapchange": False}
+]
+
+edges_mac_add_toad_town_sushie_glitch = [
     #? Goomba King's Castle Exit Right -> Goomba King's Castle Exit Left
     {"from": {"map": "KMR_11", "id": 1}, "to": {"map": "KMR_11", "id": 0}, "reqs": [["RF_ToadTownSushieGlitch"]], "mapchange": False},
 

maps/graph_edges/glitched_logic/nok_jumpless_koopa_village_blue_pipe.py

@@ -0,0 +1,9 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Jumpless Koopa Village Blue Pipe.
+Using Parakarry next to the tree can raise Mario high enough to land on the blue pipe.
+"""
+edges_nok_add_jumpless_koopa_village_blue_pipe = [
+    #? Koopa Village 2 Exit Left -> Koopa Village 2 Blue Pipe
+    {"from": {"map": "NOK_02", "id": 0}, "to": {"map": "NOK_02", "id": 2}, "reqs": [["GF_TIK01_WarpPipes"],["Parakarry"]], "mapchange": False}, 
+]

maps/graph_edges/glitched_logic/pra_bombette_puzzle_skip.py

@@ -0,0 +1,8 @@
+"""
+This file represents edges of the world graph that have to be added
+for Glitched Logic: Bombette Puzzle Skip
+"""
+edges_pra_add_bombette_puzzle_skip= [
+    #? Red Key Hall Door West -> Red Key Hall Bombable Wall
+    {"from": {"map": "PRA_09", "id": 0}, "to": {"map": "PRA_09", "id": 1}, "reqs": [["Bombette"]], "mapchange": False},
+]

models/options/GlitchOptionSet.py

@@ -14,14 +14,18 @@ def __init__(self):
         self.blue_house_skip = False
         self.blue_house_skip_laki = False
         self.blue_house_skip_toad_lure = False
+        self.jumpless_dane_t_letters = False
         self.bowless_toy_box_hammer = False
         self.bowless_toy_box_hammerless_lure = False
         self.early_storeroom_parakarry = False
         self.early_storeroom_hammer = False
         self.early_storeroom_hammerless_lure = False
         self.whale_early = False
         self.sushiesless_toad_town_star_piece = False
+        self.toad_town_sushie_glitch_gearless = False
         self.toad_town_sushie_glitch = False
+        self.toad_town_sushie_glitch_full_gear = False
+        self.jumpless_summit_climb = False
 
         self.clippy_boots_stone_block_skip = False
         self.clippy_boots_metal_block_skip = False
@@ -40,6 +44,7 @@ def __init__(self):
         self.invisible_bridge_clip_lzs = False
         self.invisible_bridge_clip_laki = False
         self.kooperless_pleasant_path_thunderbolt = False
+        self.jumpless_koopa_village_blue_pipe = False
 
         self.bombetteless_kbf_fp_plus_lzs = False
         self.bombetteless_kbf_fp_plus_laki = False
@@ -49,6 +54,7 @@ def __init__(self):
 
         self.mt_rugged_quake_hammer_and_letter_with_laki = False
         self.parakarryless_mt_rugged_seed = False
+        self.parakarryless_mt_rugged_seed_clippy = False
         self.buzzar_gap_skip_clippy = False
         self.mt_rugged_coins_with_kooper = False
         self.mt_rugged_station_jumpless_climb_bombette = False
@@ -67,6 +73,7 @@ def __init__(self):
         self.parakarryless_super_hammer_room_ultra_boots = False
         self.parakarryless_super_hammer_room_normal_boots = False
         self.ruins_locks_skip_clippy = False
+        self.ruins_puzzle_solution_early = False
         self.ruins_stone_skip = False
 
         self.forever_forest_backwards = False
@@ -89,6 +96,7 @@ def __init__(self):
         self.tubbas_table_ultra_boots = False
         self.tubbas_table_laki_jump_study = False
         self.tubbas_castle_super_boots_skip = False
+        self.jumpless_mega_rush = False
         self.parakarryless_mega_rush = False
 
         self.parakarryless_blue_building_star_piece = False
@@ -109,6 +117,7 @@ def __init__(self):
 
         self.raph_skip_english = False
         self.raph_skip_parakarry = False
+        self.raph_skip_lakilester = False
         self.ch5_sushie_glitch = False
         self.sushieless_jungle_starpiece_and_letter = False
         self.jumpless_deep_jungle_laki = False
@@ -149,11 +158,19 @@ def __init__(self):
         self.sushieless_warehouse_key_kooper = False
 
         self.mirror_clip = False
+        self.bombette_puzzle_skip = False
         self.kooper_puzzle_skip = False
 
         self.bowless_bowsers_castle_basement = False
+        self.wattless_dark_basement = False
+        self.basement_skip_parakarry = False
+        self.basement_skip_lakilester = False
+        self.basement_skip_hammer = False
+        self.bowsers_castle_hub1_stair_clip = False
         self.fast_flood_room_kooper = False
+        self.fast_flood_room_kooperless = False
         self.fast_flood_room_bombette_ultra_boots = False
+        self.cannonless = False
         self.bombetteless_bowsers_castle_basement = False
 
         self.break_yellow_blocks_with_super_boots = False