Merge pull request #2293 from blkerby/main-hall-cf

Main Hall cross with Crystal Flash strats

Author: osse101

region/lowernorfair/east/Main Hall.json

@@ -174,14 +174,77 @@
     {
       "id": 5,
       "link": [1, 4],
-      "name": "TrickyJumps",
+      "name": "Tricky Jumps",
       "requires": [
         "h_navigateHeatRooms",
         "canTrickyJump",
         {"heatFrames": 570}
       ],
       "note": "Take the platforms two at a time by building some run speed for each jump on a one tile runway."
     },
+    {
+      "link": [1, 4],
+      "name": "Tricky Jumps with Crystal Flash",
+      "requires": [
+        "canTrickyJump",
+        {"or": [
+          {"and": [
+            {"heatFrames": 95},
+            "h_heatedCrystalFlash",
+            "canTrickyDodgeEnemies",
+            {"heatFrames": 475}
+          ]},
+          {"and": [
+            {"heatFrames": 175},
+            "h_heatedCrystalFlash",
+            "canTrickyDodgeEnemies",
+            {"heatFrames": 395}
+          ]},
+          {"and": [
+            {"heatFrames": 240},
+            "h_heatedCrystalFlash",
+            "canTrickyDodgeEnemies",
+            {"heatFrames": 330}
+          ]},
+          {"and": [
+            {"heatFrames": 310},
+            "h_heatedCrystalFlash",
+            {"heatFrames": 260}
+          ]}
+        ]}
+      ],
+      "note": [
+        "The Crystal Flash can be done on any of the floating blocks or single-tile-wide pillars that don't have a Hibashi.",
+        "The safest place to do it is on the last single-tile-wide pillar."
+      ]
+    },
+    {
+      "link": [1, 4],
+      "name": "Double Crystal Flash with Space Jump",
+      "requires": [
+        "SpaceJump",
+        "canTrickyDodgeEnemies",
+        {"heatFrames": 205},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 180},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 120}
+      ]
+    },
+    {
+      "link": [1, 4],
+      "name": "Triple Crystal Flash",
+      "requires": [
+        "canTrickyDodgeEnemies",
+        {"heatFrames": 175},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 180},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 175},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 65}
+      ] 
+    },
     {
       "id": 6,
       "link": [1, 4],
@@ -351,6 +414,15 @@
         {"heatFrames": 265}
       ]
     },
+    {
+      "link": [2, 4],
+      "name": "Cross with Crystal Flash",
+      "requires": [
+        {"heatFrames": 180},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 180}
+      ]
+    },
     {
       "id": 34,
       "link": [2, 4],
@@ -497,6 +569,17 @@
       ],
       "note": "Take the platforms two at a time by building some run speed for each jump on a one tile runway."
     },
+    {
+      "link": [4, 1],
+      "name": "Tricky Jumps with Crystal Flash",
+      "requires": [
+        "canTrickyJump",
+        {"heatFrames": 135},
+        "h_heatedCrystalFlash",
+        {"heatFrames": 350}
+      ],
+      "note": "The Crystal Flash can be done safely on the leftmost 2-tile-wide platform."
+    },
     {
       "id": 20,
       "link": [4, 1],