Merge pull request #1816 from kjbranch/spawn-at-3

Remove spawnAt: Toilet, Big Pink

Author: blkerby

region/brinstar/pink/Big Pink.json

@@ -51,8 +51,8 @@
       "nodeAddress": "0x0018dde",
       "doorOrientation": "left",
       "doorEnvironments": [{"physics": "air"}],
-      "spawnAt": 14,
-      "note": "Samus is considered to spawn at 14 because of the crumble blocks. This can be negated by performing a stationary spin jump when entering, allowing her to 'get back to 5'"
+      "useImplicitComeInNormally": false,
+      "useImplicitComeInWithMockball": false
     },
     {
       "id": 6,
@@ -120,13 +120,6 @@
       "nodeType": "junction",
       "nodeSubType": "junction"
     },
-    {
-      "id": 14,
-      "name": "Left Side - Botom Middle Door Spawn At Junction",
-      "nodeType": "junction",
-      "nodeSubType": "junction",
-      "note": "A junction used as a midpoint between 5 and 13 to express that a tech is required to access 5"
-    },
     {
       "id": 15,
       "name": "G-Mode Morph Junction (Middle Right)",
@@ -255,7 +248,7 @@
       "to": [
         {"id": 4},
         {"id": 5},
-        {"id": 14}
+        {"id": 13}
       ]
     },
     {
@@ -344,13 +337,6 @@
         {"id": 13}
       ]
     },
-    {
-      "from": 14,
-      "to": [
-        {"id": 5},
-        {"id": 13}
-      ]
-    },
     {
       "from": 15,
       "to": [
@@ -1126,6 +1112,39 @@
       "flashSuitChecked": true,
       "note": "Climb up 1 screen."
     },
+    {
+      "id": 119,
+      "link": [5, 5],
+      "name": "Land in Door Frame",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        "canTrickyJump",
+        {"doorUnlockedAtNode": 5}
+      ],
+      "unlocksDoors": [
+        {"types": ["super"], "requires": ["canInsaneJump"]},
+        {"types": ["missiles"], "requires": ["never"]},
+        {"types": ["powerbomb"], "requires": ["h_canUseSpringBall"]}
+      ],
+      "note": "Jump through the door and shoot it open as you enter, landing on the door frame to avoid falling through the crumbles."
+    },
+    {
+      "link": [5, 5],
+      "name": "Door Stuck, Open Door",
+      "entranceCondition": {
+        "comeInWithDoorStuckSetup": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        {"doorUnlockedAtNode": 5}
+      ],
+      "unlocksDoors": [
+        {"types": ["ammo"], "requires": []}
+      ]
+    },
     {
       "id": 41,
       "link": [5, 5],
@@ -1148,47 +1167,24 @@
       "flashSuitChecked": true
     },
     {
-      "id": 43,
-      "link": [5, 5],
-      "name": "Carry G-Mode Back Through",
+      "id": 45,
+      "link": [5, 13],
+      "name": "Base",
       "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": false
-        }
+        "comeInNormally": {}
       },
-      "requires": [],
-      "exitCondition": {
-        "leaveWithGMode": {
-          "morphed": false
-        }
-      },
-      "bypassesDoorShell": true,
-      "flashSuitChecked": true
+      "requires": []
     },
     {
-      "id": 44,
-      "link": [5, 5],
-      "name": "Carry G-Mode Morph Back Through",
+      "link": [5, 13],
+      "name": "Fall Into Room With Mockball",
       "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": true
-        }
-      },
-      "requires": [],
-      "exitCondition": {
-        "leaveWithGMode": {
-          "morphed": true
+        "comeInWithMockball": {
+          "adjacentMinTiles": 0,
+          "remoteAndLandingMinTiles": [[0, 0]],
+          "speedBooster": "any"
         }
       },
-      "bypassesDoorShell": true,
-      "flashSuitChecked": true
-    },
-    {
-      "id": 45,
-      "link": [5, 14],
-      "name": "Base",
       "requires": []
     },
     {
@@ -2542,30 +2538,6 @@
       ],
       "devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
     },
-    {
-      "id": 119,
-      "link": [14, 5],
-      "name": "Land in Door Frame",
-      "requires": [
-        "canPrepareForNextRoom",
-        {"or": [
-          "canCarefulJump",
-          "canStationarySpinJump"
-        ]}
-      ],
-      "unlocksDoors": [
-        {"types": ["super"], "requires": []},
-        {"types": ["missiles"], "requires": ["never"]},
-        {"types": ["powerbomb"], "requires": ["h_canUseSpringBall"]}
-      ],
-      "note": "Jump through the door and shoot it open as you enter, landing on the door frame to avoid falling through the crumbles."
-    },
-    {
-      "id": 120,
-      "link": [14, 13],
-      "name": "Base",
-      "requires": []
-    },
     {
       "id": 121,
       "link": [15, 1],

region/brinstar/roomDiagrams/pink_BigPink_59.png

@@ -15,8 +15,11 @@
       "nodeSubType": "vertical",
       "nodeAddress": "0x001a60c",
       "doorOrientation": "up",
-      "spawnAt": 2,
-      "doorEnvironments": [{"physics": "air"}]
+      "doorEnvironments": [{"physics": "air"}],
+      "useImplicitLeaveNormally":false,
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     },
     {
       "id": 2,
@@ -25,26 +28,66 @@
       "nodeSubType": "vertical",
       "nodeAddress": "0x001a600",
       "doorOrientation": "down",
-      "spawnAt": 1,
-      "doorEnvironments": [{"physics": "air"}]
+      "doorEnvironments": [{"physics": "air"}],
+      "useImplicitLeaveNormally":false,
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     }
   ],
   "links": [
     {
       "from": 1,
-      "to": []
+      "to": [
+        {"id": 2}
+      ]
     },
     {
       "from": 2,
-      "to": []
+      "to": [
+        {"id": 1}
+      ]
     }
   ],
   "note": "This is the vertical pipe that connects Plasma Spark Room and Oasis. Visually it looks like a portion of Aqueduct and Botwoon Hallway (and surroundings).",
   "devNote": [
-    "There are no links because Samus can't move freely between the nodes.",
-    "Traversal through the room happens via each node's spawnAt property, placing Samus at the other end of the room with no option but to leave."
+    "Samus can't move freely between the nodes.",
+    "Traversal through the room happens by placing Samus at the other end of the room with no option but to leave.",
+    "The Toilet doesn't work normally with G-mode. On entry, Reserves are triggered, but Samus cannot use X-Ray.",
+    "Weird things happen if Reserves are still filling when Samus reaches the end of the Toilet ride."
+  ],
+  "strats": [
+    {
+      "link": [1, 2],
+      "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
+      "requires": [],
+      "exitCondition": {
+        "leaveNormally": {}
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": ["never"]}],
+      "flashSuitChecked": true,
+      "devNote": "These doors can't be locked and 'comesThroughToilet' doesn't make sense unless this room was chained together."
+    },
+    {
+      "link": [2, 1],
+      "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
+      "requires": [],
+      "exitCondition": {
+        "leaveNormally": {}
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": ["never"]}],
+      "flashSuitChecked": true,
+      "devNote": "These doors can't be locked and 'comesThroughToilet' doesn't make sense unless this room was chained together."
+    }
   ],
-  "strats": [],
   "nextStratId": 1,
   "notables": [],
   "nextNotableId": 1