From 4da65cf4c079ee32f0a5582fb73add2362b5a70c Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 16 Dec 2019 21:51:55 -0500
Subject: [PATCH] update schemas for Content Patcher 1.11

---
 docs/release-notes.md                         |  2 +-
 .../wwwroot/schemas/content-patcher.json      | 23 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 75438aaa..772d95aa 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -14,7 +14,7 @@
 * For the web UI:
   * Added option to edit & reupload in the JSON validator.
   * If a JSON validator upload can't be saved to Pastebin (e.g. due to rate limits), it's now uploaded to Amazon S3 instead. Files uploaded to S3 expire after one month.
-  * Updated the JSON validator for Content Patcher 1.10.0.
+  * Updated the JSON validator for Content Patcher 1.10 and 1.11.
   * Fixed JSON validator no longer letting you change format when viewing results.
 
 * For modders:
diff --git a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
index c0236f1e..28e38e73 100644
--- a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
+++ b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
@@ -11,9 +11,9 @@
             "title": "Format version",
             "description": "The format version. You should always use the latest version to enable the latest features and avoid obsolete behavior.",
             "type": "string",
-            "const": "1.10.0",
+            "const": "1.11.0",
             "@errorMessages": {
-                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.10.0'."
+                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.11.0'."
             }
         },
         "ConfigSchema": {
@@ -276,6 +276,9 @@
                     }
                 },
                 "allOf": [
+                    {
+                        "required": [ "Action" ]
+                    },
                     {
                         "if": {
                             "properties": {
@@ -364,26 +367,26 @@
             "properties": {
                 "X": {
                     "title": "X-Coordinate",
-                    "description": "Location in pixels of the top-left of the rectangle",
-                    "type": "integer",
+                    "description": "The X position of the area's top-left corner, measured in pixels for a texture or tiles for a map. This can contain tokens.",
+                    "type": [ "integer", "string" ],
                     "minimum:": 0
                 },
                 "Y": {
                     "title": "Y-Coordinate",
-                    "description": "Location in pixels of the top-left of the rectangle",
-                    "type": "integer",
+                    "description": "The Y position of the area's top-left corner, measured in pixels for a texture or tiles for a map. This can contain tokens.",
+                    "type": [ "integer", "string" ],
                     "minimum:": 0
                 },
                 "Width": {
                     "title": "Width",
-                    "description": "The width of the rectangle",
-                    "type": "integer",
+                    "description": "The width of the area, measured in pixels for a texture or tiles for a map. This can contain tokens.",
+                    "type": [ "integer", "string" ],
                     "minimum:": 0
                 },
                 "Height": {
                     "title": "Height",
-                    "description": "The height of the rectangle",
-                    "type": "integer",
+                    "description": "The height of the area, measured in pixels for a texture or tiles for a map. This can contain tokens.",
+                    "type": [ "integer", "string" ],
                     "minimum:": 0
                 }
             },