v1.181.0

Author: TheGiddyLimit

css/main.css

@@ -787,7 +787,6 @@
 			],
 			"passive": 9,
 			"immune": [
-				"fire",
 				"poison",
 				"psychic",
 				{

data/bestiary/bestiary-wdmm.json

@@ -150,7 +150,7 @@
 							{
 								"name": "Innate Spellcasting",
 								"headerEntries": [
-									"<$title_short_name$>'s innate spellcasting ability is Intelligence (spell save DC <$spell_dc__int$>). <$title_short_name$> can innately cast the following spells, requiring no material components:"
+									"<$title_short_name$>'s innate spellcasting ability is Intelligence (spell save {@dc <$spell_dc__int$>}). <$title_short_name$> can innately cast the following spells, requiring no material components:"
 								],
 								"will": [
 									"{@spell nondetection} (self only)"
@@ -316,7 +316,7 @@
 							{
 								"name": "Innate Spellcasting",
 								"headerEntries": [
-									"<$title_short_name$>'s innate spellcasting ability is Charisma (spell save DC <$spell_dc__cha$>). <$title_short_name$> can innately cast the following spells, requiring no material components:"
+									"<$title_short_name$>'s innate spellcasting ability is Charisma (spell save {@dc <$spell_dc__cha$>}). <$title_short_name$> can innately cast the following spells, requiring no material components:"
 								],
 								"will": [
 									"{@spell dancing lights}"
@@ -469,7 +469,7 @@
 							{
 								"name": "Innate Spellcasting",
 								"headerEntries": [
-									"<$title_short_name$>'s innate spellcasting ability is Wisdom (spell save DC <$spell_dc__wis$>). <$title_short_name$> can innately cast the following spells, requiring no material components:"
+									"<$title_short_name$>'s innate spellcasting ability is Wisdom (spell save {@dc <$spell_dc__wis$>}). <$title_short_name$> can innately cast the following spells, requiring no material components:"
 								],
 								"rest": {
 									"1e": [
@@ -2777,7 +2777,7 @@
 							{
 								"name": "Innate Spellcasting",
 								"headerEntries": [
-									"<$title_short_name$>'s innate spellcasting ability is Charisma (spell save DC <$spell_dc__cha$>). <$title_short_name$> can innately cast the following spells, requiring no material components:"
+									"<$title_short_name$>'s innate spellcasting ability is Charisma (spell save {@dc <$spell_dc__cha$>}). <$title_short_name$> can innately cast the following spells, requiring no material components:"
 								],
 								"will": [
 									"{@spell thaumaturgy}"
@@ -2992,7 +2992,7 @@
 							{
 								"name": "Innate Spellcasting",
 								"headerEntries": [
-									"<$title_short_name$>'s innate spellcasting ability is Charisma (spell save DC <$spell_dc__cha$>). <$title_short_name$> can innately cast the following spells, requiring no material components:"
+									"<$title_short_name$>'s innate spellcasting ability is Charisma (spell save {@dc <$spell_dc__cha$>}). <$title_short_name$> can innately cast the following spells, requiring no material components:"
 								],
 								"will": [
 									"{@spell animal friendship} (snakes only)",

data/bestiary/traits.json

@@ -794,8 +794,8 @@
 									"name": "Spellcasting",
 									"page": 10,
 									"entries": [
-										"A monster with the Spellcasting class feature has a spellcaster level and spell slots, which it uses to cast its spells of 1st level and higher (as explained in the {@i Player's Handbook).} The spellcaster level is also used for any cantrips included in the feature.",
-										"The monster has a list of spells known or prepared from a particular class. The list might also include spells from a feature in that class, such as the Divine Domain feature of the cleric or the Druid Circle feature of the druid. The monster is considered a member of that class when attuning to or using a magic item that requires member-ship in the class or access to its spell list.",
+										"A monster with the Spellcasting class feature has a spellcaster level and spell slots, which it uses to cast its spells of 1st level and higher (as explained in the {@i Player's Handbook}). The spellcaster level is also used for any cantrips included in the feature.",
+										"The monster has a list of spells known or prepared from a particular class. The list might also include spells from a feature in that class, such as the Divine Domain feature of the cleric or the Druid Circle feature of the druid. The monster is considered a member of that class when attuning to or using a magic item that requires membership in the class or access to its spell list.",
 										"A monster can cast a spell from its list at a higher level if it has the spell slot to do so. For example, a drow mage with the 3rd-level {@spell lightning bolt} spell can cast it as a 5th-level spell by using one of its 5th-level spell slots.",
 										"You can change the spells that a monster knows or has prepared, replacing any spell on a monster's spell list with a different spell of the same level and from the same class list. If you do so, you might cause the monster to be a greater or lesser threat than suggested by its challenge rating."
 									],

data/book/book-mm.json

@@ -2415,5 +2415,11 @@
 		"date": "2023-05-04",
 		"title": "Displaced",
 		"txt": "- Added \"Misplaced Monster Volume 1\" content\n- (Fixed typos/added tags)"
+	},
+	{
+		"ver": "1.181.0",
+		"date": "2023-05-07",
+		"title": "Brewtal",
+		"txt": "- Fixed Items page resetting all other Miscellaneous filters when the \"Mundane\" or \"Magic\" side-labels are clicked\n- (Brew) Added `@sup`, `@sub`, and `@kbd` tags, which produce the matching HTML elements\n- (Brew) Added `\"credit\"` field to `\"image\"` entries, allowing art credits to be specified\n- (Brew) Added support for `\"colLabelGroups\"` on tables, allowing multiple rows of table headers to be specified\n- (Brew) Added support for array `\"by\"` in `\"quote\"` entries\n- (Brew) Switched to rendering `\"hpNote\"` in vehicle components as an entry supporting @tags (rather than as a plain string)\n- (Brew) Tweaked rendering of `\"list\"` names to avoid breaking names away from list bodies in columnar layouts\n- (Brew) Fixed \"Add/Edit Homebrew Source\" always setting a brew's color to #000000 when not specified\n- (Brew) Fixed Creature Text Converter silently removing \"(X with mage armor)\" (and similar) AC terms\n- ((Brew) Added HTML sanitization to homebrew repository, lessening the risk of scripting antics from \"official\" sources)\n- (Fixed typos/added tags)"
 	}
 ]

data/changelog.json

@@ -17755,6 +17755,7 @@
 			"page": 224,
 			"rarity": "uncommon",
 			"wondrous": true,
+			"weight": 3,
 			"entries": [
 				"An infernal puzzle box is a cube-shaped container 5 to 6 inches on a side, composed of airtight, interlocking parts made from materials found in the Nine Hells. Most of these boxes are made of infernal iron, though some are carved from bone or horn. Infernal puzzle boxes are used to safeguard diabolical contracts signed between devils and mortals, even after the terms of these contracts are fulfilled. An empty infernal puzzle box weighs 3 pounds regardless of the materials used to fashion it.",
 				"When an object small enough to fit inside an infernal puzzle box is placed in it, the container magically seals shut around the object, and no magic can force the box open. The sealed box becomes immune to all damage as well. Every infernal puzzle box is constructed with a unique means of opening it. The trick to solving the puzzle is always mundane, never magical. Once a creature figures out the trick or sequence of steps needed to open a particular infernal puzzle box, that creature can open the box as an action, allowing access to the box's contents.",
@@ -30772,6 +30773,7 @@
 			"page": 99,
 			"type": "OTH",
 			"rarity": "unknown",
+			"weight": 4,
 			"entries": [
 				"A shatterstick is a nonmagical, 12-inch-long, 4-pound stake made of blue-tinged infernal iron mined on Cania, the eighth layer of the Nine Hells. When embedded in earth or pounded into solid rock, the stake emits a seismic vibration in a 20-foot radius centered on itself for 1 minute, shaking the ground in that area for the duration. When the effects ends, the shatterstick breaks apart, becoming useless, and all structures within 20 feet of it take 35 ({@damage 10d6}) bludgeoning damage."
 			]
@@ -31930,6 +31932,7 @@
 			"page": 225,
 			"rarity": "uncommon",
 			"wondrous": true,
+			"weight": 0.333,
 			"entries": [
 				"Soul coins are about 5 inches across and about an inch thick, minted from infernal iron. Each coin weighs one-third of a pound, and is inscribed with Infernal writing and a spell that magically binds a single soul to the coin. Because each soul coin has a unique soul trapped within it, each has a story. A creature might have been imprisoned as a result of defaulting on a deal, while another might be the victim of a night hag's curse.",
 				{

data/items.json

@@ -21,7 +21,7 @@
 				{
 					"type": "list",
 					"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, {@code print("hello world")} tags, misc {@style Style|small-caps;small;capitalize;dnd-font} tags",
+						"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",
 						"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.",
 						"Auto dice tags; as above, but a result is automatically rolled upon rendering: {@autodice 2d10+2}.",
@@ -286,6 +286,36 @@
 						"** As an extension to Bootstrap's 1-to-12 system, 1/10th subdivisions can be used, e.g. col-1-5 for 1.5/12. The total column widths should still sum to exactly 12; enjoy doing the math."
 					]
 				},
+				{
+					"type": "table",
+					"caption": "Optional Caption",
+					"colLabelGroups": [
+						{
+							"colLabels": [
+								"Single"
+							]
+						},
+						{
+							"colLabels": [
+								"Stacked Top",
+								"Stacked Bottom"
+							]
+						},
+						{}
+					],
+					"colStyles": [
+						"col-4",
+						"col-4",
+						"col-4"
+					],
+					"rows": [
+						[
+							"This table has multiple header rows stacked one atop the other",
+							"Lorem ipsum",
+							"This column has no labels"
+						]
+					]
+				},
 				"Rollable tables can be made like so (note the 'pad' to format single digit numbers e.g. '01' for tables with >10 rows):",
 				{
 					"type": "table",
@@ -572,7 +602,8 @@
 						"type": "internal",
 						"path": "blank.png"
 					},
-					"title": "Optional Title"
+					"title": "Optional Title",
+					"credit": "Optional credit"
 				},
 				{
 					"type": "entries",

data/renderdemo.json

@@ -4,7 +4,7 @@ class AcConvert {
 	static tryPostProcessAc (mon, cbMan, cbErr) {
 		if (this._tryPostProcessAc_special(mon, cbMan, cbErr)) return;
 
-		let nuAc = [];
+		const nuAc = [];
 
 		const parts = mon.ac.trim().split(StrUtil.COMMAS_NOT_IN_PARENTHESES_REGEX).map(it => it.trim()).filter(Boolean);
 		parts.forEach(pt => {
@@ -24,7 +24,7 @@ class AcConvert {
 			// Plain number
 			if (!fromRaw) return nuAc.push(acNum);
 
-			let nxtAc = null; // A distinct AC value included in this text from e.g. mage armor
+			const nuAcTail = [];
 			const cur = {ac: acNum};
 			const froms = [];
 
@@ -85,11 +85,11 @@ class AcConvert {
 											return `{@item ${name}${source ? `|${source}` : "|"}|${mWithBarding.groups.name}}`;
 										});
 
-									nxtAc = {
+									nuAcTail.push({
 										ac: Number(mWithBarding.groups.ac),
 										condition: `with ${simpleFromBarding}`,
 										braces: true,
-									};
+									});
 
 									return;
 								}
@@ -104,11 +104,11 @@ class AcConvert {
 								else if (numMatch[2] === "barkskin") spell = `{@spell barkskin}`;
 								else throw new Error(`Unhandled spell! ${numMatch[2]}`);
 
-								nxtAc = {
+								nuAcTail.push({
 									ac: Number(numMatch[1]),
 									condition: `with ${spell}`,
 									braces: true,
-								};
+								});
 
 								return;
 							}
@@ -137,6 +137,8 @@ class AcConvert {
 			} else {
 				nuAc.push(cur.ac);
 			}
+
+			if (nuAcTail.length) nuAc.push(...nuAcTail);
 		});
 
 		mon.ac = nuAc;

js/converterutils-creature.js

@@ -138,7 +138,7 @@ class MiscTagsTagger {
 				object: (obj) => {
 					if (obj.type !== "table") return;
 
-					const rollMode = Renderer.getAutoConvertedTableRollMode(obj);
+					const rollMode = Renderer.table.getAutoConvertedRollMode(obj);
 					if (rollMode !== RollerUtil.ROLL_COL_NONE) this._addTag({tags, tag: "RO", options});
 				},
 			},

js/converterutils-spell.js

@@ -373,12 +373,22 @@ class ItemsPage extends ListPage {
 		$(`.side-label--mundane`).click(() => {
 			const filterValues = this._pageFilter.filterBox.getValues();
 			const curValue = MiscUtil.get(filterValues, "Miscellaneous", "Mundane");
-			this._pageFilter.filterBox.setFromValues({Miscellaneous: {Mundane: curValue === 1 ? 0 : 1}});
+			this._pageFilter.filterBox.setFromValues({
+				Miscellaneous: {
+					...(filterValues?.Miscellaneous || {}),
+					Mundane: curValue === 1 ? 0 : 1,
+				},
+			});
 		});
 		$(`.side-label--magic`).click(() => {
 			const filterValues = this._pageFilter.filterBox.getValues();
 			const curValue = MiscUtil.get(filterValues, "Miscellaneous", "Magic");
-			this._pageFilter.filterBox.setFromValues({Miscellaneous: {Magic: curValue === 1 ? 0 : 1}});
+			this._pageFilter.filterBox.setFromValues({
+				Miscellaneous: {
+					...(filterValues?.Miscellaneous || {}),
+					Magic: curValue === 1 ? 0 : 1,
+				},
+			});
 		});
 		const $outVisibleResults = $(`.lst__wrp-search-visible`);
 		const $wrpListMundane = $(`.itm__wrp-list--mundane`);

js/items.js

@@ -96,14 +96,20 @@ class RendererCard {
 
 		if (entry.caption) textStack[0] += `text | <b>${entry.caption}</b>\n`;
 
-		if (entry.colLabels && entry.colLabels.length) {
-			textStack[0] += `text | `;
-			for (let i = 0; i < entry.colLabels.length; ++i) {
-				const label = entry.colLabels[i];
-				this._recursiveRender(label, textStack, meta);
-				if (i !== entry.colLabels.length - 1) textStack[0] += _VERTICAL_LINE;
+		const headerRowMetas = Renderer.table.getHeaderRowMetas(entry);
+		if (headerRowMetas) {
+			for (let ixRow = 0; ixRow < headerRowMetas.length; ++ixRow) {
+				textStack[0] += `text | `;
+
+				const headerRowMeta = headerRowMetas[ixRow];
+				for (let ixCell = 0; ixCell < headerRowMeta.length; ++ixCell) {
+					const label = headerRowMeta[ixCell];
+					this._recursiveRender(label, textStack, meta);
+					if (ixCell !== headerRowMeta.length - 1) textStack[0] += _VERTICAL_LINE;
+				}
+
+				textStack[0] += `\n`;
 			}
-			textStack[0] += `\n`;
 		}
 
 		if (!entry.rows || !entry.rows.length) return;
@@ -219,9 +225,15 @@ class RendererCard {
 			this._recursiveRender(entry.entries[i], textStack, meta, {prefix: "text | <i>", suffix: "</i>"});
 			textStack[0] += `\n`;
 		}
-		if (entry.by) {
-			const tempStack = ["text | \u2014 "];
-			this._recursiveRender(entry.by, tempStack, meta);
+		const byArr = this._renderQuote_getBy(entry);
+		if (byArr) {
+			const tempStack = [];
+			for (let i = 0, len = byArr.length; i < len; ++i) {
+				const by = byArr[i];
+				tempStack[0] += `text | ${!i ? `\u2014 ` : ""}`;
+				this._recursiveRender(by, tempStack, meta);
+				if (i < len - 1) tempStack[0] += "\n";
+			}
 			textStack[0] += `${tempStack.join("")}${entry.from ? `, <i>${entry.from}</i>` : ""}\n`;
 		}
 	}