more heated CFs

Author: blkerby

region/lowernorfair/east/Mickey Mouse Room.json

@@ -1211,6 +1211,16 @@
       ],
       "clearsObstacles": ["D"]
     },
+    {
+      "link": [4, 6],
+      "name": "Cross with Crystal Flash",
+      "requires": [
+        "h_usePowerBomb",
+        {"heatFrames": 260},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 120}
+      ]
+    },    
     {
       "id": 52,
       "link": [6, 1],

region/norfair/east/Single Chamber.json

@@ -2151,7 +2151,7 @@
       "requires": [
         "Morph",
         "ScrewAttack",
-        {"heatFrames": 780}
+        {"heatFrames": 600}
       ]
     },
     {
@@ -2160,7 +2160,7 @@
       "name": "Power Bomb",
       "requires": [
         "h_usePowerBomb",
-        {"heatFrames": 850}
+        {"heatFrames": 660}
       ]
     },
     {
@@ -2169,7 +2169,36 @@
       "name": "Bombs",
       "requires": [
         "h_useMorphBombs",
-        {"heatFrames": 1130}
+        {"heatFrames": 730}
+      ]
+    },
+    {
+      "link": [5, 6],
+      "name": "Cross with Crystal Flash (Early Position)",
+      "requires": [
+        {"heatFrames": 250},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 380}
+      ]
+    },
+    {
+      "link": [5, 6],
+      "name": "Cross with Crystal Flash (Later Position)",
+      "requires": [
+        {"heatFrames": 450},
+        {"or": [
+          "ScrewAttack",
+          {"and": [
+            "h_usePowerBomb",
+            {"heatFrames": 40}
+          ]},
+          {"and": [
+            "h_useMorphBombs",
+            {"heatFrames": 80}
+          ]}
+        ]},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 250}
       ]
     },
     {
@@ -2180,8 +2209,11 @@
         {"or": [
           "canWalljump",
           "HiJump",
-          "SpaceJump",
-          "h_crouchJumpDownGrab"
+          "h_crouchJumpDownGrab",
+          {"and": [
+            "SpaceJump",
+            {"heatFrames": 40}
+          ]}
         ]},
         {"heatFrames": 100}
       ],

region/norfair/east/Speed Booster Hall.json

@@ -599,6 +599,9 @@
       ],
       "detailNote": [
         "This allows crossing the room without tanks or Speed Booster."
+      ],
+      "devNote": [
+        "FIXME: this may not be possible if the lava is rising (with Speed Booster and the flag not yet set)."
       ]
     },
     {

region/norfair/east/Spiky Platforms Tunnel.json

@@ -289,6 +289,27 @@
         "Only one of these frames gives a normal IBJ, which shouldn't be expected (1 frame for the first Bomb, then 3 frames for the second)."
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "Crystal Flash and Lava Bath",
+      "requires": [
+        "canSuitlessLavaDive",
+        {"heatFrames": 425},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 300},
+        {"lavaFrames": 70}
+      ],
+      "note": [
+        "Ride the first Tripper, using Morph to avoid spike damage, then perform a Crystal Flash.",
+        "The second Tripper will likely either be destroyed or in a bad pattern,",
+        "making it necessary to jump through the lava to cross the rest of the room."
+      ],
+      "detailNote": [
+        "It may help to use the Tripper to do a big jump past the shutter before doing the Crystal Flash;",
+        "otherwise the shutter might end up closed and get in the way."
+      ]
+    },
+
     {
       "id": 9,
       "link": [2, 1],
@@ -422,6 +443,26 @@
       ],
       "note": ["Perform a bounceball to minimize lava damage.", "Ride the second Tripper."]
     },
+    {
+      "link": [2, 1],
+      "name": "Crystal Flash and Lava Bath",
+      "requires": [
+        "canSuitlessLavaDive",
+        {"heatFrames": 425},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 300},
+        {"lavaFrames": 70}
+      ],
+      "note": [
+        "Ride the first Tripper, using Morph to avoid spike damage, then perform a Crystal Flash.",
+        "The second Tripper will likely either be destroyed or in a bad pattern,",
+        "making it necessary to jump through the lava to cross the rest of the room."
+      ],
+      "detailNote": [
+        "It may help to use the Tripper to do a big jump past the shutter before doing the Crystal Flash;",
+        "otherwise the shutter might end up closed and get in the way."
+      ]
+    },
     {
       "id": 24,
       "link": [2, 1],

region/norfair/east/Upper Norfair Farming Room.json

@@ -129,6 +129,7 @@
       "to": [
         {"id": 1},
         {"id": 3},
+        {"id": 4},
         {"id": 5}
       ]
     },
@@ -1013,6 +1014,14 @@
         }
       ]
     },
+    {
+      "link": [4, 4],
+      "name": "Crystal Flash",
+      "requires": [
+        "h_heatedCrystalFlash"
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 35,
       "link": [4, 5],

region/norfair/west/Ice Beam Snake Room.json

@@ -1584,6 +1584,14 @@
       "requires": [
         {"heatFrames": 50}
       ]
+    },
+    {
+      "link": [5, 5],
+      "name": "Crystal Flash",
+      "requires": [
+        "h_heatedCrystalFlash"
+      ],
+      "flashSuitChecked": true
     }
   ],
   "notables": [],