Merge pull request #1812 from kjbranch/spawn-at

Use New Implicit Strats, Electric Death, Blue Boulder

Author: osse101

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -24,11 +24,13 @@
       "nodeAddress": "0x0018fe2",
       "doorOrientation": "right",
       "doorEnvironments": [{"physics": "air"}],
-      "spawnAt": 3
+      "useImplicitComeInNormally": false,
+      "useImplicitComeInWithMockball": false,
+      "devNote": "Defined as being on the door ledge, above the water."
     },
     {
       "id": 3,
-      "name": "Right Door Spawn At Junction (In the Water)",
+      "name": "Right Door, In the Water",
       "nodeType": "junction",
       "nodeSubType": "junction"
     }
@@ -55,7 +57,8 @@
       "from": 2,
       "to": [
         {"id": 1},
-        {"id": 2}
+        {"id": 2},
+        {"id": 3}
       ]
     },
     {
@@ -326,6 +329,18 @@
         "SpaceJump"
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Space Jump Jumping Entry",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        "SpaceJump"
+      ],
+      "devNote": "Requires a jumping entry, but any runway length and environment is fine."
+    },
     {
       "id": 16,
       "link": [2, 1],
@@ -483,11 +498,16 @@
         "canTrickyJump",
         {"or": [
           {"spikeHits": 1},
-          "h_canBackIntoCorner"
+          "canMorphTurnaround",
+          "canMoonwalk",
+          {"and": [
+            "canArtificialMorph",
+            {"tech": "canMorphTurnaround"}
+          ]}
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "In direct g-mode, the door will not close, and the in-room doorsill gives enough running room to make it up to the invisible ledge."
+      "note": "In direct G-mode, the door will not close, and the in-room doorsill gives enough running room to make it up to the invisible ledge."
     },
     {
       "id": 26,
@@ -564,25 +584,6 @@
         }
       }
     },
-    {
-      "id": 31,
-      "link": [2, 2],
-      "name": "Prepared Entry",
-      "entranceCondition": {
-        "comeInNormally": {}
-      },
-      "requires": [
-        "canPrepareForNextRoom",
-        {"or": [
-          "canCarefulJump",
-          "canStationarySpinJump"
-        ]}
-      ],
-      "unlocksDoors": [
-        {"types": ["super"], "requires": ["canInsaneJump"]},
-        {"types": ["missiles", "powerbomb"], "requires": ["never"]}
-      ]
-    },
     {
       "id": 32,
       "link": [2, 2],
@@ -593,53 +594,24 @@
       "flashSuitChecked": true
     },
     {
-      "id": 33,
-      "link": [2, 2],
-      "name": "Carry G-Mode Back Through",
+      "link": [2, 3],
+      "name": "Fall Into Water",
       "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": false
-        }
-      },
-      "requires": [
-        {"or": [
-          "canWalljump",
-          "HiJump",
-          "Gravity",
-          "canTrickySpringBallJump",
-          "h_canCrouchJumpDownGrab"
-        ]}
-      ],
-      "exitCondition": {
-        "leaveWithGMode": {
-          "morphed": false
-        }
+        "comeInNormally": {}
       },
-      "bypassesDoorShell": true,
-      "flashSuitChecked": true
+      "requires": []
     },
     {
-      "id": 34,
-      "link": [2, 2],
-      "name": "Carry G-Mode Morph Back Through",
+      "link": [2, 3],
+      "name": "Fall Into Room With Mockball",
       "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": true
+        "comeInWithMockball": {
+          "adjacentMinTiles": 0,
+          "remoteAndLandingMinTiles": [[0, 0]],
+          "speedBooster": "any"
         }
       },
-      "requires": [
-        "canArtificialMorph"
-      ],
-      "exitCondition": {
-        "leaveWithGMode": {
-          "morphed": true
-        }
-      },
-      "bypassesDoorShell": true,
-      "flashSuitChecked": true,
-      "devNote": "Artificial morph will allow Samus not to fall; real Morph is not sufficient."
+      "requires": []
     },
     {
       "id": 35,
@@ -657,7 +629,6 @@
         "SpaceJump",
         {"or": [
           "canWalljump",
-          "canPrepareForNextRoom",
           {"and": [
             "canSpaceJumpWaterEscape",
             "HiJump"

region/brinstar/roomDiagrams/blue_BlueBrinstarBoulderRoom_42.png

@@ -48,7 +48,10 @@
       "nodeSubType": "blue",
       "nodeAddress": "0x001a270",
       "doorOrientation": "left",
-      "doorEnvironments": [{"physics": "air"}]
+      "doorEnvironments": [{"physics": "air"}],
+      "useImplicitComeInNormally": false,
+      "useImplicitComeInWithMockball": false,
+      "devNote": "Defined as being on the door ledge, above the water."
     }
   ],
   "enemies": [],
@@ -293,6 +296,26 @@
       "name": "Base",
       "requires": []
     },
+    {
+      "link": [3, 2],
+      "name": "Fall Into Room",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": []
+    },
+    {
+      "link": [3, 2],
+      "name": "Fall Into Room With Mockball",
+      "entranceCondition": {
+        "comeInWithMockball": {
+          "adjacentMinTiles": 0,
+          "remoteAndLandingMinTiles": [[0, 0]],
+          "speedBooster": "any"
+        }
+      },
+      "requires": []
+    },
     {
       "id": 16,
       "link": [3, 3],