summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-08-03 22:35:51 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-08-03 22:35:51 -0400
commite54a5d05692f2f5ae852dbd3ed0a247920591418 (patch)
tree17592dda8111d5c091f2422c027b96c2ffd6d0c7
parent8da88b8fe5b41739c5cd0df3280b9770fc7f10a4 (diff)
downloadSMAPI-e54a5d05692f2f5ae852dbd3ed0a247920591418.tar.gz
SMAPI-e54a5d05692f2f5ae852dbd3ed0a247920591418.tar.bz2
SMAPI-e54a5d05692f2f5ae852dbd3ed0a247920591418.zip
update Content Patcher schema for 1.16
-rw-r--r--docs/release-notes.md4
-rw-r--r--src/SMAPI.Web/wwwroot/schemas/content-patcher.json85
2 files changed, 74 insertions, 15 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md
index c6123bac..c139ac1a 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -7,6 +7,10 @@
* Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info).
-->
+## Upcoming release
+* For the web UI:
+ * Updated the JSON validator/schema for Content Patcher 1.16.
+
## 3.6.2
Released 02 August 2020 for Stardew Valley 1.4.1 or later.
diff --git a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
index 6e8a4e52..f2c06825 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.15.0",
+ "const": "1.16.0",
"@errorMessages": {
- "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.15.0'."
+ "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.16.0'."
}
},
"ConfigSchema": {
@@ -102,7 +102,7 @@
"title": "Action",
"description": "The kind of change to make.",
"type": "string",
- "enum": [ "Load", "EditImage", "EditData", "EditMap" ]
+ "enum": [ "Load", "EditImage", "EditData", "EditMap", "Include" ]
},
"Target": {
"title": "Target asset",
@@ -327,9 +327,16 @@
}
},
"then": {
- "required": [ "FromFile" ],
+ "required": [ "FromFile", "Target" ],
"propertyNames": {
- "enum": [ "Action", "Target", "LogName", "Enabled", "When", "FromFile" ]
+ "enum": [
+ "Action",
+ "Enabled",
+ "FromFile",
+ "LogName",
+ "Target",
+ "When"
+ ]
}
}
},
@@ -340,9 +347,20 @@
}
},
"then": {
- "required": [ "FromFile" ],
+ "required": [ "FromFile", "Target" ],
"propertyNames": {
- "enum": [ "Action", "Target", "LogName", "Enabled", "When", "FromFile", "FromArea", "ToArea", "PatchMode" ]
+ "enum": [
+ "Action",
+ "Enabled",
+ "FromFile",
+ "LogName",
+ "Target",
+ "When",
+
+ "FromArea",
+ "PatchMode",
+ "ToArea"
+ ]
}
}
},
@@ -354,7 +372,18 @@
},
"then": {
"propertyNames": {
- "enum": [ "Action", "Target", "LogName", "Enabled", "When", "FromFile", "Fields", "Entries", "MoveEntries" ]
+ "enum": [
+ "Action",
+ "Enabled",
+ "FromFile",
+ "LogName",
+ "Target",
+ "When",
+
+ "Entries",
+ "Fields",
+ "MoveEntries"
+ ]
}
}
},
@@ -377,16 +406,42 @@
}
},
"propertyNames": {
- "enum": [ "Action", "Target", "LogName", "Enabled", "When", "FromFile", "FromArea", "ToArea", "MapProperties", "MapTiles" ]
+ "enum": [
+ "Action",
+ "Enabled",
+ "FromFile",
+ "LogName",
+ "Target",
+ "When",
+
+ "FromArea",
+ "MapProperties",
+ "MapTiles",
+ "ToArea"
+ ]
+ }
+ }
+ },
+ {
+ "if": {
+ "properties": {
+ "Action": { "const": "Include" }
+ }
+ },
+ "then": {
+ "required": [ "FromFile" ],
+ "propertyNames": {
+ "enum": [
+ "Action",
+ "Enabled",
+ "FromFile",
+ "LogName",
+ "When"
+ ]
}
}
}
- ],
-
- "required": [ "Action", "Target" ],
- "@errorMessages": {
- "allOf": "$transparent"
- }
+ ]
}
},
"$schema": {