Merge pull request #1775 from kjbranch/schema-cleanup

Schema Cleanup

Author: blkerby

items.json

@@ -3,8 +3,7 @@
   "startingRoom": "Ceres Elevator Room",
   "startingNode": 1,
   "startingItems": [
-    "PowerBeam",
-    "PowerSuit"
+    "PowerBeam"
   ],
   "startingFlags": [ ],
   "startingLocks": [ ],
@@ -31,8 +30,7 @@
     }
   ],
   "implicitItems": [
-    "PowerBeam",
-    "PowerSuit"
+    "PowerBeam"
   ],
   "upgradeItems": [
     {

region/region-readme.md

@@ -60,9 +60,6 @@ The `utility` property is an array of utility functions available to Samus at a
 * _reserve:_ Note that this excludes regular energy. If a node can refill reserves as well as energy, it will have both `energy` and `reserve`
 * _map_
 
-#### interactionRequires
-[Logical requirements](../logicalRequirements.md) that must be fulfilled each time Samus interacts with the node.
-
 #### locks
 The `locks` property is an array that contains different ways a node can be locked, and the corresponding way it can be unlocked. Each object in the `locks` property has some properties of its own:
 * _lockType:_ An enum indicating the type of lock. It gives a basic idea of what kind of thing has to be done to open this lock. Possible lock types are:
@@ -73,7 +70,6 @@ The `locks` property is an array that contains different ways a node can be lock
   * _gameFlag:_ Indicates a lock that is opened when a game flag has been activated. Most locks that are unlocked by killing a boss are this type, rather than `bossFight`.
   * _killEnemies:_ A lock that is unlocked by killing enemies in a room. This excludes doors in boss rooms, which are `gameFlag` locks.
   * _permanent:_ A lock that can never be unlocked.
-  * _triggeredEvent:_ A type for miscellaneous events triggered by an action performed nearby by Samus.
 * _lock:_ The `lock` property lists [logical requirements](../logicalRequirements.md) that must be fulfilled in order for the node to be locked. If this is missing, the node is considered initially locked at game start.
 * _name:_ A name that identifies the lock. This name must be unique across all locks in the model.
 * _unlockStrats:_ The `unlockStrats` property is an array of [strats](../strats.md), each of which may be executed in order to unlock this specific lock. Unlocking a node makes it possible to interact with the node until the end of the game.

schema/m3-requirements.schema.json

@@ -318,7 +318,6 @@
                 }
               }
             }
-
           },
           "gravitylessHeatFrames": {
             "$id": "#/definitions/logicalRequirement/items/properties/gravitylessHeatFrames",

schema/m3-room.schema.json

@@ -1591,7 +1591,6 @@
       "type": "integer",
       "title": "Room ID",
       "description": "Identifier for this room, unique across the entire game",
-      "default": 0,
       "examples": [
         7
       ]
@@ -1601,39 +1600,35 @@
       "type": "string",
       "title": "Room Name",
       "description": "As it appears in the SuperMetroid.run wiki",
-      "default": "",
       "examples": [
-        "Morphing Ball Room"
+        "Aqueduct"
       ],
       "pattern": "^(.*)$"
     },
     "area": {
       "$id": "#/properties/area",
       "type": "string",
       "title": "Area Name",
-      "default": "",
       "examples": [
-        "Brinstar"
+        "Maridia"
       ],
       "pattern": "^(.*)$"
     },
     "subarea": {
       "$id": "#/properties/subarea",
       "type": "string",
       "title": "Area Subname",
-      "default": "",
       "examples": [
-        "Blue"
+        "Inner"
       ],
       "pattern": "^(.*)$"
     },
     "subsubarea": {
       "$id": "#/properties/subsubarea",
       "type": "string",
       "title": "Area SubSubname",
-      "default": "",
       "examples": [
-        "Yellow"
+        "Pink"
       ],
       "pattern": "^(.*)$"
     },
@@ -1868,12 +1863,6 @@
             "default": true,
             "description": "Whether a standard strat should implicitly be included for unlocking this node if it is a door node."
           },
-          "interactionRequires": {
-            "$ref" : "m3-requirements.schema.json#/definitions/logicalRequirements",
-            "$id": "#/properties/nodes/items/properties/interactionRequires",
-            "title": "Interaction Requirements",
-            "description": "Equipment, tech, and flag requirements to interact with this node once it has been reached. This is separate from one-time unlock requirements."
-          },
           "spawnAt": {
             "$id": "#/properties/nodes/items/properties/spawnAt",
             "type": "integer",
@@ -1907,8 +1896,7 @@
                     "escapeFunnel",
                     "gameFlag",
                     "killEnemies",
-                    "permanent",
-                    "triggeredEvent"
+                    "permanent"
                   ],
                   "pattern": "^(.*)$"
                 },
@@ -2096,7 +2084,6 @@
                   "$id": "#/properties/links/items/properties/to/items/properties/id",
                   "type": "integer",
                   "title": "Target Node ID within the Room",
-                  "default": 0,
                   "examples": [
                     2
                   ]
@@ -2329,7 +2316,7 @@
             "title": "Notable Strat Name",
             "default": "",
             "examples": [
-              "Bubble Mountain Damage Boost"
+              "Big Jump with Blue Speed"
             ],
             "pattern": "^(.*)$"
           },