v1.181.3

Author: TheGiddyLimit

data/adventure/adventure-cos.json

@@ -30497,11 +30497,11 @@
 				"Strahd has returned to the temple several times to learn new magic and to find a means of escaping his fate, but the Dark Powers have no intention of giving him up. These recent years have been difficult for {@creature Exethanter|CoS}, whose body and mind have been falling apart. The lich has grown weak and forgetful. He no longer remembers his name or his spells. He knows only that the Dark Powers that created Strahd's domain were born in the temple, and that these entities feed on the evil that Strahd represents. Strahd is the darkness that sustains them.",
 				"Characters who visit the temple can sense the presence of great evil. The dark vestiges imprisoned within the temple will try to corrupt them, offering them secrets and gifts in exchange for a taste of the evil that lurks within their true hearts.",
 				{
-					"type": "quote",
+					"type": "insetReadaloud",
 					"entries": [
-						"I would not be called 'death' so soon. I made a pact with death, a pact of blood."
-					],
-					"by": "Tome of Strahd"
+						"I would not be called 'death' so soon. I made a pact with death, a pact of blood.",
+						"\u2014Tome of Strahd"
+					]
 				},
 				{
 					"type": "section",

data/changelog.json

@@ -2431,5 +2431,10 @@
 		"ver": "1.181.2",
 		"date": "2023-05-25",
 		"txt": "- Added more options to the Classes Page \"Filter...\" dropdown\n  - \"View Official\" renamed to \"View Default\"\n  - Added \"View Official\" which shows official sources only (no homebrew)\n  - Added \"View Homebrew\" which shows homebrew\n- Added resource consumption display to Optional Features\n- Fixed pinned lists being displayed when printing\n- (Brew) Added support for `\"bonus\"` spellcasting `\"displayAs\"`\n- (Fixed typos/added tags)"
+	},
+	{
+		"ver": "1.181.3",
+		"date": "2023-05-28",
+		"txt": "- Fixed Spells Page failing to filter combined class/class variant spells in some cases\n- (Brew) Added support for `\"reaction\"` spellcasting `\"displayAs\"`\n- (Fixed typos/added tags)"
 	}
 ]

data/class/class-artificer.json

@@ -50,6 +50,13 @@
 					"{@item tinker's tools|PHB}",
 					"one type of {@item artisan's tools|PHB} of your choice"
 				],
+				"toolProficiencies": [
+					{
+						"thieves' tools": true,
+						"tinker's tools": true,
+						"anyArtisansTool": 1
+					}
+				],
 				"skills": [
 					{
 						"choose": {
@@ -445,6 +452,13 @@
 					"{@item tinker's tools|PHB}",
 					"one type of {@item artisan's tools|PHB} of your choice"
 				],
+				"toolProficiencies": [
+					{
+						"thieves' tools": true,
+						"tinker's tools": true,
+						"anyArtisansTool": 1
+					}
+				],
 				"skills": [
 					{
 						"choose": {
@@ -515,6 +529,12 @@
 					"tools": [
 						"{@item thieves' tools|PHB}",
 						"{@item tinker's tools|PHB}"
+					],
+					"toolProficiencies": [
+						{
+							"thieves' tools": true,
+							"tinker's tools": true
+						}
 					]
 				}
 			},
@@ -995,6 +1015,13 @@
 					"{@item tinker's tools|PHB}",
 					"one type of {@item artisan's tools|PHB} of your choice"
 				],
+				"toolProficiencies": [
+					{
+						"thieves' tools": true,
+						"tinker's tools": true,
+						"anyArtisansTool": 1
+					}
+				],
 				"skills": [
 					{
 						"choose": {
@@ -1065,6 +1092,12 @@
 					"tools": [
 						"{@item thieves' tools|PHB}",
 						"{@item tinker's tools|PHB}"
+					],
+					"toolProficiencies": [
+						{
+							"thieves' tools": true,
+							"tinker's tools": true
+						}
 					]
 				}
 			},

data/class/class-bard.json

@@ -111,6 +111,11 @@
 				"tools": [
 					"three {@item musical instrument|PHB|musical instruments} of your choice"
 				],
+				"toolProficiencies": [
+					{
+						"anyMusicalInstrument": 3
+					}
+				],
 				"skills": [
 					{
 						"any": 3
@@ -203,6 +208,11 @@
 					],
 					"tools": [
 						"one {@item musical instrument|PHB} of your choice"
+					],
+					"toolProficiencies": [
+						{
+							"anyMusicalInstrument": 1
+						}
 					]
 				}
 			},

data/class/class-druid.json

@@ -69,6 +69,11 @@
 				"tools": [
 					"{@item Herbalism kit|PHB}"
 				],
+				"toolProficiencies": [
+					{
+						"herbalism kit": true
+					}
+				],
 				"skills": [
 					{
 						"choose": {

data/class/class-monk.json

@@ -21,6 +21,14 @@
 				"tools": [
 					"any one type of {@item artisan's tools|PHB} or any one {@item musical instrument|PHB} of your choice"
 				],
+				"toolProficiencies": [
+					{
+						"anyArtisans": 1
+					},
+					{
+						"anyMusicalInstrument": 1
+					}
+				],
 				"skills": [
 					{
 						"choose": {

data/class/class-mystic.json

@@ -19,9 +19,6 @@
 				"weapons": [
 					"simple"
 				],
-				"tools": [
-					"None"
-				],
 				"skills": [
 					{
 						"choose": {

data/class/class-ranger.json

@@ -1285,6 +1285,11 @@
 				"tools": [
 					"{@item herbalism kit|PHB}"
 				],
+				"toolProficiencies": [
+					{
+						"herbalism kit": true
+					}
+				],
 				"skills": [
 					{
 						"choose": {

data/class/class-rogue.json

@@ -28,6 +28,11 @@
 				"tools": [
 					"{@item thieves' tools|PHB}"
 				],
+				"toolProficiencies": [
+					{
+						"thieves' tools": true
+					}
+				],
 				"skills": [
 					{
 						"choose": {
@@ -129,6 +134,11 @@
 					],
 					"tools": [
 						"{@item thieves' tools|PHB}"
+					],
+					"toolProficiencies": [
+						{
+							"thieves' tools": true
+						}
 					]
 				}
 			},

data/class/class-rune-scribe.json

@@ -23,6 +23,13 @@
 					"{@item calligrapher's supplies|PHB}",
 					"{@item mason's tools|PHB}",
 					"{@item woodcarver's tools|PHB}"
+				],
+				"toolProficiencies": [
+					{
+						"calligrapher's supplies": true,
+						"mason's tools": true,
+						"woodcarver's tools": true
+					}
 				]
 			},
 			"classTableGroups": [

data/renderdemo.json

@@ -23,7 +23,7 @@
 					"items": [
 						"Style tags; {@bold some text to be bolded} (alternative {@b shorthand}), {@italic some text to be italicised} (alternative {@i shorthand}), {@underline some text to be underlined} (alternative {@u shorthand}), {@strike some text to strike-through}, (alternative {@s shorthand}), {@color color|e40707}/{@color color variable|--rgb-name} tags, {@highlight highlight} tags, {@sup superscript} tags, {@sub subscript} tags, {@kbd keyboard} tags, {@code print("hello world")} tags, misc {@style Style|small-caps;small;capitalize;dnd-font} tags, {@font alternate font|Comic Sans MS} tags",
 						"Additionally, {@note note tags}, used for adding errata or Twitter \"designer footnotes.\"",
-						"Dice roller tags; {@dice 1d2-2+2d3+5} for regular dice rolls ({@dice 1d6;2d6} for multiple options; {@dice 1d6 + #$prompt_number:min=1,title=Enter a Number!,default=123$#} for input prompts), with extended {@dice 1d20+2|display text} and {@dice 1d20+2|display text|rolled by name}, and a special 'hit' version which assumes a d20 is to be rolled {@hit +7} (and rolls advantage on shift-click, disadvantage on alt-click). There's also {@damage 1d12+3} which will roll critical hits on shift-click and half damage (rounding down) on alt-click, and {@d20 -4} which will also roll advantage/disadvantage, although @hit tags are preferred where appropriate. Spells can have scaling-dice tags, (damage of 2d6 or 3d6 at level 1, add an extra {@scaledice 2d6;3d6|2-9|1d6} for each level beyond 2nd), for when a spell effect scales at higher levels. {@ability str 20}, {@savingThrow str 5}, and {@skillCheck animal_handling 5} are used as internal shorthand, but may be useful elsewhere.",
+						"Dice roller tags; {@dice 1d2-2+2d3+5} for regular dice rolls ({@dice 1d6;2d6} for multiple options; {@dice 1d6 + #$prompt_number:min=1,title=Enter a Number!,default=123$#} for input prompts), with extended {@dice 1d20+2|display text} and {@dice 1d20+2|display text|rolled by name}, and a special 'hit' version which assumes a d20 is to be rolled {@hit +7} (and rolls advantage on shift-click, disadvantage on alt-click). There's also {@damage 1d12+3} which will roll critical hits on shift-click and half damage (rounding down) on alt-click, and {@d20 -4} which will also roll advantage/disadvantage, although @hit tags are preferred where appropriate. Spells can have scaling-dice tags, (damage of 2d6 or 3d6 at level 1, add an extra {@scaledamage 2d6;3d6|2-9|1d6} for each level beyond 2nd; or, roll 2d6 when using 1 psi point, add an {@scaledice 2d6|1,3,5,7,9|1d6|psi|extra amount} for each additional psi point spent), for when a spell effect scales at higher levels. {@ability str 20}, {@savingThrow str 5}, and {@skillCheck animal_handling 5} are used as internal shorthand, but may be useful elsewhere.",
 						"Auto dice tags; as above, but a result is automatically rolled upon rendering: {@autodice 2d10+2}.",
 						"Chance tags; similar to dice roller tags, but output success/failure. Similar syntax as dice tags: {@chance 50}; {@chance 50|display text}; {@chance 50|display text|rolled by name}; {@chance 50|display text|rolled by name|on success text}; {@chance 50|display text|rolled by name|on success text|on failure text}.",
 						"Recharge tags; output success/failure for ability recharge. {@recharge} in an ability title for '(Recharge 6)', {@recharge 4} for '(Recharge 4\u20136)'.",

data/variantrules.json

@@ -4748,7 +4748,7 @@
 			"page": 176,
 			"ruleType": "V",
 			"entries": [
-				"The rules for lifting and carrying are intentionally simple. Here is a variant if you are looking for more detailed rules for determining how a character is hindered by the weight of equipment. When you use this variant, ignore the Strength column of the Armor table in chapter 5.",
+				"The rules for lifting and carrying are intentionally simple. Here is a variant if you are looking for more detailed rules for determining how a character is hindered by the weight of equipment. When you use this variant, ignore the Strength column of the Armor table in {@book chapter 5|PHB|5|Armor and Shields}.",
 				"If you carry weight in excess of 5 times your Strength score, you are encumbered, which means your speed drops by 10 feet.",
 				"If you carry weight in excess of 10 times your Strength score, up to your maximum carrying capacity, you are instead heavily encumbered, which means your speed drops by 20 feet and you have disadvantage on ability checks, attack rolls, and saving throws that use Strength, Dexterity, or Constitution."
 			]

js/bestiary.js

@@ -184,6 +184,12 @@ class BestiaryPage extends ListPageMultiSource {
 		return brew;
 	}
 
+	static _tableView_getEntryPropTransform ({mon, fnGet}) {
+		const fnGetSpellTraits = Renderer.monster.getSpellcastingRenderedTraits.bind(Renderer.monster, Renderer.get());
+		const allEntries = fnGet(mon, {fnGetSpellTraits});
+		return (allEntries || []).map(it => it.rendered || Renderer.get().render(it, 2)).join("");
+	}
+
 	constructor () {
 		const pFnGetFluff = Renderer.monster.pGetFluff.bind(Renderer.monster);
 
@@ -232,32 +238,24 @@ class BestiaryPage extends ListPageMultiSource {
 					_cr: {name: "CR", transform: mon => Parser.monCrToFull(mon.cr, {isMythic: !!mon.mythic})},
 					_trait: {
 						name: "Traits",
-						transform: mon => {
-							const fnGetSpellTraits = Renderer.monster.getSpellcastingRenderedTraits.bind(Renderer.monster, Renderer.get());
-							const allTraits = Renderer.monster.getOrderedTraits(mon, {fnGetSpellTraits});
-							return (allTraits || []).map(it => it.rendered || Renderer.get().render(it, 2)).join("");
-						},
+						transform: mon => BestiaryPage._tableView_getEntryPropTransform({mon, fnGet: Renderer.monster.getOrderedTraits}),
 						flex: 3,
 					},
 					_action: {
 						name: "Actions",
-						transform: mon => {
-							const fnGetSpellTraits = Renderer.monster.getSpellcastingRenderedTraits.bind(Renderer.monster, Renderer.get());
-							const allActions = Renderer.monster.getOrderedActions(mon, {fnGetSpellTraits});
-							return (allActions || []).map(it => it.rendered || Renderer.get().render(it, 2)).join("");
-						},
+						transform: mon => BestiaryPage._tableView_getEntryPropTransform({mon, fnGet: Renderer.monster.getOrderedActions}),
 						flex: 3,
 					},
-					bonus: {
+					_bonus: {
 						name: "Bonus Actions",
-						transform: mon => {
-							const fnGetSpellTraits = Renderer.monster.getSpellcastingRenderedTraits.bind(Renderer.monster, Renderer.get());
-							const allBonusActions = Renderer.monster.getOrderedBonusActions(mon, {fnGetSpellTraits});
-							return (allBonusActions || []).map(it => it.rendered || Renderer.get().render(it, 2)).join("");
-						},
+						transform: mon => BestiaryPage._tableView_getEntryPropTransform({mon, fnGet: Renderer.monster.getOrderedBonusActions}),
+						flex: 3,
+					},
+					_reaction: {
+						name: "Reactions",
+						transform: mon => BestiaryPage._tableView_getEntryPropTransform({mon, fnGet: Renderer.monster.getOrderedReactions}),
 						flex: 3,
 					},
-					reaction: {name: "Reactions", transform: it => (it || []).map(x => Renderer.get().render(x, 2)).join(""), flex: 3},
 					legendary: {name: "Legendary Actions", transform: it => (it || []).map(x => Renderer.get().render(x, 2)).join(""), flex: 3},
 					mythic: {name: "Mythic Actions", transform: it => (it || []).map(x => Renderer.get().render(x, 2)).join(""), flex: 3},
 					_lairActions: {

js/classes.js

@@ -1269,23 +1269,29 @@ class ClassesPage extends MixinComponentGlobalState(MixinBaseComponent(MixinProx
 		// endregion
 	}
 
-	_doSelectAllSubclasses () {
+	_doSelectAllSubclasses ({allowlistMods = null} = {}) {
 		const cls = this.activeClass;
-		const allStateKeys = cls.subclasses.map(sc => UrlUtil.getStateKeySubclass(sc));
+		const allStateKeys = cls.subclasses
+			.map(sc => {
+				return {
+					stateKey: UrlUtil.getStateKeySubclass(sc),
+					isSelected: allowlistMods == null || allowlistMods.has(ClassesPage.getSubclassCssMod(cls, sc)),
+				};
+			});
 
 		this._pageFilter.sourceFilter.doSetPillsClear();
 		this.filterBox.fireChangeEvent();
-		this._proxyAssign("state", "_state", "__state", allStateKeys.mergeMap(stateKey => ({[stateKey]: true})));
+		this._proxyAssign("state", "_state", "__state", allStateKeys.mergeMap(({stateKey, isSelected}) => ({[stateKey]: isSelected})));
 	}
 
 	async _render_pInitSubclassControls ($wrp) {
 		const cls = this.activeClass;
 
-		const $btnSelAll = $(`<button class="btn btn-xs btn-default" title="Select All (SHIFT to include most recent UA/etc.; CTRL to select official only)"><span class="glyphicon glyphicon-check"/></button>`)
+		const $btnSelAll = $(`<button class="btn btn-xs btn-default" title="Select All (SHIFT to filter for and include most recent; CTRL to select official plus homebrew)"><span class="glyphicon glyphicon-check"/></button>`)
 			.click(evt => {
 				const allStateKeys = cls.subclasses.map(sc => UrlUtil.getStateKeySubclass(sc));
 				if (evt.shiftKey) {
-					this._doSelectAllSubclasses();
+					this._doSelectAllSubclasses({allowlistMods: new Set(["fresh", "brew", "spicy"])});
 				} else if (evt.ctrlKey || evt.metaKey) {
 					const nxtState = {};
 					allStateKeys.forEach(k => nxtState[k] = false);

js/filter-backgrounds.js

@@ -3,6 +3,7 @@
 class PageFilterBackgrounds extends PageFilter {
 	static _getToolDisplayText (tool) {
 		if (tool === "anyArtisansTool") return "Any Artisan's Tool";
+		if (tool === "anyMusicalInstrument") return "Any Musical Instrument";
 		return tool.toTitleCase();
 	}
 

js/filter-items.js

@@ -71,7 +71,7 @@ class PageFilterEquipment extends PageFilter {
 	static mutateForFilters (item) {
 		item._fSources = SourceFilter.getCompleteFilterSources(item);
 
-		item._fProperties = item.property ? item.property.map(p => Renderer.item.propertyMap[p].name).filter(n => n) : [];
+		item._fProperties = item.property ? item.property.map(p => Renderer.item.getProperty(p).name).filter(n => n) : [];
 
 		item._fMisc = [];
 		if (item._isItemGroup) item._fMisc.push("Item Group");

js/filter-spells.js

@@ -496,7 +496,8 @@ class PageFilterSpells extends PageFilter {
 			...s._fClasses,
 			...s._fVariantClasses
 				.map(it => (it.userData.definedInSource && !SourceUtil.isNonstandardSource(it.userData.definedInSource)) ? new FilterItem({item: it.userData.equivalentClassName}) : null)
-				.filter(Boolean),
+				.filter(Boolean)
+				.filter(it => !s._fClasses.some(itCls => itCls.item === it.item)),
 		];
 		s._fRaces = Renderer.spell.getCombinedGeneric(s, {propSpell: "races", prop: "race"}).map(PageFilterSpells.getRaceFilterItem);
 		s._fBackgrounds = Renderer.spell.getCombinedGeneric(s, {propSpell: "backgrounds", prop: "background"}).map(it => it.name);

js/makecards.js

@@ -444,6 +444,7 @@ class MakeCards extends BaseComponent {
 		const allTraits = Renderer.monster.getOrderedTraits(mon, {fnGetSpellTraits});
 		const allActions = Renderer.monster.getOrderedActions(mon, {fnGetSpellTraits});
 		const allBonusActions = Renderer.monster.getOrderedBonusActions(mon, {fnGetSpellTraits});
+		const allReactions = Renderer.monster.getOrderedReactions(mon, {fnGetSpellTraits});
 
 		return [
 			this._ct_subtitle(Renderer.monster.getTypeAlignmentPart(mon)),
@@ -470,8 +471,8 @@ class MakeCards extends BaseComponent {
 			...(allActions?.length ? this._ct_renderEntries(allActions, 2) : []),
 			allBonusActions?.length ? this._ct_section("Bonus Actions") : null,
 			...(allBonusActions?.length ? this._ct_renderEntries(allBonusActions, 2) : []),
-			mon.reaction ? this._ct_section("Reactions") : null,
-			...(mon.reaction ? this._ct_renderEntries(mon.reaction, 2) : []),
+			allReactions?.length ? this._ct_section("Reactions") : null,
+			...(allReactions?.length ? this._ct_renderEntries(mon.reaction, 2) : []),
 			mon.legendary ? this._ct_section("Legendary Actions") : null,
 			mon.legendary ? this._ct_text(this._ct_htmlToText(Renderer.monster.getLegendaryActionIntro(mon, {renderer}))) : null,
 			...(mon.legendary ? this._ct_renderEntries(mon.legendary, 2) : []),
@@ -860,9 +861,9 @@ MakeCards.utils = class {
 	static enhanceItemAlt (item) {
 		delete item._fullEntries;
 
-		if (item.type && (MakeCards.utils.itemPropertyMap[item.type] || Renderer.item.typeMap[item.type])) {
+		if (item.type && (MakeCards.utils.itemPropertyMap[item.type] || Renderer.item.getType(item.type))) {
 			Renderer.item._initFullEntries(item);
-			(((MakeCards.utils.itemTypeMap[item.type] || Renderer.item.typeMap[item.type]) || {}).entries || []).forEach(e => item._fullEntries.push(e));
+			(((MakeCards.utils.itemTypeMap[item.type] || Renderer.item.getType(item.type)) || {}).entries || []).forEach(e => item._fullEntries.push(e));
 		}
 
 		if (item.property) {
@@ -872,9 +873,9 @@ MakeCards.utils = class {
 						Renderer.item._initFullEntries(item);
 						MakeCards.utils.itemPropertyMap[p].entries.forEach(e => item._fullEntries.push(e));
 					}
-				} else if (Renderer.item.propertyMap[p].entries) {
+				} else if (Renderer.item.getProperty(p).entries) {
 					Renderer.item._initFullEntries(item);
-					Renderer.item.propertyMap[p].entries.forEach(e => item._fullEntries.push(e));
+					Renderer.item.getProperty(p).entries.forEach(e => item._fullEntries.push(e));
 				}
 			});
 		}