From caac3af87b789dabc485e621b3fb2d5803e2b8dc Mon Sep 17 00:00:00 2001
From: Carter Hesterman <hestermancarter@gmail.com>
Date: Mon, 16 Dec 2024 20:22:34 -0700
Subject: [PATCH] Add indirect condition for burning trail

---
 worlds/metroidprime/data/MagmoorCaverns.py | 4 ++++
 worlds/metroidprime/data/Tricks.py         | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/worlds/metroidprime/data/MagmoorCaverns.py b/worlds/metroidprime/data/MagmoorCaverns.py
index 9378b6b26e57..4ac9f3bd84b6 100644
--- a/worlds/metroidprime/data/MagmoorCaverns.py
+++ b/worlds/metroidprime/data/MagmoorCaverns.py
@@ -104,11 +104,13 @@ def __init__(self):
                         RoomName.Lava_Lake,
                         rule_func=can_heat,
                         tricks=[Tricks.lava_lake_item_suitless],
+                        indirect_condition_rooms=[RoomName.Burning_Trail],
                     ),
                     1: DoorData(
                         RoomName.Burning_Trail,
                         rule_func=can_heat,
                         tricks=[Tricks.lava_lake_item_suitless],
+                        indirect_condition_rooms=[RoomName.Burning_Trail],
                     ),
                 },
             ),
@@ -120,12 +122,14 @@ def __init__(self):
                         rule_func=lambda world, state: can_heat(world, state)
                         and (can_bomb(world, state) or can_power_bomb(world, state)),
                         tricks=[Tricks.lava_lake_item_suitless],
+                        indirect_condition_rooms=[RoomName.Burning_Trail],
                     ),
                     1: DoorData(
                         RoomName.Pit_Tunnel,
                         rule_func=lambda world, state: can_heat(world, state)
                         and (can_bomb(world, state) or can_power_bomb(world, state)),
                         tricks=[Tricks.lava_lake_item_suitless],
+                        indirect_condition_rooms=[RoomName.Burning_Trail],
                     ),
                 },
                 pickups=[
diff --git a/worlds/metroidprime/data/Tricks.py b/worlds/metroidprime/data/Tricks.py
index a2c87acd056b..c57138b82726 100644
--- a/worlds/metroidprime/data/Tricks.py
+++ b/worlds/metroidprime/data/Tricks.py
@@ -428,18 +428,15 @@ class Tricks:
         lambda world, state: can_missile(world, state)
         and can_space_jump(world, state)
         and has_energy_tanks(world, state, 4)
-        and state.can_reach(
-            "Magmoor Caverns: " + RoomName.Lake_Tunnel.value, None, world.player
-        ),
+        and can_heat(world, state)
+        and state.can_reach(RoomName.Burning_Trail.value, None, world.player),
     )
     lava_lake_item_missiles_only = TrickInfo(
         "Lava Lake Item Missiles Only",
         "Reach lava lake item without space jump by jumping on base of column",
         TrickDifficulty.Easy,
         lambda world, state: can_missile(world, state)
-        and state.can_reach(
-            "Magmoor Caverns: " + RoomName.Lake_Tunnel.value, None, world.player
-        ),
+        and state.can_reach(RoomName.Burning_Trail.value, None, world.player),
     )
 
     triclops_pit_item_no_sj = TrickInfo(