From c238f48fdf3387049b4f00654fabb416e506c77d Mon Sep 17 00:00:00 2001 From: Erin Schnabel Date: Sat, 2 Dec 2023 20:55:13 -0500 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Ignore=20new=20copy=20fields?= =?UTF-8?q?=20when=20generating=20beasts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebullient/convert/tools/dnd5e/Json2QuteLegendaryGroup.java | 3 ++- .../dev/ebullient/convert/tools/dnd5e/JsonSourceCopier.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteLegendaryGroup.java b/src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteLegendaryGroup.java index 071af895..d889664c 100644 --- a/src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteLegendaryGroup.java +++ b/src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteLegendaryGroup.java @@ -15,7 +15,8 @@ public class Json2QuteLegendaryGroup extends Json2QuteCommon { static final Pattern UPPERCASE_LETTER = Pattern.compile("([A-Z]|\\d+)"); static final List LEGENDARY_IGNORE_LIST = List.of("name", "source", "page", - TtrpgValue.indexInputType.name(), TtrpgValue.indexKey.name(), "_copy", "_meta", "additionalSources"); + TtrpgValue.indexInputType.name(), TtrpgValue.indexKey.name(), "_copy", "_meta", + "additionalSources", "_rawName", "_isCopy", "_copiedFrom"); Json2QuteLegendaryGroup(Tools5eIndex index, Tools5eIndexType type, JsonNode jsonNode) { super(index, type, jsonNode); diff --git a/src/main/java/dev/ebullient/convert/tools/dnd5e/JsonSourceCopier.java b/src/main/java/dev/ebullient/convert/tools/dnd5e/JsonSourceCopier.java index 1e0f90de..4a012e89 100644 --- a/src/main/java/dev/ebullient/convert/tools/dnd5e/JsonSourceCopier.java +++ b/src/main/java/dev/ebullient/convert/tools/dnd5e/JsonSourceCopier.java @@ -315,7 +315,7 @@ JsonNode mergeNodes(Tools5eIndexType type, String originKey, JsonNode copyFrom, } // indicate that this is a copy, and remove copy metadata (avoid revisit) - target.put("isCopy", true); + target.put("_isCopy", true); target.remove("_rawName"); MetaFields._copiedFrom.setIn(target, String.format("%s (%s)", SourceField.name.getTextOrEmpty(copyFrom), From ff8067216768957ed50b37f6e0ecb1bd41fc0f63 Mon Sep 17 00:00:00 2001 From: Erin Schnabel Date: Sat, 2 Dec 2023 20:57:44 -0500 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20publish=20rebuilt=20pf2e=20c?= =?UTF-8?q?ss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/css-snippets/pf2-compendium.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/css-snippets/pf2-compendium.css b/examples/css-snippets/pf2-compendium.css index 2b94623a..64014aa1 100644 --- a/examples/css-snippets/pf2-compendium.css +++ b/examples/css-snippets/pf2-compendium.css @@ -5807,7 +5807,7 @@ sup { flex: unset; display: none; } -.admonition .callout[data-callout=pf2-note] .callout-title .callout-title-inner { +.admonition-parent .callout[data-callout=pf2-note] .callout-title .callout-title-inner { display: inline; } .callout[data-callout=pf2-note] .callout-content { @@ -5933,7 +5933,7 @@ sup { clear: right; float: right; max-height: 85vh; - max-width: 50vw; + max-width: 50%; overflow-wrap: break-word; overflow-y: scroll; }