Merge pull request #1830 from kjbranch/spawn-at-7

Remove spawnAt: Ridley, Amphitheatre, Screw

Author: kjbranch

region/lowernorfair/east/Amphitheatre.json

@@ -28,7 +28,10 @@
         }
       ],
       "useImplicitDoorUnlocks": false,
-      "spawnAt": 6
+      "useImplicitComeInNormally": false,
+      "useImplicitComeInWithMockball": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     },
     {
       "id": 2,
@@ -56,12 +59,6 @@
       "name": "Below Left Door Junction",
       "nodeType": "junction",
       "nodeSubType": "junction"
-    },
-    {
-      "id": 6,
-      "name": "Left Door Spawn At Junction",
-      "nodeType": "junction",
-      "nodeSubType": "junction"
     }
   ],
   "enemies": [
@@ -122,7 +119,8 @@
       "to": [
         {"id": 1},
         {"id": 3},
-        {"id": 6}
+        {"id": 4},
+        {"id": 5}
       ]
     },
     {
@@ -156,15 +154,6 @@
       "to": [
         {"id": 1}
       ]
-    },
-    {
-      "from": 6,
-      "to": [
-        {"id": 1},
-        {"id": 3},
-        {"id": 4},
-        {"id": 5}
-      ]
     }
   ],
   "strats": [
@@ -187,6 +176,59 @@
       ],
       "devNote": "FIXME: Add acid-filled version of the runway, and requirements to unlock the door with Missiles and Power Bombs."
     },
+    {
+      "link": [1, 1],
+      "name": "Land in Door Frame",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        "canInsaneJump",
+        {"heatFrames": 55},
+        {"doorUnlockedAtNode": 1}
+      ],
+      "unlocksDoors": [
+        {"types": ["super"], "requires": []},
+        {"types": ["missiles", "powerbomb"], "requires": ["never"]}
+      ],
+      "devNote": "This would technically clear A, but depending on what is being done here, there will likely be too much acid to cross the room."
+    },
+    {
+      "link": [1, 1],
+      "name": "Door Stuck, Open Door",
+      "entranceCondition": {
+        "comeInWithDoorStuckSetup": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        {"heatFrames": 55},
+        {"doorUnlockedAtNode": 1}
+      ],
+      "unlocksDoors": [
+        {"types": ["ammo"], "requires": []}
+      ],
+      "devNote": "This would technically clear A, but depending on what is being done here, there will likely be too much acid to cross the room."
+    },
+    {
+      "id": 36,
+      "link": [1, 1],
+      "name": "Prepared Return Without Falling",
+      "requires": [
+        "canPrepareForNextRoom",
+        {"or": [
+          "SpaceJump",
+          "canWalljump"
+        ]},
+        {"heatFrames": 80},
+        {"doorUnlockedAtNode": 1}
+      ],
+      "unlocksDoors": [
+        {"types": ["super"], "requires": []},
+        {"types": ["missiles", "powerbomb"], "requires": ["never"]}
+      ],
+      "devNote": "This would technically clear A, but depending on what is being done here, there will likely be too much acid to cross the room."
+    },
     {
       "id": 2,
       "link": [1, 1],
@@ -254,6 +296,26 @@
       "flashSuitChecked": true,
       "devNote": "Artificial morph will allow Samus not to fall; real Morph is not sufficient."
     },
+    {
+      "id": 37,
+      "link": [1, 3],
+      "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        {"or": [
+          "ScrewAttack",
+          {"heatFrames": 60}
+        ]},
+        {"heatFrames": 300}
+      ],
+      "clearsObstacles": ["A"],
+      "note": [
+        "Falling into the room while holding right is safe at low horizontal speed.",
+        "Pirates can be shot with any weapon to prevent them from firing."
+      ]
+    },
     {
       "id": 5,
       "link": [1, 3],
@@ -294,6 +356,71 @@
         "Pirates can be shot with any weapon to prevent them from firing."
       ]
     },
+    {
+      "link": [1, 3],
+      "name": "Fall Into Room With Mockball",
+      "entranceCondition": {
+        "comeInWithMockball": {
+          "adjacentMinTiles": 0,
+          "remoteAndLandingMinTiles": [[0, 0]],
+          "speedBooster": "any"
+        }
+      },
+      "requires": [
+        {"or": [
+          "ScrewAttack",
+          {"heatFrames": 60}
+        ]},
+        {"heatFrames": 300}
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "devNote": [
+        "FIXME: There are better ways to fall to 3, but coming in with an unfamiliar speed could land Samus in a bad position."
+      ]
+    },
+    {
+      "id": 38,
+      "link": [1, 4],
+      "name": "SpaceJump",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        "SpaceJump",
+        {"heatFrames": 500}
+      ],
+      "clearsObstacles": ["A"]
+    },
+    {
+      "id": 39,
+      "link": [1, 5],
+      "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        {"heatFrames": 180}
+      ],
+      "clearsObstacles": ["A"]
+    },
+    {
+      "link": [1, 5],
+      "name": "Fall Into Room With Mockball",
+      "entranceCondition": {
+        "comeInWithMockball": {
+          "adjacentMinTiles": 0,
+          "remoteAndLandingMinTiles": [[0, 0]],
+          "speedBooster": "any"
+        }
+      },
+      "requires": [
+        {"heatFrames": 180}
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true
+    },
     {
       "id": 7,
       "link": [2, 1],
@@ -958,66 +1085,6 @@
         "This strat is only used to avoid walljumping.",
         "FIXME: Gravity heat reduction is disabled for part of this strat."
       ]
-    },
-    {
-      "id": 36,
-      "link": [6, 1],
-      "name": "SpinJump Entry",
-      "requires": [
-        "canPrepareForNextRoom",
-        {"or": [
-          "SpaceJump",
-          "canWalljump",
-          {"and": [
-            "canTrickyJump",
-            "canMomentumConservingTurnaround"
-          ]},
-          "canStationarySpinJump"
-        ]},
-        {"heatFrames": 80}
-      ],
-      "clearsObstacles": ["A"],
-      "unlocksDoors": [
-        {"types": ["super"], "requires": []},
-        {"types": ["missiles", "powerbomb"], "requires": ["never"]}
-      ]
-    },
-    {
-      "id": 37,
-      "link": [6, 3],
-      "name": "Base",
-      "requires": [
-        {"or": [
-          "ScrewAttack",
-          {"heatFrames": 60}
-        ]},
-        {"heatFrames": 300}
-      ],
-      "clearsObstacles": ["A"],
-      "note": [
-        "Falling into the room while holding right is safe at low horizontal speed.",
-        "Pirates can be shot with any weapon to prevent them from firing."
-      ]
-    },
-    {
-      "id": 38,
-      "link": [6, 4],
-      "name": "SpaceJump",
-      "requires": [
-        "canPrepareForNextRoom",
-        "SpaceJump",
-        {"heatFrames": 500}
-      ],
-      "clearsObstacles": ["A"]
-    },
-    {
-      "id": 39,
-      "link": [6, 5],
-      "name": "Base",
-      "requires": [
-        {"heatFrames": 180}
-      ],
-      "clearsObstacles": ["A"]
     }
   ],
   "nextStratId": 40,