5etools-utils 0.9.60 → 0.9.62

package/package.json

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

package/schema/brew/bestiary/bestiary.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.23",
+	"version": "1.21.24",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -864,9 +864,6 @@
 				"hasToken": {
 					"type": "boolean"
 				},
-				"tokenUrl": {
-					"type": "string"
-				},
 				"tokenCredit": {
 					"type": "string"
 				},
@@ -874,61 +871,7 @@
 					"$ref": "../util-foundry.json#/$defs/foundryTokenScale"
 				},
 				"altArt": {
-					"type": "array",
-					"items": {
-						"anyOf": [
-							{
-								"type": "object",
-								"properties": {
-									"name": {
-										"type": "string"
-									},
-									"source": {
-										"$ref": "../util.json#/$defs/source"
-									},
-									"page": {
-										"$ref": "../util.json#/$defs/page"
-									},
-									"tokenCredit": {
-										"type": "string"
-									}
-								},
-								"required": [
-									"name",
-									"source"
-								],
-								"additionalProperties": false
-							},
-							{
-								"type": "object",
-								"description": "An URL pointing to an alternative token for the creature.",
-								"properties": {
-									"tokenUrl": {
-										"type": "string"
-									},
-									"name": {
-										"type": "string"
-									},
-									"source": {
-										"$ref": "../util.json#/$defs/source"
-									},
-									"page": {
-										"$ref": "../util.json#/$defs/page"
-									},
-									"tokenCredit": {
-										"type": "string"
-									},
-									"foundryTokenScale": {
-										"$ref": "../util-foundry.json#/$defs/foundryTokenScale"
-									}
-								},
-								"required": [
-									"tokenUrl"
-								],
-								"additionalProperties": false
-							}
-						]
-					}
+					"$ref": "../util-token.json#/$defs/altArt"
 				},
 				"isNamedCreature": {
 					"type": "boolean"
@@ -1312,6 +1255,15 @@
 				},
 				"foundryImg": {
 					"$ref": "../util-foundry.json#/$defs/foundryImg"
+				},
+				"tokenUrl": {
+					"$ref": "../util-token.json#/$defs/tokenUrl"
+				},
+				"token": {
+					"$ref": "../util-token.json#/$defs/token"
+				},
+				"tokenHref": {
+					"$ref": "../util-token.json#/$defs/tokenHref"
 				}
 			},
 			"additionalProperties": false
@@ -2072,9 +2024,6 @@
 						"hasToken": {
 							"type": "boolean"
 						},
-						"tokenUrl": {
-							"type": "string"
-						},
 						"tokenCredit": {
 							"type": "string"
 						},
@@ -2082,61 +2031,7 @@
 							"$ref": "../util-foundry.json#/$defs/foundryTokenScale"
 						},
 						"altArt": {
-							"type": "array",
-							"items": {
-								"anyOf": [
-									{
-										"type": "object",
-										"properties": {
-											"name": {
-												"type": "string"
-											},
-											"source": {
-												"$ref": "../util.json#/$defs/source"
-											},
-											"page": {
-												"$ref": "../util.json#/$defs/page"
-											},
-											"tokenCredit": {
-												"type": "string"
-											}
-										},
-										"required": [
-											"name",
-											"source"
-										],
-										"additionalProperties": false
-									},
-									{
-										"type": "object",
-										"description": "An URL pointing to an alternative token for the creature.",
-										"properties": {
-											"tokenUrl": {
-												"type": "string"
-											},
-											"name": {
-												"type": "string"
-											},
-											"source": {
-												"$ref": "../util.json#/$defs/source"
-											},
-											"page": {
-												"$ref": "../util.json#/$defs/page"
-											},
-											"tokenCredit": {
-												"type": "string"
-											},
-											"foundryTokenScale": {
-												"$ref": "../util-foundry.json#/$defs/foundryTokenScale"
-											}
-										},
-										"required": [
-											"tokenUrl"
-										],
-										"additionalProperties": false
-									}
-								]
-							}
+							"$ref": "../util-token.json#/$defs/altArt"
 						},
 						"isNamedCreature": {
 							"type": "boolean"
@@ -2520,6 +2415,15 @@
 						},
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
+						},
+						"tokenUrl": {
+							"$ref": "../util-token.json#/$defs/tokenUrl"
+						},
+						"token": {
+							"$ref": "../util-token.json#/$defs/token"
+						},
+						"tokenHref": {
+							"$ref": "../util-token.json#/$defs/tokenHref"
 						}
 					},
 					"additionalProperties": false,
@@ -3285,9 +3189,6 @@
 						"hasToken": {
 							"type": "boolean"
 						},
-						"tokenUrl": {
-							"type": "string"
-						},
 						"tokenCredit": {
 							"type": "string"
 						},
@@ -3295,61 +3196,7 @@
 							"$ref": "../util-foundry.json#/$defs/foundryTokenScale"
 						},
 						"altArt": {
-							"type": "array",
-							"items": {
-								"anyOf": [
-									{
-										"type": "object",
-										"properties": {
-											"name": {
-												"type": "string"
-											},
-											"source": {
-												"$ref": "../util.json#/$defs/source"
-											},
-											"page": {
-												"$ref": "../util.json#/$defs/page"
-											},
-											"tokenCredit": {
-												"type": "string"
-											}
-										},
-										"required": [
-											"name",
-											"source"
-										],
-										"additionalProperties": false
-									},
-									{
-										"type": "object",
-										"description": "An URL pointing to an alternative token for the creature.",
-										"properties": {
-											"tokenUrl": {
-												"type": "string"
-											},
-											"name": {
-												"type": "string"
-											},
-											"source": {
-												"$ref": "../util.json#/$defs/source"
-											},
-											"page": {
-												"$ref": "../util.json#/$defs/page"
-											},
-											"tokenCredit": {
-												"type": "string"
-											},
-											"foundryTokenScale": {
-												"$ref": "../util-foundry.json#/$defs/foundryTokenScale"
-											}
-										},
-										"required": [
-											"tokenUrl"
-										],
-										"additionalProperties": false
-									}
-								]
-							}
+							"$ref": "../util-token.json#/$defs/altArt"
 						},
 						"isNamedCreature": {
 							"type": "boolean"
@@ -3734,6 +3581,15 @@
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
 						},
+						"tokenUrl": {
+							"$ref": "../util-token.json#/$defs/tokenUrl"
+						},
+						"token": {
+							"$ref": "../util-token.json#/$defs/token"
+						},
+						"tokenHref": {
+							"$ref": "../util-token.json#/$defs/tokenHref"
+						},
 						"_copy": {
 							"$ref": "../util.json#/$defs/copyBlock_copy_generic"
 						}

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.5.16",
+	"version": "1.5.17",
 	"type": "object",
 	"$defs": {
 		"itemLookupBase": {
@@ -118,9 +118,39 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusAc": {
+					"type": "string"
+				},
 				"bonusWeapon": {
 					"type": "string"
 				},
+				"bonusWeaponAttack": {
+					"type": "string"
+				},
+				"bonusWeaponDamage": {
+					"type": "string"
+				},
+				"bonusWeaponCritDamage": {
+					"type": "string"
+				},
+				"bonusSpellAttack": {
+					"type": "string"
+				},
+				"bonusSpellDamage": {
+					"type": "string"
+				},
+				"bonusSpellSaveDc": {
+					"type": "string"
+				},
+				"bonusSavingThrow": {
+					"type": "string"
+				},
+				"bonusAbilityCheck": {
+					"type": "string"
+				},
+				"bonusProficiencyBonus": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -416,9 +446,39 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusAc": {
+							"type": "string"
+						},
 						"bonusWeapon": {
 							"type": "string"
 						},
+						"bonusWeaponAttack": {
+							"type": "string"
+						},
+						"bonusWeaponDamage": {
+							"type": "string"
+						},
+						"bonusWeaponCritDamage": {
+							"type": "string"
+						},
+						"bonusSpellAttack": {
+							"type": "string"
+						},
+						"bonusSpellDamage": {
+							"type": "string"
+						},
+						"bonusSpellSaveDc": {
+							"type": "string"
+						},
+						"bonusSavingThrow": {
+							"type": "string"
+						},
+						"bonusAbilityCheck": {
+							"type": "string"
+						},
+						"bonusProficiencyBonus": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -718,9 +778,39 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusAc": {
+							"type": "string"
+						},
 						"bonusWeapon": {
 							"type": "string"
 						},
+						"bonusWeaponAttack": {
+							"type": "string"
+						},
+						"bonusWeaponDamage": {
+							"type": "string"
+						},
+						"bonusWeaponCritDamage": {
+							"type": "string"
+						},
+						"bonusSpellAttack": {
+							"type": "string"
+						},
+						"bonusSpellDamage": {
+							"type": "string"
+						},
+						"bonusSpellSaveDc": {
+							"type": "string"
+						},
+						"bonusSavingThrow": {
+							"type": "string"
+						},
+						"bonusAbilityCheck": {
+							"type": "string"
+						},
+						"bonusProficiencyBonus": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},

package/schema/brew/magicvariants.json

@@ -153,6 +153,9 @@
 							"bonusWeaponDamage": {
 								"type": "string"
 							},
+							"bonusWeaponCritDamage": {
+								"type": "string"
+							},
 							"bonusSpellAttack": {
 								"type": "string"
 							},
@@ -168,6 +171,9 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"bonusProficiencyBonus": {
+								"type": "string"
+							},
 							"dmg1": {
 								"type": "string"
 							},

package/schema/brew/objects.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "objects.json",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"type": "object",
 	"$defs": {
 		"object": {
@@ -125,9 +125,6 @@
 						"$ref": "entry.json"
 					}
 				},
-				"tokenUrl": {
-					"type": "string"
-				},
 				"tokenCredit": {
 					"type": "string"
 				},
@@ -155,6 +152,15 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"tokenUrl": {
+					"$ref": "util-token.json#/$defs/tokenUrl"
+				},
+				"token": {
+					"$ref": "util-token.json#/$defs/token"
+				},
+				"tokenHref": {
+					"$ref": "util-token.json#/$defs/tokenHref"
 				}
 			},
 			"additionalProperties": false,

package/schema/brew/util-token.json

@@ -0,0 +1,161 @@
+{
+	"$schema": "https://json-schema.org/draft/2020-12/schema",
+	"$id": "util-token.json",
+	"version": "1.0.0",
+	"title": "Util: Token",
+	"$defs": {
+		"tokenUrl": {
+			"deprecated": true,
+			"description": "A full token URL for the entity. Prefer \"tokenHref\" instead.",
+			"$ref": "util.json#/$defs/url"
+		},
+		"token": {
+			"description": "A name/source pair used to construct a token URL for the entity. For example `\"name\": \"Goblin\", \"source\": \"MM\"` for a creature token would refer to the MM Goblin's token.",
+			"type": "object",
+			"properties": {
+				"name": {
+					"type": "string"
+				},
+				"source": {
+					"$ref": "util.json#/$defs/source"
+				}
+			},
+			"required": [
+				"name",
+				"source"
+			],
+			"additionalProperties": false
+		},
+		"tokenHref": {
+			"$ref": "entry.json#/$defs/mediaHref"
+		},
+		"_altArtItemSite": {
+			"type": "object",
+			"properties": {
+				"name": {
+					"type": "string"
+				},
+				"source": {
+					"$ref": "util.json#/$defs/source"
+				},
+				"page": {
+					"$ref": "util.json#/$defs/page"
+				},
+				"tokenCredit": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"name",
+				"source"
+			],
+			"additionalProperties": false
+		},
+		"_altArtItemHomebrewTokenUrl": {
+			"deprecated": true,
+			"type": "object",
+			"properties": {
+				"tokenUrl": {
+					"type": "string"
+				},
+				"name": {
+					"type": "string"
+				},
+				"source": {
+					"$ref": "util.json#/$defs/source"
+				},
+				"page": {
+					"$ref": "util.json#/$defs/page"
+				},
+				"tokenCredit": {
+					"type": "string"
+				},
+				"foundryTokenScale": {
+					"$ref": "util-foundry.json#/$defs/foundryTokenScale"
+				}
+			},
+			"required": [
+				"tokenUrl"
+			],
+			"additionalProperties": false
+		},
+		"_altArtItemHomebrewToken": {
+			"type": "object",
+			"properties": {
+				"token": {
+					"$ref": "#/$defs/token"
+				},
+				"name": {
+					"type": "string"
+				},
+				"source": {
+					"$ref": "util.json#/$defs/source"
+				},
+				"page": {
+					"$ref": "util.json#/$defs/page"
+				},
+				"tokenCredit": {
+					"type": "string"
+				},
+				"foundryTokenScale": {
+					"$ref": "util-foundry.json#/$defs/foundryTokenScale"
+				}
+			},
+			"required": [
+				"token"
+			],
+			"additionalProperties": false
+		},
+		"_altArtItemHomebrewTokenHref": {
+			"type": "object",
+			"properties": {
+				"tokenHref": {
+					"$ref": "#/$defs/tokenHref"
+				},
+				"name": {
+					"type": "string"
+				},
+				"source": {
+					"$ref": "util.json#/$defs/source"
+				},
+				"page": {
+					"$ref": "util.json#/$defs/page"
+				},
+				"tokenCredit": {
+					"type": "string"
+				},
+				"foundryTokenScale": {
+					"$ref": "util-foundry.json#/$defs/foundryTokenScale"
+				}
+			},
+			"required": [
+				"tokenHref"
+			],
+			"additionalProperties": false
+		},
+		"_altArtItem": {
+			"oneOf": [
+				{
+					"$ref": "#/$defs/_altArtItemSite"
+				},
+				{
+					"$ref": "#/$defs/_altArtItemHomebrewTokenUrl"
+				},
+				{
+					"$ref": "#/$defs/_altArtItemHomebrewToken"
+				},
+				{
+					"$ref": "#/$defs/_altArtItemHomebrewTokenHref"
+				}
+			]
+		},
+		"altArt": {
+			"type": "array",
+			"items": {
+				"$ref": "#/$defs/_altArtItem"
+			},
+			"minItems": 1,
+			"uniqueItems": true
+		}
+	}
+}

package/schema/brew/util.json

@@ -3,7 +3,7 @@
 	"$id": "util.json",
 	"title": "Util",
 	"description": "Utility definitions to be used in other schemas.",
-	"version": "1.15.3",
+	"version": "1.15.4",
 	"$defs": {
 		"metaDependenciesArray": {
 			"type": "array",
@@ -2704,15 +2704,29 @@
 		},
 		"spellSchool": {
 			"type": "string",
+			"description": "A: Abjuration\n C: Conjuration\n D: Divination\n E: Enchantment\n V: Evocation\n I: Illusion\n N: Necromancy\n T: Transmutation\n P: Psychic",
+			"not": {
+				"enum": [
+					"Abjuration",
+					"Conjuration",
+					"Divination",
+					"Enchantment",
+					"Evocation",
+					"Illusion",
+					"Necromancy",
+					"Transmutation",
+					"Psychic"
+				]
+			},
 			"examples": [
 				"A",
-				"V",
+				"C",
+				"D",
 				"E",
+				"V",
 				"I",
-				"D",
 				"N",
 				"T",
-				"C",
 				"P"
 			]
 		},