From 8923a3491c040d3ec64fecfef1a74c9e5580d70c Mon Sep 17 00:00:00 2001
From: Karl Ostmo <kostmo@gmail.com>
Date: Sun, 27 Aug 2023 19:14:51 -0700
Subject: [PATCH] fixup

---
 data/schema/attribute.json          | 8 ++++----
 data/schema/objective.json          | 2 +-
 data/schema/placement.json          | 3 ++-
 data/schema/portal.json             | 5 +++--
 data/schema/recipes.json            | 2 +-
 data/schema/samples/combustion.yaml | 3 ---
 data/schema/structure.json          | 2 +-
 data/schema/world.json              | 2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 data/schema/samples/combustion.yaml

diff --git a/data/schema/attribute.json b/data/schema/attribute.json
index abd7d1b51..16adc5037 100644
--- 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
index 5078dfade..ccc8c5dc5 100644
--- 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
index e8193048c..7b3cfe747 100644
--- 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
index db01626c3..e8c402ff9 100644
--- a/data/schema/portal.json
+++ b/data/schema/portal.json
@@ -15,12 +15,13 @@
             "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",
@@ -28,7 +29,7 @@
                 },
                 "subworldName": {
                     "type": "string",
-                    "description": "Name of subworld"
+                    "description": "Name of exit subworld"
                 }
             }
         }
diff --git a/data/schema/recipes.json b/data/schema/recipes.json
index 415e3de74..31d546b24 100644
--- 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
deleted file mode 100644
index ae27c7e17..000000000
--- a/data/schema/samples/combustion.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-ignition: 1
-duration: [8, 8]
-product: null
diff --git a/data/schema/structure.json b/data/schema/structure.json
index 815431f05..429c99e3e 100644
--- 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
index 194c6fc97..60ae1e9b7 100644
--- 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"