5etools-utils 0.13.0 → 0.13.2

package/lib/BrewCleaner.js

@@ -165,12 +165,15 @@ export class BrewCleaner {
 	}
 
 	static run () {
+		const tStart = Date.now();
+
 		let totalFiles = 0;
+
 		Uf.runOnDirs((dir) => {
 			Um.info(`CLEANER`, `Cleaning dir "${dir}"...`);
 			totalFiles += this._cleanFolder(dir);
 		});
 
-		Um.info(`CLEANER`, `Cleaning complete. Cleaned ${totalFiles} file${totalFiles === 1 ? "" : "s"}.`);
+		Um.info(`CLEANER`, `Cleaning complete. Cleaned ${totalFiles} file${totalFiles === 1 ? "" : "s"}. Ran in ${(Date.now() - tStart / 1000).toFixed(2)}s.`);
 	}
 }

package/package.json

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

package/schema/brew/class/foundry.json

@@ -19,6 +19,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -44,6 +50,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},
@@ -128,6 +137,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -153,6 +168,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},
@@ -242,6 +260,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -267,6 +291,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},
@@ -355,6 +382,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -380,6 +413,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},

package/schema/brew/foundry-backgrounds.json

@@ -27,6 +27,12 @@
 					"system": {
 						"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -52,6 +58,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},

package/schema/brew/foundry-items.json

@@ -24,6 +24,12 @@
 					"system": {
 						"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -49,6 +55,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},

package/schema/brew/foundry-psionics.json

@@ -30,6 +30,12 @@
 					"system": {
 						"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -55,6 +61,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},

package/schema/brew/foundry-races.json

@@ -17,6 +17,12 @@
 				"system": {
 					"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 				},
+				"activities": {
+					"type": "array",
+					"items": {
+						"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+					}
+				},
 				"effects": {
 					"type": "array",
 					"items": {
@@ -42,6 +48,9 @@
 						"chooseSystem": {
 							"const": true
 						},
+						"activities": {
+							"const": true
+						},
 						"effects": {
 							"const": true
 						},
@@ -80,6 +89,12 @@
 						"system": {
 							"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 						},
+						"activities": {
+							"type": "array",
+							"items": {
+								"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+							}
+						},
 						"effects": {
 							"type": "array",
 							"items": {
@@ -105,6 +120,9 @@
 								"chooseSystem": {
 									"const": true
 								},
+								"activities": {
+									"const": true
+								},
 								"effects": {
 									"const": true
 								},
@@ -144,6 +162,12 @@
 				"system": {
 					"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 				},
+				"activities": {
+					"type": "array",
+					"items": {
+						"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+					}
+				},
 				"effects": {
 					"type": "array",
 					"items": {
@@ -169,6 +193,9 @@
 						"chooseSystem": {
 							"const": true
 						},
+						"activities": {
+							"const": true
+						},
 						"effects": {
 							"const": true
 						},
@@ -209,6 +236,12 @@
 						"system": {
 							"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 						},
+						"activities": {
+							"type": "array",
+							"items": {
+								"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+							}
+						},
 						"effects": {
 							"type": "array",
 							"items": {
@@ -234,6 +267,9 @@
 								"chooseSystem": {
 									"const": true
 								},
+								"activities": {
+									"const": true
+								},
 								"effects": {
 									"const": true
 								},
@@ -274,6 +310,12 @@
 						"system": {
 							"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 						},
+						"activities": {
+							"type": "array",
+							"items": {
+								"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+							}
+						},
 						"effects": {
 							"type": "array",
 							"items": {
@@ -299,6 +341,9 @@
 								"chooseSystem": {
 									"const": true
 								},
+								"activities": {
+									"const": true
+								},
 								"effects": {
 									"const": true
 								},

package/schema/brew/homebrew.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.10.30",
+	"version": "1.10.31",
 	"type": "object",
 	"description": "Homebrew for 5etools. Should include arrays titled similarly to the main site data, e.g. `spell` or `class`",
 	"$defs": {
@@ -710,6 +710,9 @@
 		"rewardFluff": {
 			"$ref": "fluff-rewards.json#/properties/rewardFluff"
 		},
+		"foundryReward": {
+			"$ref": "foundry-rewards.json#/properties/reward"
+		},
 		"table": {
 			"$ref": "tables.json#/properties/table"
 		},

package/schema/brew/rewards.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "rewards.json",
-	"version": "1.1.4",
+	"version": "1.2.0",
 	"type": "object",
 	"$defs": {
 		"reward": {
@@ -48,21 +48,12 @@
 					],
 					"additionalProperties": false
 				},
-				"signaturespells": {
-					"type": "object",
-					"properties": {
-						"entry": {
-							"$ref": "entry.json"
-						}
-					},
-					"required": [
-						"entry"
-					],
-					"additionalProperties": false
-				},
 				"rarity": {
 					"$ref": "util.json#/$defs/rarity"
 				},
+				"additionalSpells": {
+					"$ref": "util-additionalspells.json#/$defs/additionalSpellsArray"
+				},
 				"entries": {
 					"type": "array",
 					"uniqueItems": true,

package/schema/brew/util-additionalspells.json

@@ -69,6 +69,10 @@
 					"description": "Spells which cost a specific resource to use (such as Ki), but otherwise have no restrictions",
 					"$ref": "#/$defs/_additionalSpellRechargeObject"
 				},
+				"limited": {
+					"description": "Spells which do not recharge, and have a limited number of uses",
+					"$ref": "#/$defs/_additionalSpellRechargeObject"
+				},
 				"_": {
 					"description": "Spells which do not fall into the above categories (i.e. have no specific recharge, and are simply known)",
 					"$ref": "#/$defs/_additionalSpellArrayOfStringOrFilterObject"

package/schema/brew/util-foundry.json

@@ -2,7 +2,7 @@
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "util-foundry.json",
 	"title": "Util: Foundry",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"$defs": {
 		"entryDataObject": {
 			"description": "Additional \"5etools-type\" data to be stored on the entry.",
@@ -59,7 +59,14 @@
 		"foundryId": {
 			"type": "string",
 			"minLength": 16,
-			"maxLength": 16
+			"maxLength": 16,
+			"pattern": "^[A-Za-z0-9]+$"
+		},
+		"foundryIdShort": {
+			"type": "string",
+			"minLength": 1,
+			"maxLength": 16,
+			"pattern": "^[A-Za-z0-9]+$"
 		},
 		"foundryTokenScale": {
 			"type": "number",
@@ -106,12 +113,44 @@
 			},
 			"minProperties": 1
 		},
+		"_foundryActivityObject_utility": {
+			"type": "object",
+			"properties": {
+				"type": {
+					"const": "utility"
+				},
+				"effects": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"foundryId": {
+								"$ref": "#/$defs/foundryIdShort"
+							}
+						},
+						"required": [
+							"foundryId"
+						]
+					}
+				}
+			},
+			"required": [
+				"type"
+			]
+		},
+		"foundryActivityObject": {
+			"anyOf": [
+				{
+					"$ref": "#/$defs/_foundryActivityObject_utility"
+				}
+			]
+		},
 		"_foundryEffectObject": {
 			"type": "object",
 			"properties": {
 				"foundryId": {
 					"description": "Use only when required. For example, when linking an \"enchantmentRiderParent\".",
-					"$ref": "#/$defs/foundryId"
+					"$ref": "#/$defs/foundryIdShort"
 				},
 				"name": {
 					"type": "string"
@@ -202,7 +241,7 @@
 					"maximum": 20
 				},
 				"enchantmentRiderParent": {
-					"$ref": "#/$defs/foundryId"
+					"$ref": "#/$defs/foundryIdShort"
 				},
 				"type": {
 					"type": "string",
@@ -263,6 +302,12 @@
 				"system": {
 					"$ref": "#/$defs/foundrySystemObject"
 				},
+				"activities": {
+					"type": "array",
+					"items": {
+						"$ref": "#/$defs/foundryActivityObject"
+					}
+				},
 				"effects": {
 					"type": "array",
 					"items": {
@@ -288,6 +333,9 @@
 						"chooseSystem": {
 							"const": true
 						},
+						"activities": {
+							"const": true
+						},
 						"effects": {
 							"const": true
 						},
@@ -326,6 +374,12 @@
 				"system": {
 					"$ref": "#/$defs/foundrySystemObject"
 				},
+				"activities": {
+					"type": "array",
+					"items": {
+						"$ref": "#/$defs/foundryActivityObject"
+					}
+				},
 				"effects": {
 					"type": "array",
 					"items": {
@@ -351,6 +405,9 @@
 						"chooseSystem": {
 							"const": true
 						},
+						"activities": {
+							"const": true
+						},
 						"effects": {
 							"const": true
 						},
@@ -410,6 +467,12 @@
 				"system": {
 					"$ref": "#/$defs/foundrySystemObject"
 				},
+				"activities": {
+					"type": "array",
+					"items": {
+						"$ref": "#/$defs/foundryActivityObject"
+					}
+				},
 				"effects": {
 					"type": "array",
 					"items": {
@@ -435,6 +498,9 @@
 						"chooseSystem": {
 							"const": true
 						},
+						"activities": {
+							"const": true
+						},
 						"effects": {
 							"const": true
 						},

package/schema/brew-fast/class/foundry.json

@@ -19,6 +19,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -44,6 +50,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},
@@ -128,6 +137,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -153,6 +168,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},
@@ -242,6 +260,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -267,6 +291,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},
@@ -355,6 +382,12 @@
 					"system": {
 						"$ref": "../util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "../util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -380,6 +413,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},

package/schema/brew-fast/foundry-backgrounds.json

@@ -27,6 +27,12 @@
 					"system": {
 						"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -52,6 +58,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},

package/schema/brew-fast/foundry-items.json

@@ -24,6 +24,12 @@
 					"system": {
 						"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -49,6 +55,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},

package/schema/brew-fast/foundry-psionics.json

@@ -30,6 +30,12 @@
 					"system": {
 						"$ref": "util-foundry.json#/$defs/foundrySystemObject"
 					},
+					"activities": {
+						"type": "array",
+						"items": {
+							"$ref": "util-foundry.json#/$defs/foundryActivityObject"
+						}
+					},
 					"effects": {
 						"type": "array",
 						"items": {
@@ -55,6 +61,9 @@
 							"chooseSystem": {
 								"const": true
 							},
+							"activities": {
+								"const": true
+							},
 							"effects": {
 								"const": true
 							},