Merge pull request #1818 from kjbranch/spawn-at-4

Remove spawnAt from Remaining Vertical Dropoffs

Author: osse101

region/maridia/inner-green/Oasis.json

@@ -34,7 +34,9 @@
       "nodeAddress": "0x001a678",
       "doorOrientation": "up",
       "doorEnvironments": [{"physics": "water"}],
-      "spawnAt": 4
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     },
     {
       "id": 4,
@@ -1143,6 +1145,10 @@
       "id": 50,
       "link": [3, 4],
       "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
       "requires": []
     },
     {

region/maridia/inner-pink/Aqueduct.json

@@ -59,7 +59,9 @@
       "nodeAddress": "0x001a72c",
       "doorOrientation": "up",
       "doorEnvironments": [{"physics": "water"}],
-      "spawnAt": 9
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     },
     {
       "id": 7,
@@ -2480,6 +2482,10 @@
       "id": 111,
       "link": [6, 9],
       "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
       "requires": []
     },
     {

region/maridia/outer/Fish Tank.json

@@ -32,7 +32,10 @@
       "nodeSubType": "blue",
       "nodeAddress": "0x001a3fc",
       "doorOrientation": "up",
-      "doorEnvironments": [{"physics": "water"}]
+      "doorEnvironments": [{"physics": "water"}],
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     },
     {
       "id": 4,
@@ -42,7 +45,9 @@
       "nodeAddress": "0x001a3f0",
       "doorOrientation": "up",
       "doorEnvironments": [{"physics": "water"}],
-      "spawnAt": 8
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     },
     {
       "id": 5,
@@ -61,12 +66,6 @@
       "name": "Spawn At Junction Near Top Right Door",
       "nodeType": "junction",
       "nodeSubType": "junction"
-    },
-    {
-      "id": 8,
-      "name": "Spawn At Junction Near Top Left Door",
-      "nodeType": "junction",
-      "nodeSubType": "junction"
     }
   ],
   "enemies": [
@@ -158,8 +157,7 @@
         {"id": 1},
         {"id": 4},
         {"id": 5},
-        {"id": 7},
-        {"id": 8}
+        {"id": 7}
       ]
     },
     {
@@ -187,13 +185,6 @@
         {"id": 6},
         {"id": 7}
       ]
-    },
-    {
-      "from": 8,
-      "to": [
-        {"id": 1},
-        {"id": 5}
-      ]
     }
   ],
   "strats": [
@@ -1323,12 +1314,20 @@
       "id": 47,
       "link": [3, 7],
       "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
       "requires": []
     },
     {
       "id": 48,
       "link": [4, 1],
       "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
       "requires": []
     },
     {
@@ -1641,12 +1640,6 @@
       "flashSuitChecked": true,
       "note": "Immediately spark after the door transition into the wall just to the right of the top right door."
     },
-    {
-      "id": 60,
-      "link": [4, 8],
-      "name": "Base",
-      "requires": []
-    },
     {
       "id": 61,
       "link": [5, 1],
@@ -1949,12 +1942,6 @@
         "h_canCrystalFlash"
       ],
       "flashSuitChecked": true
-    },
-    {
-      "id": 84,
-      "link": [8, 1],
-      "name": "Base",
-      "requires": []
     }
   ],
   "nextStratId": 96,

region/maridia/outer/Glass Tunnel.json

@@ -62,8 +62,10 @@
           "note": "It has normal physics before the tube is broken, but that can be lost forever."
         }
       ],
-      "useImplicitDoorUnlocks": false,
-      "spawnAt": 6
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false,
+      "useImplicitDoorUnlocks": false
     },
     {
       "id": 5,
@@ -1559,6 +1561,10 @@
       "id": 68,
       "link": [4, 6],
       "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
       "requires": []
     },
     {

region/maridia/outer/Mt. Everest.json

@@ -51,7 +51,9 @@
       "nodeAddress": "0x001a42c",
       "doorOrientation": "up",
       "doorEnvironments": [{"physics": "water"}],
-      "spawnAt": 9
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false
     },
     {
       "id": 6,
@@ -3032,6 +3034,10 @@
       "id": 129,
       "link": [5, 9],
       "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
       "requires": []
     },
     {

region/maridia/roomDiagrams/inner-green_Oasis_198.png

@@ -25,7 +25,9 @@
       "nodeAddress": "0x00193ea",
       "doorOrientation": "up",
       "doorEnvironments": [{"physics": "air"}],
-      "spawnAt": 4,
+      "useImplicitComeInNormally": false,
+      "useImplicitCarryGModeBackThrough": false,
+      "useImplicitCarryGModeMorphBackThrough": false,
       "locks": [
         {
           "name": "Crocomire Room Gray Lock (to Crocomire Speedway)",
@@ -307,6 +309,10 @@
       "id": 13,
       "link": [2, 4],
       "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
       "requires": []
     },
     {