", suffix: "
"}); - } - meta.depth = cacheDepth; + if (!entry.entries && !displayName) return; + + textStack[0] += `<${this.wrapperTag} ${dataString} ${styleString}>${headerSpan}`; + this._renderEntriesSubtypes_renderPreReqText(entry, textStack, meta); + if (entry.entries) { + const cacheDepth = meta.depth; + const len = entry.entries.length; + for (let i = 0; i < len; ++i) { + meta.depth = nextDepth; + this._recursiveRender(entry.entries[i], textStack, meta, {prefix: "", suffix: "
"}); } - textStack[0] += ``; + meta.depth = cacheDepth; } + textStack[0] += ``; + }; - this._lastDepthTrackerInheritedProps = cachedLastDepthTrackerProps; + this._renderEntriesSubtypes_inline = function ({entry, textStack, meta, options, displayName}) { + const styleString = this._renderEntriesSubtypes_getStyleString({entry, meta, isInlineTitle: true}); + + const dataString = this._renderEntriesSubtypes_getDataString(entry); + if (entry.name != null && Renderer.ENTRIES_WITH_ENUMERATED_TITLES_LOOKUP[entry.type]) this._handleTrackTitles(entry.name); + + const headerSpan = this._renderEntriesSubtypes_getHeaderSpan({ + entry, + textStack, + meta, + options, + displayName, + headerTag: "span", + isAddPeriod: displayName && !Renderer._INLINE_HEADER_TERMINATORS.has(displayName[displayName.length - 1]), + }); + + if (!entry.entries && !displayName) return; + + textStack[0] += `<${this.wrapperTag} ${dataString} ${styleString}>`; + if (entry.entries) { + const cacheDepth = meta.depth; + const len = entry.entries.length; + for (let i = 0; i < len; ++i) { + meta.depth = 2; + const toRender = i === 0 ? {type: "inlineBlock", entries: [headerSpan, entry.entries[i]]} : entry.entries[i]; + this._recursiveRender(toRender, textStack, meta, {prefix: "", suffix: "
"}); + } + meta.depth = cacheDepth; + } else { + this._recursiveRender({type: "inlineBlock", entries: [headerSpan]}, textStack, meta, {prefix: "", suffix: "
"}); + } + textStack[0] += ``; }; this._renderEntriesSubtypes_getDataString = function (entry) { @@ -907,6 +968,29 @@ globalThis.Renderer = function () { return dataString; }; + this._renderEntriesSubtypes_getHeaderSpan = function ({ + entry, + textStack, + meta, + options, + displayName, + headerTag, + pagePart = "", + partPageExpandCollapse = "", + isAddPeriod = false, + }) { + if (!displayName) return ""; + + const type = entry.type || "entries"; + + const headerClass = `rd__h--${meta.depth + 1}`; // adjust as the CSS is 0..4 rather than -1..3 + const pluginDataNamePrefix = this._applyPlugins_getAll(`${type}_namePrefix`, {textStack, meta, options}, {input: entry}); + + const ptText = `${pluginDataNamePrefix.join("")}${this.render({type: "inline", entries: [displayName]})}${isAddPeriod ? "." : ""}`; + + return `<${headerTag} class="rd__h ${headerClass}" data-title-index="${this._headerIndex++}" ${this._getEnumeratedTitleRel(entry.name)}> ${ptText}${partPageExpandCollapse} `; + }; + this._renderEntriesSubtypes_renderPreReqText = function (entry, textStack, meta) { if (!entry.prerequisite) return; @@ -921,13 +1005,15 @@ globalThis.Renderer = function () { textStack[0] += `${Renderer.utils.prerequisite.getHtml(entry.prerequisite, {styleHint: meta.styleHint})}
`; }; - this._renderEntriesSubtypes_getStyleString = function (entry, meta, isInlineTitle) { + this._renderEntriesSubtypes_getStyleString = function ({entry, meta, isInlineTitle = false}) { const styleClasses = ["rd__b"]; styleClasses.push(this._getStyleClass(entry.type || "entries", entry)); if (isInlineTitle) { if (this._subVariant) styleClasses.push(Renderer.HEAD_2_SUB_VARIANT); else styleClasses.push(Renderer.HEAD_2); - } else styleClasses.push(meta.depth === -1 ? Renderer.HEAD_NEG_1 : meta.depth === 0 ? Renderer.HEAD_0 : Renderer.HEAD_1); + } else { + styleClasses.push(meta.depth === -1 ? Renderer.HEAD_NEG_1 : meta.depth === 0 ? Renderer.HEAD_0 : Renderer.HEAD_1); + } return styleClasses.length > 0 ? `class="${styleClasses.join(" ")}"` : ""; }; @@ -1245,29 +1331,24 @@ globalThis.Renderer = function () { }; this._renderAbilityDc = function (entry, textStack, meta, options) { - this._renderPrefix(entry, textStack, meta, options); - textStack[0] += `", suffix: "
"}); + const headerSpan = `${entry.name}. `; + + textStack[0] += `<${this.wrapperTag} class="${Renderer.HEAD_2}" ${dataString}>`; + if (entry.entries) { + const len = entry.entries.length; + for (let i = 0; i < len; ++i) { + const toRender = i === 0 ? {type: "inlineBlock", entries: [headerSpan, entry.entries[i]]} : entry.entries[i]; + this._recursiveRender(toRender, textStack, meta, {prefix: "", suffix: "
"}); + } + } else { + this._recursiveRender({type: "inlineBlock", entries: [headerSpan]}, textStack, meta, {prefix: "", suffix: "
"}); + } textStack[0] += ``; this._lastDepthTrackerInheritedProps = cachedLastDepthTrackerProps; @@ -7819,6 +7909,7 @@ Renderer.race = class { delete cpy._versions; delete cpy.hasFluff; delete cpy.hasFluffImages; + delete cpy.reprintedAs; delete cpySr.__prop; // merge names, abilities, entries, tags @@ -8959,6 +9050,7 @@ class _RenderCompactBestiaryImplOne extends _RenderCompactBestiaryImplBase { htmlPtSavingThrows: this._getHtmlParts_savingThrows({mon, renderer}), htmlPtImmunities: this._getHtmlParts_immunities({mon}), + htmlPtGear: this._getHtmlParts_gear({mon}), htmlPtTraits: this._getHtmlParts_traits({mon, renderer, entsTrait}), }; @@ -8977,6 +9069,12 @@ class _RenderCompactBestiaryImplOne extends _RenderCompactBestiaryImplBase { return `Imm. ${pt}
`; } + _getHtmlParts_gear ({mon}) { + const pt = Renderer.monster.getGearPart(mon); + if (!pt) return ""; + return `Gear ${pt}
`; + } + /* ----- */ _getHtmlParts_traits ({mon, renderer, entsTrait}) { @@ -9051,6 +9149,7 @@ class _RenderCompactBestiaryImplOne extends _RenderCompactBestiaryImplBase { htmlPtSavingThrows, htmlPtImmunities, + htmlPtGear, htmlPtTraits, } = this._getHtmlParts({ @@ -9082,6 +9181,7 @@ class _RenderCompactBestiaryImplOne extends _RenderCompactBestiaryImplBase { ${htmlPtVulnerabilities} ${htmlPtResistances} ${htmlPtImmunities} + ${htmlPtGear} ${htmlPtSenses} ${htmlPtLanguages} @@ -9591,7 +9691,24 @@ Renderer.monster = class { const hasSemi = ptImmune && ptConditionImmune && (ptImmune.includes(";") || ptConditionImmune.includes(";")); - return [ptImmune, ptConditionImmune].join(hasSemi ? `; ` : "; "); + return [ptImmune, ptConditionImmune].filter(Boolean).join(hasSemi ? `; ` : "; "); + } + + /* -------------------------------------------- */ + + // TODO(Future; XMM) revise + static getGearPart (mon, {renderer = null} = {}) { + if (!mon.attachedItems) return ""; + + renderer ||= Renderer.get(); + return mon.attachedItems + .map(uid => { + const unpacked = DataUtil.proxy.unpackUid("item", uid, "item"); + unpacked.name = unpacked.name.toTitleCase(); + const uidTitle = DataUtil.proxy.getUid("item", unpacked, {isMaintainCase: true}); + return renderer.render(`{@item ${uidTitle}}`); + }) + .join(", "); } /* -------------------------------------------- */ diff --git a/js/utils-brew/utils-brew-base.js b/js/utils-brew/utils-brew-base.js index 0d1d9a0..6130cfb 100644 --- a/js/utils-brew/utils-brew-base.js +++ b/js/utils-brew/utils-brew-base.js @@ -158,14 +158,15 @@ export class BrewUtil2Base { await this._pGetBrewProcessed_pDoBlocklistExtension({cpyBrews}); - // Avoid caching the meta merge, as we have our own cache. We might edit the brew, so we don't want a stale copy. - const cpyBrewsLoaded = await cpyBrews.pSerialAwaitMap(async ({head, body}) => { - const cpyBrew = await DataUtil.pDoMetaMerge(head.url || head.docIdLocal, body, {isSkipMetaMergeCache: true}); - this._pGetBrewProcessed_mutDiagnostics({head, cpyBrew}); - return cpyBrew; - }); + // Add per-file diagnostics + cpyBrews.forEach(({head, body}) => this._pGetBrewProcessed_mutDiagnostics({head, body})); + + // Merge into single object; apply data migrations + const cpyBrewsMerged = this._pGetBrewProcessed_getMergedOutput({cpyBrews}); + + // Apply "_copy" etc. + this._cache_brewsProc = await DataUtil.pDoMetaMerge(CryptUtil.uid(), cpyBrewsMerged, {isSkipMetaMergeCache: true}); - this._cache_brewsProc = this._pGetBrewProcessed_getMergedOutput({cpyBrewsLoaded}); return this._cache_brewsProc; } @@ -177,10 +178,10 @@ export class BrewUtil2Base { } } - _pGetBrewProcessed_mutDiagnostics ({head, cpyBrew}) { + _pGetBrewProcessed_mutDiagnostics ({head, body}) { if (!head.filename) return; - for (const arr of Object.values(cpyBrew)) { + for (const arr of Object.values(body)) { if (!(arr instanceof Array)) continue; for (const ent of arr) { if (!("__prop" in ent)) break; @@ -189,8 +190,8 @@ export class BrewUtil2Base { } } - _pGetBrewProcessed_getMergedOutput ({cpyBrewsLoaded}) { - return BrewDoc.mergeObjects(undefined, ...cpyBrewsLoaded); + _pGetBrewProcessed_getMergedOutput ({cpyBrews}) { + return BrewDoc.mergeObjects(undefined, ...cpyBrews.map(({body}) => body)); } /** diff --git a/js/utils-brew/utils-brew-ui-get.js b/js/utils-brew/utils-brew-ui-get.js index 0436d54..25beee5 100644 --- a/js/utils-brew/utils-brew-ui-get.js +++ b/js/utils-brew/utils-brew-ui-get.js @@ -79,7 +79,7 @@ export class GetBrewUi { }); this._miscFilter = new Filter({ header: "Miscellaneous", - items: ["Sample"], + items: ["Partnered", "Sample"], deselFn: it => it === "Sample", }); } @@ -88,6 +88,7 @@ export class GetBrewUi { brewInfo._fMisc = []; if (brewInfo._brewAuthor && brewInfo._brewAuthor.toLowerCase().startsWith("sample -")) brewInfo._fMisc.push("Sample"); if (brewInfo.sources?.some(ab => ab.startsWith(Parser.SRC_UA_ONE_PREFIX))) brewInfo._fMisc.push("One D&D"); + if (brewInfo._brewIsPartnered) brewInfo._fMisc.push("Partnered"); } addToFilters (it, isExcluded) { diff --git a/js/utils.js b/js/utils.js index 5544fe3..b60a4cb 100644 --- a/js/utils.js +++ b/js/utils.js @@ -2,7 +2,7 @@ // in deployment, `IS_DEPLOYED = "