fixup

swarm-game · Aug 28, 2023 · 8923a34 · 8923a34
1 parent f5082d3
commit 8923a34
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/data/schema/attribute.json b/data/schema/attribute.json
@@ -1,14 +1,14 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "https://raw.githubusercontent.com/swarm-game/swarm/main/data/schema/attribute.json",
-    "title": "Planar location",
-    "description": "Local attribute",
+    "title": "Scenario-local attributes",
+    "description": "Local attribute definitions",
     "type": "object",
     "additionalProperties": false,
     "properties": {
         "name": {
             "type": "string",
-            "description": "Name of subworld"
+            "description": "Name of attribute"
         },
         "fg": {
             "type": "string",
@@ -19,7 +19,7 @@
             "description": "Background color"
         },
         "style": {
-            "description": "Style properties",
+            "description": "Style properties list",
             "type": "array",
             "items": {
                 "type": "string"

diff --git a/data/schema/objective.json b/data/schema/objective.json
@@ -32,7 +32,7 @@
             "type": "boolean"
         },        
         "teaser": {
-            "description": "A 2-3 word summary of the goal",
+            "description": "A compact (2-3 word) summary of the goal",
             "type": "string"
         },
         "prerequisite": {}

diff --git a/data/schema/placement.json b/data/schema/placement.json
@@ -14,8 +14,9 @@
             "$ref": "./planar-loc.json"
         },
         "orient": {
-            "type": "object",
             "description": "Orientation of structure",
+            "type": "object",
+            "additionalProperties": false,
             "properties": {
                 "up": {
                     "type": "string"

diff --git a/data/schema/portal.json b/data/schema/portal.json
@@ -15,20 +15,21 @@
             "type": "string"
         },    
         "consistent": {
-            "description": "This portal is spatially consistent across worlds",
+            "description": "Whether this portal is spatially consistent across worlds",
             "type": "boolean"
         },          
         "exitInfo": {
             "description": "Exit definition",
             "type": "object",
+            "additionalProperties": false,
             "properties": {
                 "exit": {
                     "type": "string",
                     "description": "Name of exit waypoint"
                 },
                 "subworldName": {
                     "type": "string",
-                    "description": "Name of subworld"
+                    "description": "Name of exit subworld"
                 }
             }
         }

diff --git a/data/schema/recipes.json b/data/schema/recipes.json
@@ -24,8 +24,8 @@
                 ]
             }
         ],
+        "additionalProperties": false,
         "properties": {
-            "additionalProperties": false,
             "in": {
                 "$ref": "./inventory.json",
                 "description": "A list of ingredients consumed by the recipe. Each ingredient is a tuple consisting of an integer and an entity name, indicating the number of copies of the given entity that are needed."

diff --git a/data/schema/samples/combustion.yaml b/data/schema/samples/combustion.yaml
diff --git a/data/schema/structure.json b/data/schema/structure.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "https://raw.githubusercontent.com/swarm-game/swarm/main/data/schema/structure.json",
-    "title": "Swarm entity combustion",
+    "title": "Structures",
     "description": "Structure definitions",
     "type": "object",
     "additionalProperties": false,

diff --git a/data/schema/world.json b/data/schema/world.json
@@ -11,7 +11,7 @@
             "description": "Name of this subworld"
         },
         "default": {
-            "description": "Default world cell",
+            "description": "Default world cell content",
             "type": "array",
             "items": {
                 "type": "string"