Merge branch 'develop' into stable

1 files changed, 28 insertions, 17 deletions

diff --git a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
index 61a633cb..7e00c28e 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.9",
+            "const": "1.11.0",
             "@errorMessages": {
-                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.9'."
+                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.11.0'."
             }
         },
         "ConfigSchema": {
@@ -51,8 +51,7 @@
                         "if": {
                             "properties": {
                                 "AllowBlank": { "const": false }
-                            },
-                            "required": [ "AllowBlank" ]
+                            }
                         },
                         "then": {
                             "required": [ "Default" ]
@@ -194,6 +193,8 @@
                         }
                     },
                     "MoveEntries": {
+                        "title": "Move entries",
+                        "description": "Change the entry order in a list asset like Data/MoviesReactions. (Using this with a non-list asset will cause an error, since those have no order.)",
                         "type": "array",
                         "items": {
                             "type": "object",
@@ -259,6 +260,14 @@
                             }
                         }
                     },
+                    "MapProperties": {
+                        "title": "Map properties",
+                        "description": "The map properties (not tile properties) to add, replace, or delete. To add an property, just specify a key that doesn't exist; to delete an entry, set the value to null (like \"some key\": null). This field supports tokens in property keys and values.",
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "string"
+                        }
+                    },
                     "When": {
                         "title": "When",
                         "description": "Only apply the patch if the given conditions match.",
@@ -267,6 +276,9 @@
                 },
                 "allOf": [
                     {
+                        "required": [ "Action" ]
+                    },
+                    {
                         "if": {
                             "properties": {
                                 "Action": { "const": "Load" }
@@ -300,7 +312,7 @@
                         },
                         "then": {
                             "propertyNames": {
-                                "enum": [ "Action", "Target", "LogName", "Enabled", "When", "Fields", "Entries", "MoveEntries" ]
+                                "enum": [ "Action", "Target", "LogName", "Enabled", "When", "FromFile", "Fields", "Entries", "MoveEntries" ]
                             }
                         }
                     },
@@ -313,7 +325,7 @@
                         "then": {
                             "properties": {
                                 "FromFile": {
-                                    "description": "The relative path to the map in your content pack folder from which to copy (like assets/town.tbin). This can be a .tbin or .xnb file. This field supports tokens and capitalization doesn't matter.\nContent Patcher will handle tilesheets referenced by the FromFile map for you if it's a .tbin file:\n - If a tilesheet isn't referenced by the target map, Content Patcher will add it for you (with a z_ ID prefix to avoid conflicts with hardcoded game logic). If the source map has a custom version of a tilesheet that's already referenced, it'll be added as a separate tilesheet only used by your tiles.\n - If you include the tilesheet file in your mod folder, Content Patcher will use that one automatically; otherwise it will be loaded from the game's Content/Maps folder."
+                                    "description": "The relative path to the map in your content pack folder from which to copy (like assets/town.tbin). This can be a .tbin or .xnb file. This field supports tokens and capitalization doesn't matter.\nContent Patcher will handle tilesheets referenced by the FromFile map for you:\n - If a tilesheet isn't referenced by the target map, Content Patcher will add it for you (with a z_ ID prefix to avoid conflicts with hardcoded game logic). If the source map has a custom version of a tilesheet that's already referenced, it'll be added as a separate tilesheet only used by your tiles.\n - If you include the tilesheet file in your mod folder, Content Patcher will use that one automatically; otherwise it will be loaded from the game's Content/Maps folder."
                                 },
                                 "FromArea": {
                                     "description": "The part of the source map to copy. Defaults to the whole source map."
@@ -323,9 +335,8 @@
                                 }
                             },
                             "propertyNames": {
-                                "enum": [ "Action", "Target", "LogName", "Enabled", "When", "FromFile", "FromArea", "ToArea" ]
-                            },
-                            "required": [ "FromFile", "ToArea" ]
+                                "enum": [ "Action", "Target", "LogName", "Enabled", "When", "FromFile", "FromArea", "ToArea", "MapProperties" ]
+                            }
                         }
                     }
                 ],
@@ -355,26 +366,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
                 }
             },