Merge pull request #1837 from kjbranch/spawnat-removal

Remove Spawn At Schema, etc.

Author: blkerby

region/maridia/outer/Fish Tank.json

@@ -63,7 +63,7 @@
     },
     {
       "id": 7,
-      "name": "Spawn At Junction Near Top Right Door",
+      "name": "Platform Below Top Right Door",
       "nodeType": "junction",
       "nodeSubType": "junction"
     }

region/maridia/outer/Glass Tunnel.json

@@ -75,7 +75,7 @@
     },
     {
       "id": 6,
-      "name": "Top Spawn At Junction",
+      "name": "Platform Below Top Door",
       "nodeType": "junction",
       "nodeSubType": "junction"
     }

region/maridia/outer/Mt. Everest.json

@@ -79,7 +79,7 @@
     },
     {
       "id": 9,
-      "name": "Spawn At Junction Below Top Door",
+      "name": "Platform Below Top Door",
       "nodeType": "junction",
       "nodeSubType": "junction"
     },

region/region-readme.md

@@ -51,9 +51,6 @@ By default every door node has an implicit strat from the node to itself, for [u
 
 Most doors have a closing animation that occurs when entering through them. However, certain doors are immediately closed when the room is loaded. When entering through such a door in direct G-mode, the door will be closed, making it not possible to return back through the door without first exiting G-mode. It would also not be possible to get stuck inside the door shell using an X-ray climb setup.
 
-#### spawnAt
-The `spawnAt` property is used to represent situations where Samus enters a room via a node, but can quickly end up at another node without user input. This is only relevant in situations where there are requirements for getting back to the door Samus entered through. When a node has a `null` value for this property, Samus simply spawns at that node as normal.
-
 #### utility
 The `utility` property is an array of utility functions available to Samus at a node. Those include saving, map stations, as well as resource refills. Possible utilities are:
 * _save_

schema/m3-room.schema.json

@@ -1611,12 +1611,6 @@
             "default": false,
             "description": "Whether this door is immediately closed on entry, rather than having a closing animation."
           },
-          "spawnAt": {
-            "type": "integer",
-            "title": "Node to spawn at",
-            "description": "ID of the node at which Samus spawns when entering a room through this node. If this is null, Samus just spawns at the node she entered through",
-            "default": null
-          },
           "locks": {
             "type": "array",
             "title": "Node Locks",

strats.md

@@ -1535,8 +1535,6 @@ With certain exceptions described below, by default every door node and entrance
 
 This implicit strat can be disabled by setting the node property `"useImplicitComeInNormally": false`.
 
-If the node has a `spawnAt` property, then this implicit strat ends at the `spawnAt` node, rather than ending at the door node.
-
 ### Implicit Come In With Mockball
 
 With certain exceptions described below, by default every horizontal door node has an implicit strat from the node to itself, for entering the room through the door while in a mockball (or speedball). This implicit strat has a `comeInWithMockball` entrance condition. In unheated rooms, it has the following form:
@@ -1579,8 +1577,6 @@ This implicit strat is to cover cases where leaving with a mockball may be desir
 
 This implicit strat can be disabled by setting the node property `"useImplicitComeInWithMockball": false`.
 
-If the node has a `spawnAt` property, then this implicit strat is disabled, and should never be marked with `"useImplicitComeInWithMockball": true`.
-
 ### Implicit Carry G-Mode Back Through
 
 With certain exceptions described below, by default every door node has an implicit strat from the node to itself, for entering the room in direct G-mode through the door and then walking back out through the open doorway while still in G-mode. This implicit strat has a `comeInWithGMode` entrance condition and a `leaveWithGMode` exit condition and is of the following form:
@@ -1608,7 +1604,7 @@ Note that if there are strats from this door node to itself with `"gModeRegainMo
 
 This implicit strat can be disabled by setting the node property `"useImplicitCarryGModeBackThrough": false`.
 
-If the node has a `spawnAt` property, or if it has `"isDoorImmediatelyClosed": true`, then this implicit strat is disabled unless the node is explicitly marked as `"useImplicitCarryGModeBackThrough": true`.
+If the node has `"isDoorImmediatelyClosed": true`, then this implicit strat is disabled unless the node is explicitly marked as `"useImplicitCarryGModeBackThrough": true`.
 
 ### Implicit Carry G-Mode Morph Back Through
 
@@ -1639,7 +1635,7 @@ As with other `comeInWithGMode` strats having `"morphed": true`, it is assumed h
 
 This implicit strat can be disabled by setting the node property `"useImplicitCarryGModeMorphBackThrough": false`.
 
-If the node has a `spawnAt` property, or if it has `"isDoorImmediatelyClosed": true`, or if the node is a vertical door in bottom position (leading up), then this implicit strat is disabled unless the node is explicitly marked as `"useImplicitCarryGModeMorphBackThrough": true`. Note that the exception about the node being a door in bottom position differs from unmorphed implicit strats for carrying G-mode back through a door, described in the previous section, which have no such exception.
+If the node has `"isDoorImmediatelyClosed": true`, or if the node is a vertical door in bottom position (leading up), then this implicit strat is disabled unless the node is explicitly marked as `"useImplicitCarryGModeMorphBackThrough": true`. Note that the exception about the node being a door in bottom position differs from unmorphed implicit strats for carrying G-mode back through a door, described in the previous section, which have no such exception.
 
 ## Run Speed
 

tests/asserts/keywords.py

@@ -623,7 +623,6 @@ def check_speed_states(strat, err_fn):
                             "tos": [],
                             "ids": [],
                             "names": [],
-                            "spawnAts": [],
                             "leaveCharged": {
                                 "from": {}
                             }
@@ -670,8 +669,6 @@ def check_speed_states(strat, err_fn):
                         else:
                             roomData["nodes"]["names"].append(node["name"])
                         roomData["nodes"]["ids"].append(node["id"])
-                        if "spawnAt" in node and node["spawnAt"] not in roomData["nodes"]["spawnAts"]:
-                            roomData["nodes"]["tos"].append(node["spawnAt"])
 
                         if node.get("useImplicitDoorUnlocks") is False:
                             nodes_without_implicit_unlocks.add(node['id'])
@@ -1046,14 +1043,7 @@ def check_for_notables(req):
                             nodeRef = f"{roomRef}:{node['id']}:{node['name']}"
                             orphaned = True
 
-                        foundNode = False
-                        if "spawnAt" in node:
-                            foundNode = node["spawnAt"] in roomData["nodes"]["froms"]
-                            orphaned = not foundNode
-                            if orphaned:
-                                msg = f"🔴ERROR: Orphaned SpawnAt! {nodeRef}::{node['spawnAt']}"
-                                messages["reds"].append(msg)
-                                messages["counts"]["reds"] += 1
+                        foundNode = False  # spawnAts were removed, so this code can be simplified
 
                         # If it's orphaned, try to find a connection
                         if orphaned: