Merge pull request #1976 from blkerby/more-doorlock-skips-2

A few strats from Sam (moondances and door lock skips)

Author: osse101

region/brinstar/kraid/Warehouse Energy Tank Room.json

@@ -267,6 +267,45 @@
         }
       }
     },
+    {
+      "link": [1, 1],
+      "name": "Leave with Moondance",
+      "requires": [
+        "canMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "note": [
+        "Freeze the Beetom while Samus is as far left as possible on the door ledge.",
+        "Moonwalk carefully and start moondancing under the Beetom.",
+        "As long as Samus is near the door, the other Beetoms won't come near."
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Leave with Extended Moondance",
+      "requires": [
+        "canExtendedMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}},
+        "h_ExtendedMoondanceBeetomLeniency"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "note": [
+        "Freeze the Beetom while Samus is as far left as possible on the door ledge.",
+        "Moonwalk carefully and start moondancing under the Beetom.",
+        "As long as Samus is near the door, the other Beetoms won't come near."
+      ]
+    },
     {
       "id": 9,
       "link": [1, 1],

region/brinstar/red/Red Tower.json

@@ -418,7 +418,6 @@
       "link": [1, 1],
       "name": "Door Frame Extended Moondance",
       "requires": [
-        {"notable": "Door Frame Extended Moondance"},
         {"obstaclesNotCleared": ["A"]},
         "canExtendedMoondance",
         "canTrickyUseFrozenEnemies",
@@ -2690,15 +2689,6 @@
       "name": "IBJ Between the Bottom Rippers",
       "note": "Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable."
     },
-    {
-      "id": 4,
-      "name": "Door Frame Extended Moondance",
-      "note": [
-        "Bring the Beetom close to the door and begin Moondancing.",
-        "Stop after exactly 175 moonfalls, so as not to fall through the floor.",
-        "Freeze the Beetom inside the door frame and Moondance such that Samus does not fall through the floor and does not touch the door transition."
-      ]
-    },
     {
       "id": 5,
       "name": "Frozen Beetom Ice Climb",

region/maridia/outer/Mt. Everest.json

@@ -3143,6 +3143,32 @@
         "Then Gravity jump two or more times to chain it up to the door."
       ]
     },
+    {
+      "link": [5, 5],
+      "name": "Sciser Ice Clip Door Lock Skip",
+      "requires": [
+        "Gravity",
+        "canBeVeryPatient",
+        {"or": [
+          "canGravityJump",
+          "SpaceJump"
+        ]},
+        {"ammo": {"type": "Super", "count": 1}},
+        "h_canXRayMorphIceClip"
+      ],
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true,
+      "note": [
+        "Lure a crab to the top door.",
+        "Use a Super to knock it off and freeze it frame-perfectly below the door.",
+        "Use Morph and X-Ray to stand up, then jump to clip past the door shell."
+      ],
+      "devNote": [
+        "It isn't possible to get the crab frozen at the high pixel position here,",
+        "nor is it possible to clip without Morph and X-Ray.",
+        "FIXME: suitless variations would be possible with HiJump in combination with Spring Ball or Grapple."
+      ]
+    },
     {
       "id": 126,
       "link": [5, 5],

region/norfair/west/Crocomire Speedway.json

@@ -206,6 +206,7 @@
       "to": [
         {"id": 1},
         {"id": 2},
+        {"id": 3},
         {"id": 4},
         {"id": 5},
         {"id": 6},
@@ -1816,6 +1817,28 @@
         "Then X-ray climb to get up to the door transition, without needing to open the door."
       ]
     },
+    {
+      "link": [5, 3],
+      "name": "Extended Stored Moonfall Door Lock Skip",
+      "entranceCondition": {
+        "comeInWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "requires": [
+        {"heatFrames": 70},
+        "canFreeFallClip"
+      ],
+      "note": [
+        "Setup a moondance such that Samus will fall through 2 tiles.",
+        "Perform a moonfall near the edge of the ledge, then quickly aim down and turn around to the right.",
+        "Use caution to avoid being hit by a Cacatac spike."
+      ],
+      "detailNote": [
+        "The horizontal position for performing the moonfall is lenient:",
+        "it does not need to be done at the very edge, just far enough left to avoid the Cac below."
+      ]
+    },
     {
       "id": 66,
       "link": [5, 4],