5etools-utils 0.13.39 → 0.13.41

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "5etools-utils",
-	"version": "0.13.39",
+	"version": "0.13.41",
 	"description": "Shared utilities for the 5etools ecosystem.",
 	"type": "module",
 	"main": "lib/Api.js",

package/schema/brew/actions.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "actions.json",
-	"version": "1.2.6",
+	"version": "1.2.7",
 	"type": "object",
 	"$defs": {
 		"action": {
@@ -83,6 +83,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
 			},
 			"required": [

package/schema/brew/backgrounds.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "backgrounds.json",
-	"version": "1.3.11",
+	"version": "1.3.12",
 	"type": "object",
 	"$defs": {
 		"backgroundData": {
@@ -121,6 +121,9 @@
 				},
 				"foundryAdvancement": {
 					"$ref": "util-foundry.json#/$defs/foundryAdvancementsArray"
+				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
 			},
 			"additionalProperties": false
@@ -244,6 +247,9 @@
 						},
 						"foundryAdvancement": {
 							"$ref": "util-foundry.json#/$defs/foundryAdvancementsArray"
+						},
+						"_foundryMerge": {
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						}
 					},
 					"additionalProperties": false,
@@ -371,6 +377,9 @@
 						"foundryAdvancement": {
 							"$ref": "util-foundry.json#/$defs/foundryAdvancementsArray"
 						},
+						"_foundryMerge": {
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
+						},
 						"_copy": {
 							"$ref": "util-copy.json#/$defs/copyBlock_copy_generic"
 						}

package/schema/brew/charcreationoptions.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "charcreationoptions.json",
-	"version": "1.2.4",
+	"version": "1.2.5",
 	"title": "Character Creation Options",
 	"type": "object",
 	"$defs": {
@@ -73,6 +73,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
 			},
 			"required": [

package/schema/brew/class/foundry.json

@@ -41,29 +41,7 @@
 						"type": "integer"
 					},
 					"_merge": {
-						"type": "object",
-						"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-						"properties": {
-							"system": {
-								"const": true
-							},
-							"chooseSystem": {
-								"const": true
-							},
-							"activities": {
-								"const": true
-							},
-							"effects": {
-								"const": true
-							},
-							"flags": {
-								"const": true
-							},
-							"chooseFlags": {
-								"const": true
-							}
-						},
-						"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+						"$ref": "../util-foundry.json#/$defs/foundryMergeObject"
 					},
 					"entries": {
 						"type": "array",
@@ -157,29 +135,7 @@
 						"type": "integer"
 					},
 					"_merge": {
-						"type": "object",
-						"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-						"properties": {
-							"system": {
-								"const": true
-							},
-							"chooseSystem": {
-								"const": true
-							},
-							"activities": {
-								"const": true
-							},
-							"effects": {
-								"const": true
-							},
-							"flags": {
-								"const": true
-							},
-							"chooseFlags": {
-								"const": true
-							}
-						},
-						"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+						"$ref": "../util-foundry.json#/$defs/foundryMergeObject"
 					},
 					"shortName": {
 						"type": "string"
@@ -278,29 +234,7 @@
 						"type": "integer"
 					},
 					"_merge": {
-						"type": "object",
-						"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-						"properties": {
-							"system": {
-								"const": true
-							},
-							"chooseSystem": {
-								"const": true
-							},
-							"activities": {
-								"const": true
-							},
-							"effects": {
-								"const": true
-							},
-							"flags": {
-								"const": true
-							},
-							"chooseFlags": {
-								"const": true
-							}
-						},
-						"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+						"$ref": "../util-foundry.json#/$defs/foundryMergeObject"
 					},
 					"className": {
 						"type": "string"
@@ -398,29 +332,7 @@
 						"type": "integer"
 					},
 					"_merge": {
-						"type": "object",
-						"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-						"properties": {
-							"system": {
-								"const": true
-							},
-							"chooseSystem": {
-								"const": true
-							},
-							"activities": {
-								"const": true
-							},
-							"effects": {
-								"const": true
-							},
-							"flags": {
-								"const": true
-							},
-							"chooseFlags": {
-								"const": true
-							}
-						},
-						"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+						"$ref": "../util-foundry.json#/$defs/foundryMergeObject"
 					},
 					"className": {
 						"type": "string"

package/schema/brew/conditionsdiseases.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "conditionsdiseases.json",
-	"version": "1.2.9",
+	"version": "1.2.10",
 	"type": "object",
 	"$defs": {
 		"_conditionDiseaseBase": {
@@ -62,6 +62,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
 			},
 			"required": [
@@ -136,6 +139,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
+				},
 				"type": {
 					"type": "string",
 					"examples": [

package/schema/brew/cultsboons.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "cultsboons.json",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"type": "object",
 	"$defs": {
 		"cult": {
@@ -90,6 +90,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
 			},
 			"required": [
@@ -168,6 +171,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
 			},
 			"required": [

package/schema/brew/entry.json

@@ -1873,7 +1873,9 @@
 							}
 						},
 						"additionalProperties": false
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"mapParent": {
 					"description": "Note that the order of transformations is: scale, then offset.",

package/schema/brew/feats.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "feats.json",
-	"version": "1.7.11",
+	"version": "1.7.12",
 	"type": "object",
 	"$defs": {
 		"featData": {
@@ -146,6 +146,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
 			},
 			"additionalProperties": false
@@ -294,6 +297,9 @@
 						},
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
+						},
+						"_foundryMerge": {
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						}
 					},
 					"additionalProperties": false,
@@ -446,6 +452,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"_foundryMerge": {
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
+						},
 						"_copy": {
 							"$ref": "util-copy.json#/$defs/copyBlock_copy_generic"
 						}

package/schema/brew/foundry-backgrounds.json

@@ -49,29 +49,7 @@
 						"type": "integer"
 					},
 					"_merge": {
-						"type": "object",
-						"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-						"properties": {
-							"system": {
-								"const": true
-							},
-							"chooseSystem": {
-								"const": true
-							},
-							"activities": {
-								"const": true
-							},
-							"effects": {
-								"const": true
-							},
-							"flags": {
-								"const": true
-							},
-							"chooseFlags": {
-								"const": true
-							}
-						},
-						"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+						"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 					},
 					"backgroundName": {
 						"type": "string"

package/schema/brew/foundry-items.json

@@ -46,29 +46,7 @@
 						"type": "integer"
 					},
 					"_merge": {
-						"type": "object",
-						"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-						"properties": {
-							"system": {
-								"const": true
-							},
-							"chooseSystem": {
-								"const": true
-							},
-							"activities": {
-								"const": true
-							},
-							"effects": {
-								"const": true
-							},
-							"flags": {
-								"const": true
-							},
-							"chooseFlags": {
-								"const": true
-							}
-						},
-						"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+						"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 					},
 					"type": {
 						"type": "string",

package/schema/brew/foundry-psionics.json

@@ -52,29 +52,7 @@
 						"type": "integer"
 					},
 					"_merge": {
-						"type": "object",
-						"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-						"properties": {
-							"system": {
-								"const": true
-							},
-							"chooseSystem": {
-								"const": true
-							},
-							"activities": {
-								"const": true
-							},
-							"effects": {
-								"const": true
-							},
-							"flags": {
-								"const": true
-							},
-							"chooseFlags": {
-								"const": true
-							}
-						},
-						"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+						"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 					},
 					"psionicName": {
 						"type": "string"

package/schema/brew/foundry-races.json

@@ -39,29 +39,7 @@
 					"type": "integer"
 				},
 				"_merge": {
-					"type": "object",
-					"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-					"properties": {
-						"system": {
-							"const": true
-						},
-						"chooseSystem": {
-							"const": true
-						},
-						"activities": {
-							"const": true
-						},
-						"effects": {
-							"const": true
-						},
-						"flags": {
-							"const": true
-						},
-						"chooseFlags": {
-							"const": true
-						}
-					},
-					"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
 				"entryData": {
 					"$ref": "util-foundry.json#/$defs/entryDataObject"
@@ -112,29 +90,7 @@
 							"type": "integer"
 						},
 						"_merge": {
-							"type": "object",
-							"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-							"properties": {
-								"system": {
-									"const": true
-								},
-								"chooseSystem": {
-									"const": true
-								},
-								"activities": {
-									"const": true
-								},
-								"effects": {
-									"const": true
-								},
-								"flags": {
-									"const": true
-								},
-								"chooseFlags": {
-									"const": true
-								}
-							},
-							"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},
 						"entryData": {
 							"$ref": "util-foundry.json#/$defs/entryDataObject"
@@ -186,29 +142,7 @@
 					"type": "integer"
 				},
 				"_merge": {
-					"type": "object",
-					"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-					"properties": {
-						"system": {
-							"const": true
-						},
-						"chooseSystem": {
-							"const": true
-						},
-						"activities": {
-							"const": true
-						},
-						"effects": {
-							"const": true
-						},
-						"flags": {
-							"const": true
-						},
-						"chooseFlags": {
-							"const": true
-						}
-					},
-					"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
 				"raceName": {
 					"description": "The full name of the race, with subrace parts/etc. applied.",
@@ -263,29 +197,7 @@
 							"type": "integer"
 						},
 						"_merge": {
-							"type": "object",
-							"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-							"properties": {
-								"system": {
-									"const": true
-								},
-								"chooseSystem": {
-									"const": true
-								},
-								"activities": {
-									"const": true
-								},
-								"effects": {
-									"const": true
-								},
-								"flags": {
-									"const": true
-								},
-								"chooseFlags": {
-									"const": true
-								}
-							},
-							"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},
 						"raceName": {
 							"description": "The full name of the race, with subrace parts/etc. applied.",
@@ -340,29 +252,7 @@
 							"type": "integer"
 						},
 						"_merge": {
-							"type": "object",
-							"description": "If our \"X\" (e.g. \"system\") should be merged with any base \"X\", rather than overwriting.",
-							"properties": {
-								"system": {
-									"const": true
-								},
-								"chooseSystem": {
-									"const": true
-								},
-								"activities": {
-									"const": true
-								},
-								"effects": {
-									"const": true
-								},
-								"flags": {
-									"const": true
-								},
-								"chooseFlags": {
-									"const": true
-								}
-							},
-							"markdownDescription": "If our "X" (e.g. "system") should be merged with any base "X", rather than overwriting."
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},
 						"raceName": {
 							"description": "The full name of the race, with subrace parts/etc. applied.",

package/schema/brew/homebrew.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.11.2",
+	"version": "1.11.3",
 	"type": "object",
 	"description": "Homebrew for 5etools. Should include arrays titled similarly to the main site data, e.g. `spell` or `class`",
 	"$defs": {
@@ -140,9 +140,9 @@
 								},
 								"color": {
 									"type": "string",
-									"description": "HTML hex color code this source should use when displayed in lists, e.g. 'ff00ff'",
+									"description": "HTML hex color code this school should use when displayed in lists, e.g. 'ff00ff'",
 									"pattern": "^([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$",
-									"markdownDescription": "HTML hex color code this source should use when displayed in lists, e.g. 'ff00ff'"
+									"markdownDescription": "HTML hex color code this school should use when displayed in lists, e.g. 'ff00ff'"
 								}
 							},
 							"required": [
@@ -207,6 +207,12 @@
 								"short": {
 									"type": "string"
 								},
+								"color": {
+									"type": "string",
+									"description": "HTML hex color code this type should use when displayed in lists, e.g. 'ff00ff'",
+									"pattern": "^([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$",
+									"markdownDescription": "HTML hex color code this type should use when displayed in lists, e.g. 'ff00ff'"
+								},
 								"hasOrder": {
 									"description": "If this type has a psionic order.",
 									"type": "boolean",

package/schema/brew/items-base.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.6.14",
+	"version": "1.6.15",
 	"type": "object",
 	"$defs": {
 		"itemLookupBase": {
@@ -467,6 +467,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"_foundryMerge": {
+					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
+				},
 				"fluff": {
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
@@ -845,6 +848,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"_foundryMerge": {
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
+						},
 						"fluff": {
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
@@ -1227,6 +1233,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"_foundryMerge": {
+							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
+						},
 						"fluff": {
 							"$ref": "items-shared.json#/$defs/fluff"
 						},