Merge pull request #1834 from kjbranch/spawn-at-final-1

Remove spawnAt: Climb, Blue Hopper, Mickey Mouse

Author: osse101

region/crateria/central/Climb.json

@@ -24,6 +24,8 @@
       "nodeAddress": "0x0018b6e",
       "doorOrientation": "left",
       "doorEnvironments": [{"physics": "air"}],
+      "useImplicitComeInNormally": false,
+      "useImplicitComeInWithMockball": false,
       "locks": [
         {
           "name": "Climb Tourian Gray Lock (to Tourian Escape)",
@@ -37,8 +39,7 @@
             }
           ]
         }
-      ],
-      "spawnAt": 7
+      ]
     },
     {
       "id": 3,
@@ -116,12 +117,6 @@
       "name": "Main Junction",
       "nodeType": "junction",
       "nodeSubType": "junction"
-    },
-    {
-      "id": 7,
-      "name": "Bottom Left Door Spawn At Junction",
-      "nodeType": "junction",
-      "nodeSubType": "junction"
     }
   ],
   "obstacles": [
@@ -214,12 +209,6 @@
         {"id": 5},
         {"id": 6}
       ]
-    },
-    {
-      "from": 7,
-      "to": [
-        {"id": 2}
-      ]
     }
   ],
   "strats": [
@@ -505,6 +494,17 @@
         ]}
       ]
     },
+    {
+      "id": 105,
+      "link": [2, 2],
+      "name": "Base",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [],
+      "clearsObstacles": ["B"],
+      "devNote": "When Samus enters the room from the bottom left, lava starts to rise. In the escape it is acid instead."
+    },
     {
       "id": 17,
       "link": [2, 2],
@@ -572,42 +572,17 @@
       "devNote": "An unheated lava crystal flash could be added instead, but that would change the strats that come after."
     },
     {
-      "id": 21,
       "link": [2, 2],
-      "name": "Carry G-Mode Back Through",
+      "name": "Base, Mockball Entry",
       "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": false
+        "comeInWithMockball": {
+          "adjacentMinTiles": 0,
+          "remoteAndLandingMinTiles": [[0, 0]],
+          "speedBooster": "any"
         }
       },
       "requires": [],
-      "exitCondition": {
-        "leaveWithGMode": {
-          "morphed": false
-        }
-      },
-      "bypassesDoorShell": true,
-      "flashSuitChecked": true
-    },
-    {
-      "id": 22,
-      "link": [2, 2],
-      "name": "Carry G-Mode Morph Back Through",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": true
-        }
-      },
-      "requires": [],
-      "exitCondition": {
-        "leaveWithGMode": {
-          "morphed": true
-        }
-      },
-      "bypassesDoorShell": true,
-      "flashSuitChecked": true
+      "clearsObstacles": ["B"]
     },
     {
       "id": 23,
@@ -905,7 +880,7 @@
           ]}
         ]}
       ],
-      "clearsObstacles": ["A", "B"]
+      "clearsObstacles": ["A"]
     },
     {
       "id": 36,
@@ -2194,14 +2169,6 @@
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true
-    },
-    {
-      "id": 105,
-      "link": [7, 2],
-      "name": "Base",
-      "requires": [],
-      "clearsObstacles": ["B"],
-      "devNote": "When Samus enters the room from the bottom left, lava starts to rise. In the escape it is acid instead."
     }
   ],
   "nextStratId": 106,

region/lowernorfair/east/Mickey Mouse Room.json

@@ -16,6 +16,8 @@
       "nodeAddress": "0x001992a",
       "doorOrientation": "left",
       "doorEnvironments": [{"physics": "air"}],
+      "useImplicitComeInNormally": false,
+      "useImplicitComeInWithMockball": false,
       "locks": [
         {
           "name": "Mickey Mouse Gray Lock (to Fast Pillars Setup Room)",
@@ -48,8 +50,7 @@
             "We went with the two most plausible ones."
           ]
         }
-      ],
-      "spawnAt": 8
+      ]
     },
     {
       "id": 2,
@@ -89,12 +90,6 @@
       "nodeSubType": "junction",
       "note": "Position to the left of the rightmost two Dessgeegas"
     },
-    {
-      "id": 8,
-      "name": "Left Door Spawn At Junction (Multiviola Hit)",
-      "nodeType": "junction",
-      "nodeSubType": "junction"
-    },
     {
       "id": 9,
       "name": "Junction Below Crumble Blocks, Set Up to Clip",
@@ -146,14 +141,14 @@
       "groupName": "Mickey Mouse Bottom Multiviolas",
       "enemyName": "Multiviola",
       "quantity": 2,
-      "betweenNodes": [7, 8]
+      "betweenNodes": [1, 7]
     },
     {
       "id": "e2",
       "groupName": "Mickey Mouse Left Dessgeegas",
       "enemyName": "Dessgeega",
       "quantity": 3,
-      "betweenNodes": [7, 8]
+      "betweenNodes": [1, 7]
     },
     {
       "id": "e3",
@@ -232,12 +227,6 @@
         }
       ]
     },
-    {
-      "from": 8,
-      "to": [
-        {"id": 1}
-      ]
-    },
     {
       "from": 9,
       "to": [
@@ -314,6 +303,67 @@
       "note": "The Multiviola can be killed by aiming diagonally down when entering the room and shooting a strong enough beam shot (not ice).",
       "devNote": "Taking a hit by the Multiviola isn't an option, as it will stop Samus' run and then the Dessgeega will be in the way."
     },
+    {
+      "id": 77,
+      "link": [1, 1],
+      "name": "Base, Get Hit on Entry",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        {"enemyDamage": {"enemy": "Multiviola", "type": "contact", "hits": 1}},
+        {"heatFrames": 40}
+      ]
+    },
+    {
+      "id": 78,
+      "link": [1, 1],
+      "name": "Kill Multiviola on Entry",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        {"or": [
+          {"and": [
+            {"enemyKill": {
+              "enemies": [["Multiviola"]],
+              "explicitWeapons": ["PseudoScrew", "ScrewAttack"]
+            }},
+            {"heatFrames": 30}
+          ]},
+          {"and": [
+            "canTrickyJump",
+            {"enemyKill": {
+              "enemies": [["Multiviola"]],
+              "explicitWeapons": ["Missile", "Super"]
+            }},
+            {"heatFrames": 30}
+          ]},
+          {"and": [
+            {"enemyKill": {
+              "enemies": [["Multiviola"]],
+              "explicitWeapons": ["Charge+Ice", "Ice+Wave", "Ice+Spazer"]
+            }},
+            {"heatFrames": 60}
+          ]},
+          {"enemyKill": {
+            "enemies": [["Multiviola"]],
+            "explicitWeapons": ["Plasma", "Charge+Spazer", "Charge+Wave"]
+          }}
+        ]},
+        {"heatFrames": 40}
+      ],
+      "note": [
+        "The Multiviola will immediately reach Samus at the door when entering the room.",
+        "By entering the room in a jump and aiming down, there is just enough time to shoot the multiviola.",
+        "Or by entering the room aiming diagonally down and firing a beam shot."
+      ],
+      "devNote": [
+        "You can kill the Multiviola with a super without jumping but it would be a notable strat for being frame precise and its not worth separating it out.",
+        "This does not clear obstacle E, because this is not the Multiviola that can be used for the ice clip."
+      ]
+    },
     {
       "id": 3,
       "link": [1, 1],
@@ -339,6 +389,21 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Mockball Entry, Tank Hit",
+      "entranceCondition": {
+        "comeInWithMockball": {
+          "adjacentMinTiles": 0,
+          "remoteAndLandingMinTiles": [[0, 0]],
+          "speedBooster": "any"
+        }
+      },
+      "requires": [
+        {"enemyDamage": {"enemy": "Multiviola", "type": "contact", "hits": 1}},
+        {"heatFrames": 40}
+      ]
+    },
     {
       "id": 5,
       "link": [1, 1],
@@ -366,7 +431,8 @@
         }
       },
       "bypassesDoorShell": true,
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": "Samus will not take a hit by the Multiviola, as she still has i-frames when it reaches her."
     },
     {
       "id": 7,
@@ -385,7 +451,8 @@
         }
       },
       "bypassesDoorShell": true,
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": "Samus will not take a hit by the Multiviola, as she still has i-frames when it reaches her."
     },
     {
       "id": 8,
@@ -445,7 +512,7 @@
     {
       "id": 12,
       "link": [1, 7],
-      "name": "Tank the Damage",
+      "name": "Tank the Damage, Run Through on Entry",
       "entranceCondition": {
         "comeInNormally": {}
       },
@@ -1514,61 +1581,6 @@
       ],
       "clearsObstacles": ["F"]
     },
-    {
-      "id": 77,
-      "link": [8, 1],
-      "name": "Get Hit on Entry",
-      "requires": [
-        {"enemyDamage": {"enemy": "Multiviola", "type": "contact", "hits": 1}},
-        {"heatFrames": 40}
-      ]
-    },
-    {
-      "id": 78,
-      "link": [8, 1],
-      "name": "Kill Multiviola on Entry",
-      "requires": [
-        "canPrepareForNextRoom",
-        {"or": [
-          {"and": [
-            {"enemyKill": {
-              "enemies": [["Multiviola"]],
-              "explicitWeapons": ["PseudoScrew", "ScrewAttack"]
-            }},
-            {"heatFrames": 30}
-          ]},
-          {"and": [
-            "canTrickyJump",
-            {"enemyKill": {
-              "enemies": [["Multiviola"]],
-              "explicitWeapons": ["Missile", "Super"]
-            }},
-            {"heatFrames": 30}
-          ]},
-          {"and": [
-            {"enemyKill": {
-              "enemies": [["Multiviola"]],
-              "explicitWeapons": ["Charge+Ice", "Ice+Wave", "Ice+Spazer"]
-            }},
-            {"heatFrames": 60}
-          ]},
-          {"enemyKill": {
-            "enemies": [["Multiviola"]],
-            "explicitWeapons": ["Plasma", "Charge+Spazer", "Charge+Wave"]
-          }}
-        ]},
-        {"heatFrames": 40}
-      ],
-      "note": [
-        "The Multiviola will immediately reach Samus at the door when entering the room.",
-        "By entering the room in a jump and aiming down, there is just enough time to shoot the multiviola.",
-        "Or by entering the room aiming diagonally down and firing a beam shot."
-      ],
-      "devNote": [
-        "You can kill the Multiviola with a super without jumping but it would be a notable strat for being frame precise and its not worth separating it out.",
-        "This does not clear obstacle E, because this is not the Multiviola that can be used for the ice clip."
-      ]
-    },
     {
       "id": 79,
       "link": [9, 2],