From e2d102b8bbedc8bf256dac6212ec07ca7032b4a3 Mon Sep 17 00:00:00 2001
From: "Lyra [he/him]" <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 10 Sep 2023 10:04:22 +0100
Subject: [PATCH 01/12] Restrict item Properties

---
 schema-template/items-base.json    | 22 +++-------
 schema-template/items.json         | 22 +++-------
 schema-template/magicvariants.json | 65 ++++++++++++------------------
 3 files changed, 38 insertions(+), 71 deletions(-)

diff --git a/schema-template/items-base.json b/schema-template/items-base.json
index f37e59a..4df9bb5 100644
--- a/schema-template/items-base.json
+++ b/schema-template/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -264,6 +264,10 @@
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
 				"$$ifBrew": {
+					"homebrew": {
+						"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"type": "object"
+					},
 					"currencyConversion": {
 						"description": "ID of a value conversion table. Homebrew only.",
 						"type": "string"
@@ -356,21 +360,7 @@
 				"hasFluff": {"type": "boolean"},
 				"hasFluffImages": {"type": "boolean"}
 			},
-			"$$if": {
-				"modes": ["site", "ua"],
-				"value": {
-					"additionalProperties": false
-				}
-			},
-			"$$ifBrew": {
-				"additionalProperties": {
-					"type": [
-						"boolean",
-						"integer",
-						"string"
-					]
-				}
-			}
+			"additionalProperties": false
 		},
 
 		"baseitem": {
diff --git a/schema-template/items.json b/schema-template/items.json
index 550a38a..1afbdd9 100644
--- a/schema-template/items.json
+++ b/schema-template/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -468,6 +468,10 @@
 				},
 
 				"$$ifBrew": {
+					"homebrew": {
+						"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"type": "object"
+					},
 					"acSpecial": {
 						"description": "Free text field for homebrew use.",
 						"type": "string"
@@ -494,21 +498,7 @@
 					}
 				}
 			},
-			"$$if": {
-				"modes": ["site", "ua"],
-				"value": {
-					"additionalProperties": false
-				}
-			},
-			"$$ifBrew": {
-				"additionalProperties": {
-					"type": [
-						"boolean",
-						"integer",
-						"string"
-					]
-				}
-			}
+			"additionalProperties": false
 		},
 
 		"item": {
diff --git a/schema-template/magicvariants.json b/schema-template/magicvariants.json
index e2dfec7..5b111de 100644
--- a/schema-template/magicvariants.json
+++ b/schema-template/magicvariants.json
@@ -41,17 +41,18 @@
 								"scfType": {"$ref": "items-shared.json#/$defs/itemScfType"},
 								"net": {"type": "boolean"},
 								"weaponCategory": {"$ref": "items-shared.json#/$defs/itemWeaponCategory"},
-								"property": {"type": "string"}
-							},
-							"$$if": {
-								"modes": ["site", "ua"],
-								"value": {
-									"additionalProperties": false
+								"property": {"type": "string"},
+								"$$ifBrew": {
+									"homebrew": {
+										"description": "An unrestricted area for custom homebrew properties to be stored.",
+										"type": "object",
+										"items": {
+											"type": "boolean"
+										}
+									}
 								}
 							},
-							"$$ifBrew": {
-								"additionalProperties": {"type": "boolean"}
-							}
+							"additionalProperties": false
 						}
 					},
 					"inherits": {
@@ -220,6 +221,10 @@
 							"mastery": {"$ref": "items-shared.json#/$defs/itemMastery"},
 							"reach": {"$ref": "items-shared.json#/$defs/itemReach"},
 							"$$ifBrew": {
+								"homebrew": {
+									"description": "An unrestricted area for custom homebrew properties to be stored.",
+									"type": "object"
+								},
 								"fluff": {
 									"$ref": "items-shared.json#/$defs/fluff"
 								}
@@ -234,21 +239,7 @@
 							"source",
 							"page"
 						],
-						"$$if": {
-							"modes": ["site", "ua"],
-							"value": {
-								"additionalProperties": false
-							}
-						},
-						"$$ifBrew": {
-							"additionalProperties": {
-								"type": [
-									"boolean",
-									"integer",
-									"string"
-								]
-							}
-						}
+						"additionalProperties": false
 					},
 					"excludes": {
 						"type": "object",
@@ -282,23 +273,15 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"$$ifBrew": {
+								"homebrew": {
+									"description": "An unrestricted area for custom homebrew properties to be stored.",
+									"type": "object"
+								}
 							}
 						},
-						"$$if": {
-							"modes": ["site", "ua"],
-							"value": {
-								"additionalProperties": false
-							}
-						},
-						"$$ifBrew": {
-							"additionalProperties": {
-								"type": [
-									"boolean",
-									"integer",
-									"string"
-								]
-							}
-						}
+						"additionalProperties": false
 					},
 					"noDisplay": {
 						"type": "boolean"
@@ -327,6 +310,10 @@
 					"hasFluff": {"type": "boolean"},
 					"hasFluffImages": {"type": "boolean"},
 					"$$ifBrew": {
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"fluff": {
 							"$ref": "items-shared.json#/$defs/fluff"
 						},

From 137aa819e85a7f1037e920b0d93b163b75a2c3e5 Mon Sep 17 00:00:00 2001
From: "Lyra [he/him]" <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 10 Sep 2023 10:05:35 +0100
Subject: [PATCH 02/12] chore(increment version)

---
 schema-template/magicvariants.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schema-template/magicvariants.json b/schema-template/magicvariants.json
index 5b111de..f0a7a3d 100644
--- a/schema-template/magicvariants.json
+++ b/schema-template/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"type": "object",
 	"properties": {
 		"magicvariant": {

From 59d1cd3666b7dd408672ea5249c4780d9daef17c Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 10 Sep 2023 09:18:16 +0000
Subject: [PATCH 03/12] chore(build)

---
 schema/brew-fast/items-base.json    | 38 +++++++++++---------------
 schema/brew-fast/items.json         | 38 +++++++++++---------------
 schema/brew-fast/magicvariants.json | 41 ++++++++++++++++-------------
 schema/brew/items-base.json         | 38 +++++++++++---------------
 schema/brew/items.json              | 38 +++++++++++---------------
 schema/brew/magicvariants.json      | 41 ++++++++++++++++-------------
 schema/site-fast/items-base.json    |  2 +-
 schema/site-fast/items.json         |  2 +-
 schema/site-fast/magicvariants.json |  2 +-
 schema/site/items-base.json         |  2 +-
 schema/site/items.json              |  2 +-
 schema/site/magicvariants.json      |  2 +-
 schema/ua-fast/items-base.json      |  2 +-
 schema/ua-fast/items.json           |  2 +-
 schema/ua-fast/magicvariants.json   |  2 +-
 schema/ua/items-base.json           |  2 +-
 schema/ua/items.json                |  2 +-
 schema/ua/magicvariants.json        |  2 +-
 18 files changed, 122 insertions(+), 136 deletions(-)

diff --git a/schema/brew-fast/items-base.json b/schema/brew-fast/items-base.json
index 738c5db..af4b149 100644
--- a/schema/brew-fast/items-base.json
+++ b/schema/brew-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -390,6 +390,10 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"homebrew": {
+					"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"type": "object"
+				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
 					"type": "string"
@@ -425,13 +429,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"baseitem": {
 			"anyOf": [
@@ -658,6 +656,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -693,13 +695,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"type",
@@ -930,6 +926,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -1031,13 +1031,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew-fast/items.json b/schema/brew-fast/items.json
index 3604685..1e4e244 100644
--- a/schema/brew-fast/items.json
+++ b/schema/brew-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -546,6 +546,10 @@
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
+				"homebrew": {
+					"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"type": "object"
+				},
 				"acSpecial": {
 					"description": "Free text field for homebrew use.",
 					"type": "string"
@@ -589,13 +593,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"item": {
 			"anyOf": [
@@ -1141,6 +1139,10 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1184,13 +1186,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"rarity",
@@ -1739,6 +1735,10 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1848,13 +1848,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew-fast/magicvariants.json b/schema/brew-fast/magicvariants.json
index 870f2e0..18152a1 100644
--- a/schema/brew-fast/magicvariants.json
+++ b/schema/brew-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -69,11 +69,16 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"homebrew": {
+									"description": "An unrestricted area for custom homebrew properties to be stored.",
+									"type": "object",
+									"items": {
+										"type": "boolean"
+									}
 								}
 							},
-							"additionalProperties": {
-								"type": "boolean"
-							}
+							"additionalProperties": false
 						}
 					},
 					"inherits": {
@@ -266,6 +271,10 @@
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 							},
+							"homebrew": {
+								"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"type": "object"
+							},
 							"fluff": {
 								"$ref": "items-shared.json#/$defs/fluff"
 							}
@@ -275,13 +284,7 @@
 							"source",
 							"page"
 						],
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"excludes": {
 						"type": "object",
@@ -317,15 +320,13 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"homebrew": {
+								"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"type": "object"
 							}
 						},
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"noDisplay": {
 						"type": "boolean"
@@ -360,6 +361,10 @@
 					"hasFluffImages": {
 						"type": "boolean"
 					},
+					"homebrew": {
+						"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"type": "object"
+					},
 					"fluff": {
 						"$ref": "items-shared.json#/$defs/fluff"
 					},
diff --git a/schema/brew/items-base.json b/schema/brew/items-base.json
index 738c5db..af4b149 100644
--- a/schema/brew/items-base.json
+++ b/schema/brew/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -390,6 +390,10 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"homebrew": {
+					"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"type": "object"
+				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
 					"type": "string"
@@ -425,13 +429,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"baseitem": {
 			"anyOf": [
@@ -658,6 +656,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -693,13 +695,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"type",
@@ -930,6 +926,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -1031,13 +1031,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew/items.json b/schema/brew/items.json
index 3604685..1e4e244 100644
--- a/schema/brew/items.json
+++ b/schema/brew/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -546,6 +546,10 @@
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
+				"homebrew": {
+					"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"type": "object"
+				},
 				"acSpecial": {
 					"description": "Free text field for homebrew use.",
 					"type": "string"
@@ -589,13 +593,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"item": {
 			"anyOf": [
@@ -1141,6 +1139,10 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1184,13 +1186,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"rarity",
@@ -1739,6 +1735,10 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"homebrew": {
+							"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"type": "object"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1848,13 +1848,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew/magicvariants.json b/schema/brew/magicvariants.json
index 870f2e0..18152a1 100644
--- a/schema/brew/magicvariants.json
+++ b/schema/brew/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -69,11 +69,16 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"homebrew": {
+									"description": "An unrestricted area for custom homebrew properties to be stored.",
+									"type": "object",
+									"items": {
+										"type": "boolean"
+									}
 								}
 							},
-							"additionalProperties": {
-								"type": "boolean"
-							}
+							"additionalProperties": false
 						}
 					},
 					"inherits": {
@@ -266,6 +271,10 @@
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 							},
+							"homebrew": {
+								"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"type": "object"
+							},
 							"fluff": {
 								"$ref": "items-shared.json#/$defs/fluff"
 							}
@@ -275,13 +284,7 @@
 							"source",
 							"page"
 						],
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"excludes": {
 						"type": "object",
@@ -317,15 +320,13 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"homebrew": {
+								"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"type": "object"
 							}
 						},
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"noDisplay": {
 						"type": "boolean"
@@ -360,6 +361,10 @@
 					"hasFluffImages": {
 						"type": "boolean"
 					},
+					"homebrew": {
+						"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"type": "object"
+					},
 					"fluff": {
 						"$ref": "items-shared.json#/$defs/fluff"
 					},
diff --git a/schema/site-fast/items-base.json b/schema/site-fast/items-base.json
index e8d4fdb..cfe6ca2 100644
--- a/schema/site-fast/items-base.json
+++ b/schema/site-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
diff --git a/schema/site-fast/items.json b/schema/site-fast/items.json
index 87ce2fd..d69195c 100644
--- a/schema/site-fast/items.json
+++ b/schema/site-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/site-fast/magicvariants.json b/schema/site-fast/magicvariants.json
index 1a2d9bf..c20e4a4 100644
--- a/schema/site-fast/magicvariants.json
+++ b/schema/site-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
diff --git a/schema/site/items-base.json b/schema/site/items-base.json
index e8d4fdb..cfe6ca2 100644
--- a/schema/site/items-base.json
+++ b/schema/site/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
diff --git a/schema/site/items.json b/schema/site/items.json
index 87ce2fd..d69195c 100644
--- a/schema/site/items.json
+++ b/schema/site/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/site/magicvariants.json b/schema/site/magicvariants.json
index 1a2d9bf..c20e4a4 100644
--- a/schema/site/magicvariants.json
+++ b/schema/site/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
diff --git a/schema/ua-fast/items-base.json b/schema/ua-fast/items-base.json
index e8d4fdb..cfe6ca2 100644
--- a/schema/ua-fast/items-base.json
+++ b/schema/ua-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
diff --git a/schema/ua-fast/items.json b/schema/ua-fast/items.json
index 87ce2fd..d69195c 100644
--- a/schema/ua-fast/items.json
+++ b/schema/ua-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/ua-fast/magicvariants.json b/schema/ua-fast/magicvariants.json
index 1a2d9bf..c20e4a4 100644
--- a/schema/ua-fast/magicvariants.json
+++ b/schema/ua-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
diff --git a/schema/ua/items-base.json b/schema/ua/items-base.json
index e8d4fdb..cfe6ca2 100644
--- a/schema/ua/items-base.json
+++ b/schema/ua/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
diff --git a/schema/ua/items.json b/schema/ua/items.json
index 87ce2fd..d69195c 100644
--- a/schema/ua/items.json
+++ b/schema/ua/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/ua/magicvariants.json b/schema/ua/magicvariants.json
index 1a2d9bf..c20e4a4 100644
--- a/schema/ua/magicvariants.json
+++ b/schema/ua/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.5",
 	"type": "object",
 	"properties": {
 		"magicvariant": {

From a5173e5e94c8eca25d155500aa765b3985c57643 Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 10 Sep 2023 11:20:21 +0000
Subject: [PATCH 04/12] homebrew > customProperties

---
 schema-template/items-base.json    |  4 ++--
 schema-template/items.json         |  4 ++--
 schema-template/magicvariants.json | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/schema-template/items-base.json b/schema-template/items-base.json
index 4df9bb5..8cf7120 100644
--- a/schema-template/items-base.json
+++ b/schema-template/items-base.json
@@ -264,8 +264,8 @@
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
 				"$$ifBrew": {
-					"homebrew": {
-						"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"customProperties": {
+						"description": "An unrestricted area for custom properties to be stored.",
 						"type": "object"
 					},
 					"currencyConversion": {
diff --git a/schema-template/items.json b/schema-template/items.json
index 1afbdd9..c0f22cf 100644
--- a/schema-template/items.json
+++ b/schema-template/items.json
@@ -468,8 +468,8 @@
 				},
 
 				"$$ifBrew": {
-					"homebrew": {
-						"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"customProperties": {
+						"description": "An unrestricted area for custom properties to be stored.",
 						"type": "object"
 					},
 					"acSpecial": {
diff --git a/schema-template/magicvariants.json b/schema-template/magicvariants.json
index f0a7a3d..bfea084 100644
--- a/schema-template/magicvariants.json
+++ b/schema-template/magicvariants.json
@@ -43,8 +43,8 @@
 								"weaponCategory": {"$ref": "items-shared.json#/$defs/itemWeaponCategory"},
 								"property": {"type": "string"},
 								"$$ifBrew": {
-									"homebrew": {
-										"description": "An unrestricted area for custom homebrew properties to be stored.",
+									"customProperties": {
+										"description": "An unrestricted area for custom properties to be stored.",
 										"type": "object",
 										"items": {
 											"type": "boolean"
@@ -221,8 +221,8 @@
 							"mastery": {"$ref": "items-shared.json#/$defs/itemMastery"},
 							"reach": {"$ref": "items-shared.json#/$defs/itemReach"},
 							"$$ifBrew": {
-								"homebrew": {
-									"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"customProperties": {
+									"description": "An unrestricted area for custom properties to be stored.",
 									"type": "object"
 								},
 								"fluff": {
@@ -275,8 +275,8 @@
 								"type": "boolean"
 							},
 							"$$ifBrew": {
-								"homebrew": {
-									"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"customProperties": {
+									"description": "An unrestricted area for custom properties to be stored.",
 									"type": "object"
 								}
 							}
@@ -310,8 +310,8 @@
 					"hasFluff": {"type": "boolean"},
 					"hasFluffImages": {"type": "boolean"},
 					"$$ifBrew": {
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"fluff": {

From a38fd04424b1e89aae73077e0577408cd2a6f31c Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 10 Sep 2023 11:20:43 +0000
Subject: [PATCH 05/12] chore(build)

---
 schema/brew-fast/items-base.json    | 12 ++++++------
 schema/brew-fast/items.json         | 12 ++++++------
 schema/brew-fast/magicvariants.json | 16 ++++++++--------
 schema/brew/items-base.json         | 12 ++++++------
 schema/brew/items.json              | 12 ++++++------
 schema/brew/magicvariants.json      | 16 ++++++++--------
 6 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/schema/brew-fast/items-base.json b/schema/brew-fast/items-base.json
index af4b149..b865b22 100644
--- a/schema/brew-fast/items-base.json
+++ b/schema/brew-fast/items-base.json
@@ -390,8 +390,8 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
-				"homebrew": {
-					"description": "An unrestricted area for custom homebrew properties to be stored.",
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
 					"type": "object"
 				},
 				"currencyConversion": {
@@ -656,8 +656,8 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"currencyConversion": {
@@ -926,8 +926,8 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"currencyConversion": {
diff --git a/schema/brew-fast/items.json b/schema/brew-fast/items.json
index 1e4e244..d9980c7 100644
--- a/schema/brew-fast/items.json
+++ b/schema/brew-fast/items.json
@@ -546,8 +546,8 @@
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
-				"homebrew": {
-					"description": "An unrestricted area for custom homebrew properties to be stored.",
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
 					"type": "object"
 				},
 				"acSpecial": {
@@ -1139,8 +1139,8 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"acSpecial": {
@@ -1735,8 +1735,8 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"acSpecial": {
diff --git a/schema/brew-fast/magicvariants.json b/schema/brew-fast/magicvariants.json
index 18152a1..d6060ca 100644
--- a/schema/brew-fast/magicvariants.json
+++ b/schema/brew-fast/magicvariants.json
@@ -70,8 +70,8 @@
 								"property": {
 									"type": "string"
 								},
-								"homebrew": {
-									"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"customProperties": {
+									"description": "An unrestricted area for custom properties to be stored.",
 									"type": "object",
 									"items": {
 										"type": "boolean"
@@ -271,8 +271,8 @@
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 							},
-							"homebrew": {
-								"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
 								"type": "object"
 							},
 							"fluff": {
@@ -321,8 +321,8 @@
 							"net": {
 								"type": "boolean"
 							},
-							"homebrew": {
-								"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
 								"type": "object"
 							}
 						},
@@ -361,8 +361,8 @@
 					"hasFluffImages": {
 						"type": "boolean"
 					},
-					"homebrew": {
-						"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"customProperties": {
+						"description": "An unrestricted area for custom properties to be stored.",
 						"type": "object"
 					},
 					"fluff": {
diff --git a/schema/brew/items-base.json b/schema/brew/items-base.json
index af4b149..b865b22 100644
--- a/schema/brew/items-base.json
+++ b/schema/brew/items-base.json
@@ -390,8 +390,8 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
-				"homebrew": {
-					"description": "An unrestricted area for custom homebrew properties to be stored.",
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
 					"type": "object"
 				},
 				"currencyConversion": {
@@ -656,8 +656,8 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"currencyConversion": {
@@ -926,8 +926,8 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"currencyConversion": {
diff --git a/schema/brew/items.json b/schema/brew/items.json
index 1e4e244..d9980c7 100644
--- a/schema/brew/items.json
+++ b/schema/brew/items.json
@@ -546,8 +546,8 @@
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
-				"homebrew": {
-					"description": "An unrestricted area for custom homebrew properties to be stored.",
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
 					"type": "object"
 				},
 				"acSpecial": {
@@ -1139,8 +1139,8 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"acSpecial": {
@@ -1735,8 +1735,8 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
-						"homebrew": {
-							"description": "An unrestricted area for custom homebrew properties to be stored.",
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
 						"acSpecial": {
diff --git a/schema/brew/magicvariants.json b/schema/brew/magicvariants.json
index 18152a1..d6060ca 100644
--- a/schema/brew/magicvariants.json
+++ b/schema/brew/magicvariants.json
@@ -70,8 +70,8 @@
 								"property": {
 									"type": "string"
 								},
-								"homebrew": {
-									"description": "An unrestricted area for custom homebrew properties to be stored.",
+								"customProperties": {
+									"description": "An unrestricted area for custom properties to be stored.",
 									"type": "object",
 									"items": {
 										"type": "boolean"
@@ -271,8 +271,8 @@
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 							},
-							"homebrew": {
-								"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
 								"type": "object"
 							},
 							"fluff": {
@@ -321,8 +321,8 @@
 							"net": {
 								"type": "boolean"
 							},
-							"homebrew": {
-								"description": "An unrestricted area for custom homebrew properties to be stored.",
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
 								"type": "object"
 							}
 						},
@@ -361,8 +361,8 @@
 					"hasFluffImages": {
 						"type": "boolean"
 					},
-					"homebrew": {
-						"description": "An unrestricted area for custom homebrew properties to be stored.",
+					"customProperties": {
+						"description": "An unrestricted area for custom properties to be stored.",
 						"type": "object"
 					},
 					"fluff": {

From 02d5c071cf91c9e957b750bcf26820fd8a865961 Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:57:28 +0000
Subject: [PATCH 06/12] fix(customProperties): Enable for both brew and ua

---
 schema-template/items-base.json    | 13 +++++---
 schema-template/items.json         | 13 +++++---
 schema-template/magicvariants.json | 52 +++++++++++++++++++-----------
 3 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/schema-template/items-base.json b/schema-template/items-base.json
index 8cf7120..183a395 100644
--- a/schema-template/items-base.json
+++ b/schema-template/items-base.json
@@ -263,11 +263,16 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"$$if": {
+					"modes": ["brew", "ua"],
+					"value": {
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
+						}
+					}
+				},
 				"$$ifBrew": {
-					"customProperties": {
-						"description": "An unrestricted area for custom properties to be stored.",
-						"type": "object"
-					},
 					"currencyConversion": {
 						"description": "ID of a value conversion table. Homebrew only.",
 						"type": "string"
diff --git a/schema-template/items.json b/schema-template/items.json
index c0f22cf..cfde8ab 100644
--- a/schema-template/items.json
+++ b/schema-template/items.json
@@ -467,11 +467,16 @@
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
 
+				"$$if": {
+					"modes": ["brew", "ua"],
+					"value": {
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
+						}
+					}
+				},
 				"$$ifBrew": {
-					"customProperties": {
-						"description": "An unrestricted area for custom properties to be stored.",
-						"type": "object"
-					},
 					"acSpecial": {
 						"description": "Free text field for homebrew use.",
 						"type": "string"
diff --git a/schema-template/magicvariants.json b/schema-template/magicvariants.json
index bfea084..b94cada 100644
--- a/schema-template/magicvariants.json
+++ b/schema-template/magicvariants.json
@@ -42,12 +42,15 @@
 								"net": {"type": "boolean"},
 								"weaponCategory": {"$ref": "items-shared.json#/$defs/itemWeaponCategory"},
 								"property": {"type": "string"},
-								"$$ifBrew": {
-									"customProperties": {
-										"description": "An unrestricted area for custom properties to be stored.",
-										"type": "object",
-										"items": {
-											"type": "boolean"
+								"$$if": {
+									"modes": ["brew", "ua"],
+									"value": {
+										"customProperties": {
+											"description": "An unrestricted area for custom properties to be stored.",
+											"type": "object",
+											"items": {
+												"type": "boolean"
+											}
 										}
 									}
 								}
@@ -220,11 +223,16 @@
 							},
 							"mastery": {"$ref": "items-shared.json#/$defs/itemMastery"},
 							"reach": {"$ref": "items-shared.json#/$defs/itemReach"},
+							"$$if": {
+								"modes": ["brew", "ua"],
+								"value": {
+									"customProperties": {
+										"description": "An unrestricted area for custom properties to be stored.",
+										"type": "object"
+									}
+								}
+							},
 							"$$ifBrew": {
-								"customProperties": {
-									"description": "An unrestricted area for custom properties to be stored.",
-									"type": "object"
-								},
 								"fluff": {
 									"$ref": "items-shared.json#/$defs/fluff"
 								}
@@ -274,10 +282,13 @@
 							"net": {
 								"type": "boolean"
 							},
-							"$$ifBrew": {
-								"customProperties": {
-									"description": "An unrestricted area for custom properties to be stored.",
-									"type": "object"
+							"$$if": {
+								"modes": ["brew", "ua"],
+								"value": {
+									"customProperties": {
+										"description": "An unrestricted area for custom properties to be stored.",
+										"type": "object"
+									}
 								}
 							}
 						},
@@ -309,11 +320,16 @@
 					},
 					"hasFluff": {"type": "boolean"},
 					"hasFluffImages": {"type": "boolean"},
+					"$$if": {
+						"modes": ["brew", "ua"],
+						"value": {
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
+							}
+						}
+					},
 					"$$ifBrew": {
-						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
-						},
 						"fluff": {
 							"$ref": "items-shared.json#/$defs/fluff"
 						},

From abc952d4143e5db0a9abf29352f10d6a282cddcd Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:58:57 +0000
Subject: [PATCH 07/12] chore(build)

---
 schema/ua-fast/items-base.json    | 12 ++++++++++++
 schema/ua-fast/items.json         | 12 ++++++++++++
 schema/ua-fast/magicvariants.json | 19 +++++++++++++++++++
 schema/ua/items-base.json         | 12 ++++++++++++
 schema/ua/items.json              | 12 ++++++++++++
 schema/ua/magicvariants.json      | 19 +++++++++++++++++++
 6 files changed, 86 insertions(+)

diff --git a/schema/ua-fast/items-base.json b/schema/ua-fast/items-base.json
index cfe6ca2..e9b8ade 100644
--- a/schema/ua-fast/items-base.json
+++ b/schema/ua-fast/items-base.json
@@ -394,6 +394,10 @@
 				},
 				"hasFluffImages": {
 					"type": "boolean"
+				},
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
+					"type": "object"
 				}
 			},
 			"additionalProperties": false
@@ -622,6 +626,10 @@
 						},
 						"hasFluffImages": {
 							"type": "boolean"
+						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
 						}
 					},
 					"additionalProperties": false,
@@ -855,6 +863,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua-fast/items.json b/schema/ua-fast/items.json
index d69195c..5c5fd20 100644
--- a/schema/ua-fast/items.json
+++ b/schema/ua-fast/items.json
@@ -545,6 +545,10 @@
 				"hasRefs": {
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+				},
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
+					"type": "object"
 				}
 			},
 			"additionalProperties": false
@@ -1092,6 +1096,10 @@
 						"hasRefs": {
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
 						}
 					},
 					"additionalProperties": false,
@@ -1643,6 +1651,10 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua-fast/magicvariants.json b/schema/ua-fast/magicvariants.json
index c20e4a4..c85792e 100644
--- a/schema/ua-fast/magicvariants.json
+++ b/schema/ua-fast/magicvariants.json
@@ -69,6 +69,13 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"customProperties": {
+									"description": "An unrestricted area for custom properties to be stored.",
+									"type": "object",
+									"items": {
+										"type": "boolean"
+									}
 								}
 							},
 							"additionalProperties": false
@@ -263,6 +270,10 @@
 							"hasRefs": {
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
 							}
 						},
 						"required": [
@@ -306,6 +317,10 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
 							}
 						},
 						"additionalProperties": false
@@ -342,6 +357,10 @@
 					},
 					"hasFluffImages": {
 						"type": "boolean"
+					},
+					"customProperties": {
+						"description": "An unrestricted area for custom properties to be stored.",
+						"type": "object"
 					}
 				},
 				"required": [
diff --git a/schema/ua/items-base.json b/schema/ua/items-base.json
index cfe6ca2..e9b8ade 100644
--- a/schema/ua/items-base.json
+++ b/schema/ua/items-base.json
@@ -394,6 +394,10 @@
 				},
 				"hasFluffImages": {
 					"type": "boolean"
+				},
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
+					"type": "object"
 				}
 			},
 			"additionalProperties": false
@@ -622,6 +626,10 @@
 						},
 						"hasFluffImages": {
 							"type": "boolean"
+						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
 						}
 					},
 					"additionalProperties": false,
@@ -855,6 +863,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua/items.json b/schema/ua/items.json
index d69195c..5c5fd20 100644
--- a/schema/ua/items.json
+++ b/schema/ua/items.json
@@ -545,6 +545,10 @@
 				"hasRefs": {
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+				},
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
+					"type": "object"
 				}
 			},
 			"additionalProperties": false
@@ -1092,6 +1096,10 @@
 						"hasRefs": {
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
 						}
 					},
 					"additionalProperties": false,
@@ -1643,6 +1651,10 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"description": "An unrestricted area for custom properties to be stored.",
+							"type": "object"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua/magicvariants.json b/schema/ua/magicvariants.json
index c20e4a4..c85792e 100644
--- a/schema/ua/magicvariants.json
+++ b/schema/ua/magicvariants.json
@@ -69,6 +69,13 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"customProperties": {
+									"description": "An unrestricted area for custom properties to be stored.",
+									"type": "object",
+									"items": {
+										"type": "boolean"
+									}
 								}
 							},
 							"additionalProperties": false
@@ -263,6 +270,10 @@
 							"hasRefs": {
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
 							}
 						},
 						"required": [
@@ -306,6 +317,10 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
 							}
 						},
 						"additionalProperties": false
@@ -342,6 +357,10 @@
 					},
 					"hasFluffImages": {
 						"type": "boolean"
+					},
+					"customProperties": {
+						"description": "An unrestricted area for custom properties to be stored.",
+						"type": "object"
 					}
 				},
 				"required": [

From 44dd35d11fdeef1bcb986b41623e101e32f222e1 Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 17 Sep 2023 20:26:17 +0000
Subject: [PATCH 08/12] chore(perms): chmod +x to permit npm link to work

---
 bin/test-file-extensions.js | 0
 bin/test-file-locations.js  | 0
 bin/test-json-brew.js       | 0
 bin/test-json-ua.js         | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/test-file-extensions.js
 mode change 100644 => 100755 bin/test-file-locations.js
 mode change 100644 => 100755 bin/test-json-brew.js
 mode change 100644 => 100755 bin/test-json-ua.js

diff --git a/bin/test-file-extensions.js b/bin/test-file-extensions.js
old mode 100644
new mode 100755
diff --git a/bin/test-file-locations.js b/bin/test-file-locations.js
old mode 100644
new mode 100755
diff --git a/bin/test-json-brew.js b/bin/test-json-brew.js
old mode 100644
new mode 100755
diff --git a/bin/test-json-ua.js b/bin/test-json-ua.js
old mode 100644
new mode 100755

From 48c1527c46eabfb3055260194eb306326b595bd5 Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 17 Sep 2023 20:58:48 +0000
Subject: [PATCH 09/12] fix(schema): Cleanup schema, particularly items

---
 schema-template/items-base.json        | 27 ++++++++--
 schema-template/items-shared.json      | 20 +++++++-
 schema-template/items.json             |  7 +--
 schema-template/magicvariants.json     | 69 ++++++++++++++++++++------
 schema-template/makebrew-creature.json |  8 +--
 5 files changed, 102 insertions(+), 29 deletions(-)

diff --git a/schema-template/items-base.json b/schema-template/items-base.json
index 183a395..14e2a81 100644
--- a/schema-template/items-base.json
+++ b/schema-template/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.11",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -140,17 +140,26 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
 				"source": {"$ref": "util.json#/$defs/source"},
 				"page": {"$ref": "util.json#/$defs/page"},
+				"baseItem": {
+					"type": "string"
+				},
 				"ac": {
 					"type": "integer"
 				},
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -263,13 +272,21 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+
+				"charges": {
+					"type": ["string", "integer"]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
+
 				"$$if": {
 					"modes": ["brew", "ua"],
 					"value": {
-						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
-						}
+						"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
 					}
 				},
 				"$$ifBrew": {
diff --git a/schema-template/items-shared.json b/schema-template/items-shared.json
index 01e3827..625c6c2 100644
--- a/schema-template/items-shared.json
+++ b/schema-template/items-shared.json
@@ -4,7 +4,7 @@
 
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 
 	"$defs" : {
 		"_itemModifySpeedEqual": {
@@ -222,6 +222,24 @@
 			"type": "integer"
 		},
 
+		"$$if": {
+			"modes": ["brew", "ua"],
+			"value": {
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
+					"type": "object",
+					"additionalProperties": {
+						"type": [
+							"boolean",
+							"string",
+							"number",
+							"integer"
+						]
+					}
+				}
+			}
+		},
+
 		"$$ifBrew": {
 			"fluff": {
 				"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source.",
diff --git a/schema-template/items.json b/schema-template/items.json
index cfde8ab..a836c1e 100644
--- a/schema-template/items.json
+++ b/schema-template/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -470,10 +470,7 @@
 				"$$if": {
 					"modes": ["brew", "ua"],
 					"value": {
-						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
-						}
+						"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
 					}
 				},
 				"$$ifBrew": {
diff --git a/schema-template/magicvariants.json b/schema-template/magicvariants.json
index b94cada..21ac4ba 100644
--- a/schema-template/magicvariants.json
+++ b/schema-template/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -34,6 +34,12 @@
 								"crossbow": {"type": "boolean"},
 								"sword": {"type": "boolean"},
 								"weapon": {"type": "boolean"},
+								"firearm": {"type": "boolean"},
+								"mace": {"type": "boolean"},
+								"spear": {"type": "boolean"},
+								"hammer": {"type": "boolean"},
+								"club": {"type": "boolean"},
+								"dagger": {"type": "boolean"},
 								"dmgType": {"$ref": "util.json#/$defs/dataDamageTags"},
 								"name": {"type": "string"},
 								"source": {"$ref": "util.json#/$defs/source"},
@@ -46,10 +52,12 @@
 									"modes": ["brew", "ua"],
 									"value": {
 										"customProperties": {
-											"description": "An unrestricted area for custom properties to be stored.",
+											"description": "A more restrictive area for custom boolean-only properties to be stored.",
 											"type": "object",
-											"items": {
-												"type": "boolean"
+											"additionalProperties": {
+												"type": [
+													"boolean"
+												]
 											}
 										}
 									}
@@ -77,6 +85,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -101,6 +115,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -121,6 +145,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": ["string", "boolean"]
 							},
@@ -205,6 +232,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -233,6 +263,10 @@
 								}
 							},
 							"$$ifBrew": {
+								"currencyConversion": {
+									"description": "ID of a value conversion table. Homebrew only.",
+									"type": "string"
+								},
 								"fluff": {
 									"$ref": "items-shared.json#/$defs/fluff"
 								}
@@ -279,16 +313,23 @@
 									}
 								]
 							},
-							"net": {
-								"type": "boolean"
-							},
+							"net": {"type": "boolean"},
+							"armor": {"type": "boolean"},
+							"axe": {"type": "boolean"},
+							"bow": {"type": "boolean"},
+							"crossbow": {"type": "boolean"},
+							"sword": {"type": "boolean"},
+							"weapon": {"type": "boolean"},
+							"firearm": {"type": "boolean"},
+							"mace": {"type": "boolean"},
+							"spear": {"type": "boolean"},
+							"hammer": {"type": "boolean"},
+							"club": {"type": "boolean"},
+							"dagger": {"type": "boolean"},
 							"$$if": {
 								"modes": ["brew", "ua"],
 								"value": {
-									"customProperties": {
-										"description": "An unrestricted area for custom properties to be stored.",
-										"type": "object"
-									}
+									"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
 								}
 							}
 						},
@@ -307,6 +348,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -323,10 +365,7 @@
 					"$$if": {
 						"modes": ["brew", "ua"],
 						"value": {
-							"customProperties": {
-								"description": "An unrestricted area for custom properties to be stored.",
-								"type": "object"
-							}
+							"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
 						}
 					},
 					"$$ifBrew": {
diff --git a/schema-template/makebrew-creature.json b/schema-template/makebrew-creature.json
index 2e96683..9ff90ff 100644
--- a/schema-template/makebrew-creature.json
+++ b/schema-template/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -30,7 +30,8 @@
 					"name",
 					{"$$ifBrew_item": "source"},
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -56,7 +57,8 @@
 					"name",
 					{"$$ifBrew_item": "source"},
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},

From c87cc16ac791ae788b268d00528e3cd8fc643ac1 Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Sun, 17 Sep 2023 20:59:37 +0000
Subject: [PATCH 10/12] chore(build)

---
 schema/brew-fast/items-base.json        | 74 +++++++++++++++++--
 schema/brew-fast/items-shared.json      | 14 +++-
 schema/brew-fast/items.json             | 11 +--
 schema/brew-fast/magicvariants.json     | 97 +++++++++++++++++++++++--
 schema/brew-fast/makebrew-creature.json |  8 +-
 schema/brew/items-base.json             | 74 +++++++++++++++++--
 schema/brew/items-shared.json           | 14 +++-
 schema/brew/items.json                  | 11 +--
 schema/brew/magicvariants.json          | 97 +++++++++++++++++++++++--
 schema/brew/makebrew-creature.json      |  8 +-
 schema/site-fast/items-base.json        | 65 ++++++++++++++++-
 schema/site-fast/items-shared.json      |  2 +-
 schema/site-fast/items.json             |  2 +-
 schema/site-fast/magicvariants.json     | 79 +++++++++++++++++++-
 schema/site-fast/makebrew-creature.json |  8 +-
 schema/site/items-base.json             | 65 ++++++++++++++++-
 schema/site/items-shared.json           |  2 +-
 schema/site/items.json                  |  2 +-
 schema/site/magicvariants.json          | 79 +++++++++++++++++++-
 schema/site/makebrew-creature.json      |  8 +-
 schema/ua-fast/items-base.json          | 74 +++++++++++++++++--
 schema/ua-fast/items-shared.json        | 14 +++-
 schema/ua-fast/items.json               | 11 +--
 schema/ua-fast/magicvariants.json       | 93 ++++++++++++++++++++++--
 schema/ua-fast/makebrew-creature.json   |  8 +-
 schema/ua/items-base.json               | 74 +++++++++++++++++--
 schema/ua/items-shared.json             | 14 +++-
 schema/ua/items.json                    | 11 +--
 schema/ua/magicvariants.json            | 93 ++++++++++++++++++++++--
 schema/ua/makebrew-creature.json        |  8 +-
 30 files changed, 1002 insertions(+), 118 deletions(-)

diff --git a/schema/brew-fast/items-base.json b/schema/brew-fast/items-base.json
index b865b22..8986017 100644
--- a/schema/brew-fast/items-base.json
+++ b/schema/brew-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.11",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -176,6 +176,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -185,12 +188,18 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"baseItem": {
+					"type": "string"
+				},
 				"ac": {
 					"type": "integer"
 				},
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -301,6 +310,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -391,8 +412,7 @@
 					"type": "boolean"
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
@@ -442,6 +462,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -451,12 +474,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -567,6 +596,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -657,8 +698,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
@@ -712,6 +752,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -721,12 +764,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -837,6 +886,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -927,8 +988,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
diff --git a/schema/brew-fast/items-shared.json b/schema/brew-fast/items-shared.json
index 59da9ab..0e2479a 100644
--- a/schema/brew-fast/items-shared.json
+++ b/schema/brew-fast/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -276,6 +276,18 @@
 		"itemReach": {
 			"type": "integer"
 		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
+		},
 		"fluff": {
 			"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source.",
 			"anyOf": [
diff --git a/schema/brew-fast/items.json b/schema/brew-fast/items.json
index d9980c7..ae0dc9a 100644
--- a/schema/brew-fast/items.json
+++ b/schema/brew-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -547,8 +547,7 @@
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				},
 				"acSpecial": {
 					"description": "Free text field for homebrew use.",
@@ -1140,8 +1139,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
@@ -1736,8 +1734,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
diff --git a/schema/brew-fast/magicvariants.json b/schema/brew-fast/magicvariants.json
index d6060ca..a9f327a 100644
--- a/schema/brew-fast/magicvariants.json
+++ b/schema/brew-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -71,10 +89,12 @@
 									"type": "string"
 								},
 								"customProperties": {
-									"description": "An unrestricted area for custom properties to be stored.",
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
 									"type": "object",
-									"items": {
-										"type": "boolean"
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
 									}
 								}
 							},
@@ -100,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -124,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -148,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -245,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -275,6 +317,10 @@
 								"description": "An unrestricted area for custom properties to be stored.",
 								"type": "object"
 							},
+							"currencyConversion": {
+								"description": "ID of a value conversion table. Homebrew only.",
+								"type": "string"
+							},
 							"fluff": {
 								"$ref": "items-shared.json#/$defs/fluff"
 							}
@@ -321,9 +367,44 @@
 							"net": {
 								"type": "boolean"
 							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
 							"customProperties": {
-								"description": "An unrestricted area for custom properties to be stored.",
-								"type": "object"
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
 						"additionalProperties": false
@@ -344,6 +425,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -362,8 +444,7 @@
 						"type": "boolean"
 					},
 					"customProperties": {
-						"description": "An unrestricted area for custom properties to be stored.",
-						"type": "object"
+						"$ref": "items-shared.json#/$defs/customProperties"
 					},
 					"fluff": {
 						"$ref": "items-shared.json#/$defs/fluff"
diff --git a/schema/brew-fast/makebrew-creature.json b/schema/brew-fast/makebrew-creature.json
index 681d3ac..0db638c 100644
--- a/schema/brew-fast/makebrew-creature.json
+++ b/schema/brew-fast/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -32,7 +32,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -60,7 +61,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/brew/items-base.json b/schema/brew/items-base.json
index b865b22..8986017 100644
--- a/schema/brew/items-base.json
+++ b/schema/brew/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.11",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -176,6 +176,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -185,12 +188,18 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"baseItem": {
+					"type": "string"
+				},
 				"ac": {
 					"type": "integer"
 				},
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -301,6 +310,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -391,8 +412,7 @@
 					"type": "boolean"
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
@@ -442,6 +462,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -451,12 +474,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -567,6 +596,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -657,8 +698,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
@@ -712,6 +752,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -721,12 +764,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -837,6 +886,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -927,8 +988,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
diff --git a/schema/brew/items-shared.json b/schema/brew/items-shared.json
index 59da9ab..0e2479a 100644
--- a/schema/brew/items-shared.json
+++ b/schema/brew/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -276,6 +276,18 @@
 		"itemReach": {
 			"type": "integer"
 		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
+		},
 		"fluff": {
 			"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source.",
 			"anyOf": [
diff --git a/schema/brew/items.json b/schema/brew/items.json
index d9980c7..ae0dc9a 100644
--- a/schema/brew/items.json
+++ b/schema/brew/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -547,8 +547,7 @@
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				},
 				"acSpecial": {
 					"description": "Free text field for homebrew use.",
@@ -1140,8 +1139,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
@@ -1736,8 +1734,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
diff --git a/schema/brew/magicvariants.json b/schema/brew/magicvariants.json
index d6060ca..a9f327a 100644
--- a/schema/brew/magicvariants.json
+++ b/schema/brew/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -71,10 +89,12 @@
 									"type": "string"
 								},
 								"customProperties": {
-									"description": "An unrestricted area for custom properties to be stored.",
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
 									"type": "object",
-									"items": {
-										"type": "boolean"
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
 									}
 								}
 							},
@@ -100,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -124,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -148,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -245,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -275,6 +317,10 @@
 								"description": "An unrestricted area for custom properties to be stored.",
 								"type": "object"
 							},
+							"currencyConversion": {
+								"description": "ID of a value conversion table. Homebrew only.",
+								"type": "string"
+							},
 							"fluff": {
 								"$ref": "items-shared.json#/$defs/fluff"
 							}
@@ -321,9 +367,44 @@
 							"net": {
 								"type": "boolean"
 							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
 							"customProperties": {
-								"description": "An unrestricted area for custom properties to be stored.",
-								"type": "object"
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
 						"additionalProperties": false
@@ -344,6 +425,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -362,8 +444,7 @@
 						"type": "boolean"
 					},
 					"customProperties": {
-						"description": "An unrestricted area for custom properties to be stored.",
-						"type": "object"
+						"$ref": "items-shared.json#/$defs/customProperties"
 					},
 					"fluff": {
 						"$ref": "items-shared.json#/$defs/fluff"
diff --git a/schema/brew/makebrew-creature.json b/schema/brew/makebrew-creature.json
index 681d3ac..0db638c 100644
--- a/schema/brew/makebrew-creature.json
+++ b/schema/brew/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -32,7 +32,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -60,7 +61,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/site-fast/items-base.json b/schema/site-fast/items-base.json
index cfe6ca2..488a981 100644
--- a/schema/site-fast/items-base.json
+++ b/schema/site-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.11",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -190,12 +193,18 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"baseItem": {
+					"type": "string"
+				},
 				"ac": {
 					"type": "integer"
 				},
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +315,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -409,6 +430,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -418,12 +442,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -534,6 +564,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -641,6 +683,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -650,12 +695,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -766,6 +817,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
diff --git a/schema/site-fast/items-shared.json b/schema/site-fast/items-shared.json
index 51f0992..2bf0a5e 100644
--- a/schema/site-fast/items-shared.json
+++ b/schema/site-fast/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
diff --git a/schema/site-fast/items.json b/schema/site-fast/items.json
index d69195c..5aa0ad7 100644
--- a/schema/site-fast/items.json
+++ b/schema/site-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/site-fast/magicvariants.json b/schema/site-fast/magicvariants.json
index c20e4a4..93910d5 100644
--- a/schema/site-fast/magicvariants.json
+++ b/schema/site-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -93,6 +111,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -117,6 +141,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -141,6 +175,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -238,6 +275,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -306,6 +346,42 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
 							}
 						},
 						"additionalProperties": false
@@ -326,6 +402,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
diff --git a/schema/site-fast/makebrew-creature.json b/schema/site-fast/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/site-fast/makebrew-creature.json
+++ b/schema/site-fast/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/site/items-base.json b/schema/site/items-base.json
index cfe6ca2..488a981 100644
--- a/schema/site/items-base.json
+++ b/schema/site/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.11",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -190,12 +193,18 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"baseItem": {
+					"type": "string"
+				},
 				"ac": {
 					"type": "integer"
 				},
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +315,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -409,6 +430,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -418,12 +442,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -534,6 +564,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -641,6 +683,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -650,12 +695,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -766,6 +817,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
diff --git a/schema/site/items-shared.json b/schema/site/items-shared.json
index 51f0992..2bf0a5e 100644
--- a/schema/site/items-shared.json
+++ b/schema/site/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
diff --git a/schema/site/items.json b/schema/site/items.json
index d69195c..5aa0ad7 100644
--- a/schema/site/items.json
+++ b/schema/site/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/site/magicvariants.json b/schema/site/magicvariants.json
index c20e4a4..93910d5 100644
--- a/schema/site/magicvariants.json
+++ b/schema/site/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -93,6 +111,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -117,6 +141,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -141,6 +175,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -238,6 +275,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -306,6 +346,42 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
 							}
 						},
 						"additionalProperties": false
@@ -326,6 +402,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
diff --git a/schema/site/makebrew-creature.json b/schema/site/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/site/makebrew-creature.json
+++ b/schema/site/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/ua-fast/items-base.json b/schema/ua-fast/items-base.json
index e9b8ade..1ee6810 100644
--- a/schema/ua-fast/items-base.json
+++ b/schema/ua-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.11",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -190,12 +193,18 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"baseItem": {
+					"type": "string"
+				},
 				"ac": {
 					"type": "integer"
 				},
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +315,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -396,8 +417,7 @@
 					"type": "boolean"
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -413,6 +433,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -422,12 +445,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -538,6 +567,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -628,8 +669,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -649,6 +689,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -658,12 +701,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -774,6 +823,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -864,8 +925,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"_copy": {
 							"type": "object",
diff --git a/schema/ua-fast/items-shared.json b/schema/ua-fast/items-shared.json
index 469b5e9..249c11b 100644
--- a/schema/ua-fast/items-shared.json
+++ b/schema/ua-fast/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -275,6 +275,18 @@
 		},
 		"itemReach": {
 			"type": "integer"
+		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/schema/ua-fast/items.json b/schema/ua-fast/items.json
index 5c5fd20..faebad2 100644
--- a/schema/ua-fast/items.json
+++ b/schema/ua-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -547,8 +547,7 @@
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -1098,8 +1097,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -1652,8 +1650,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"_copy": {
 							"type": "object",
diff --git a/schema/ua-fast/magicvariants.json b/schema/ua-fast/magicvariants.json
index c85792e..ee8fcd2 100644
--- a/schema/ua-fast/magicvariants.json
+++ b/schema/ua-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -71,10 +89,12 @@
 									"type": "string"
 								},
 								"customProperties": {
-									"description": "An unrestricted area for custom properties to be stored.",
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
 									"type": "object",
-									"items": {
-										"type": "boolean"
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
 									}
 								}
 							},
@@ -100,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -124,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -148,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -245,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -318,9 +360,44 @@
 							"net": {
 								"type": "boolean"
 							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
 							"customProperties": {
-								"description": "An unrestricted area for custom properties to be stored.",
-								"type": "object"
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
 						"additionalProperties": false
@@ -341,6 +418,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -359,8 +437,7 @@
 						"type": "boolean"
 					},
 					"customProperties": {
-						"description": "An unrestricted area for custom properties to be stored.",
-						"type": "object"
+						"$ref": "items-shared.json#/$defs/customProperties"
 					}
 				},
 				"required": [
diff --git a/schema/ua-fast/makebrew-creature.json b/schema/ua-fast/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/ua-fast/makebrew-creature.json
+++ b/schema/ua-fast/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/ua/items-base.json b/schema/ua/items-base.json
index e9b8ade..1ee6810 100644
--- a/schema/ua/items-base.json
+++ b/schema/ua/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.11",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -190,12 +193,18 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"baseItem": {
+					"type": "string"
+				},
 				"ac": {
 					"type": "integer"
 				},
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +315,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -396,8 +417,7 @@
 					"type": "boolean"
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -413,6 +433,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -422,12 +445,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -538,6 +567,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -628,8 +669,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -649,6 +689,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -658,12 +701,18 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
+						"baseItem": {
+							"type": "string"
+						},
 						"ac": {
 							"type": "integer"
 						},
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -774,6 +823,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -864,8 +925,7 @@
 							"type": "boolean"
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"_copy": {
 							"type": "object",
diff --git a/schema/ua/items-shared.json b/schema/ua/items-shared.json
index 469b5e9..249c11b 100644
--- a/schema/ua/items-shared.json
+++ b/schema/ua/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -275,6 +275,18 @@
 		},
 		"itemReach": {
 			"type": "integer"
+		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/schema/ua/items.json b/schema/ua/items.json
index 5c5fd20..faebad2 100644
--- a/schema/ua/items.json
+++ b/schema/ua/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.2",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -547,8 +547,7 @@
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
 				"customProperties": {
-					"description": "An unrestricted area for custom properties to be stored.",
-					"type": "object"
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -1098,8 +1097,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -1652,8 +1650,7 @@
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
 						"customProperties": {
-							"description": "An unrestricted area for custom properties to be stored.",
-							"type": "object"
+							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"_copy": {
 							"type": "object",
diff --git a/schema/ua/magicvariants.json b/schema/ua/magicvariants.json
index c85792e..ee8fcd2 100644
--- a/schema/ua/magicvariants.json
+++ b/schema/ua/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.5",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -71,10 +89,12 @@
 									"type": "string"
 								},
 								"customProperties": {
-									"description": "An unrestricted area for custom properties to be stored.",
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
 									"type": "object",
-									"items": {
-										"type": "boolean"
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
 									}
 								}
 							},
@@ -100,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -124,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -148,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -245,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -318,9 +360,44 @@
 							"net": {
 								"type": "boolean"
 							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
 							"customProperties": {
-								"description": "An unrestricted area for custom properties to be stored.",
-								"type": "object"
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
 						"additionalProperties": false
@@ -341,6 +418,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -359,8 +437,7 @@
 						"type": "boolean"
 					},
 					"customProperties": {
-						"description": "An unrestricted area for custom properties to be stored.",
-						"type": "object"
+						"$ref": "items-shared.json#/$defs/customProperties"
 					}
 				},
 				"required": [
diff --git a/schema/ua/makebrew-creature.json b/schema/ua/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/ua/makebrew-creature.json
+++ b/schema/ua/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},

From 9350571ae685bc06adeff9062bdec57ae5a9bb8f Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:09:39 +0000
Subject: [PATCH 11/12] fix(items): Remove baseItem from baseitems

---
 schema-template/items-base.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/schema-template/items-base.json b/schema-template/items-base.json
index 14e2a81..c350d05 100644
--- a/schema-template/items-base.json
+++ b/schema-template/items-base.json
@@ -148,9 +148,6 @@
 				},
 				"source": {"$ref": "util.json#/$defs/source"},
 				"page": {"$ref": "util.json#/$defs/page"},
-				"baseItem": {
-					"type": "string"
-				},
 				"ac": {
 					"type": "integer"
 				},

From c9d015383b60130897f547c4ef652428a0f721b3 Mon Sep 17 00:00:00 2001
From: Oliver Warlow <52298102+revilowaldow@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:10:10 +0000
Subject: [PATCH 12/12] chore(build)

---
 schema/brew-fast/items-base.json | 9 ---------
 schema/brew/items-base.json      | 9 ---------
 schema/site-fast/items-base.json | 9 ---------
 schema/site/items-base.json      | 9 ---------
 schema/ua-fast/items-base.json   | 9 ---------
 schema/ua/items-base.json        | 9 ---------
 6 files changed, 54 deletions(-)

diff --git a/schema/brew-fast/items-base.json b/schema/brew-fast/items-base.json
index 8986017..f2503c2 100644
--- a/schema/brew-fast/items-base.json
+++ b/schema/brew-fast/items-base.json
@@ -188,9 +188,6 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
-				"baseItem": {
-					"type": "string"
-				},
 				"ac": {
 					"type": "integer"
 				},
@@ -474,9 +471,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
@@ -764,9 +758,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
diff --git a/schema/brew/items-base.json b/schema/brew/items-base.json
index 8986017..f2503c2 100644
--- a/schema/brew/items-base.json
+++ b/schema/brew/items-base.json
@@ -188,9 +188,6 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
-				"baseItem": {
-					"type": "string"
-				},
 				"ac": {
 					"type": "integer"
 				},
@@ -474,9 +471,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
@@ -764,9 +758,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
diff --git a/schema/site-fast/items-base.json b/schema/site-fast/items-base.json
index 488a981..33f8223 100644
--- a/schema/site-fast/items-base.json
+++ b/schema/site-fast/items-base.json
@@ -193,9 +193,6 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
-				"baseItem": {
-					"type": "string"
-				},
 				"ac": {
 					"type": "integer"
 				},
@@ -442,9 +439,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
@@ -695,9 +689,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
diff --git a/schema/site/items-base.json b/schema/site/items-base.json
index 488a981..33f8223 100644
--- a/schema/site/items-base.json
+++ b/schema/site/items-base.json
@@ -193,9 +193,6 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
-				"baseItem": {
-					"type": "string"
-				},
 				"ac": {
 					"type": "integer"
 				},
@@ -442,9 +439,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
@@ -695,9 +689,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
diff --git a/schema/ua-fast/items-base.json b/schema/ua-fast/items-base.json
index 1ee6810..52417d9 100644
--- a/schema/ua-fast/items-base.json
+++ b/schema/ua-fast/items-base.json
@@ -193,9 +193,6 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
-				"baseItem": {
-					"type": "string"
-				},
 				"ac": {
 					"type": "integer"
 				},
@@ -445,9 +442,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
@@ -701,9 +695,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
diff --git a/schema/ua/items-base.json b/schema/ua/items-base.json
index 1ee6810..52417d9 100644
--- a/schema/ua/items-base.json
+++ b/schema/ua/items-base.json
@@ -193,9 +193,6 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
-				"baseItem": {
-					"type": "string"
-				},
 				"ac": {
 					"type": "integer"
 				},
@@ -445,9 +442,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},
@@ -701,9 +695,6 @@
 						"page": {
 							"$ref": "util.json#/$defs/page"
 						},
-						"baseItem": {
-							"type": "string"
-						},
 						"ac": {
 							"type": "integer"
 						},