Skip to content

馃悰 Feat category and prerequisite text #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebullient merged 1 commit into from
Aug 6, 2026
Merged

馃悰 Feat category and prerequisite text #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteCommon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,11 @@ private String proficiencyPrereq(JsonNode profPrereq) {
for (JsonNode p : iterableElements(profPrereq)) {
for (Entry<String, JsonNode> prof : iterableFields(p)) {
switch (prof.getKey()) {
case "armor" -> profs.add(String.format("%s armor",
replaceText(prof.getValue().asText())));
case "armor" -> {
String armor = replaceText(prof.getValue().asText());
armor = armor.equals("shield") ? armor + "s" : armor + " armor";
profs.add(armor);
}
case "weapon" -> profs.add(String.format("a %s weapon",
replaceText(prof.getValue().asText())));
case "weaponGroup" -> profs.add(String.format("%s weapons",
Expand Down Expand Up @@ -518,12 +521,14 @@ String listPrerequisites(JsonNode variantNode) {
case background -> values.add(backgroundPrereq(value));
case campaign -> values.add(replaceConjoinOr(value, " Campaign"));
case culture -> values.add(replaceConjoinOr(value, " Culture"));
case exclusiveFeatCategory -> values.add("Can't Have Another " + replaceConjoinOr(value, " Feat"));
case exclusiveFeatCategory -> values.add("Can't Have Another " +
JsonSource.featureTypeToString(replaceConjoinOr(value, ""), Map.of()));
case expertise -> values.add(expertisePrereq(value));
case feat -> values.add(featPrereq(value));
case featCategory -> values.add("Any " + replaceConjoinOr(value, " Feat"));
case featCategory -> values.add("Any " +
JsonSource.featureTypeToString(replaceConjoinOr(value, ""), Map.of()));
case feature -> values.add(replaceConjoinOr(value, " Feature"));
case optionalfeature -> values.add(replaceConjoinOr(value, ""));
case optionalfeature -> values.add(replaceText("{@optfeature " + replaceConjoinOr(value, "") + "}"));
case group -> values.add(replaceConjoinOr(value, " Group"));
case item -> values.add(replaceConjoinOr(value, ""));
case itemProperty -> values.add(itemPropertyPrereq(value));
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/ebullient/convert/tools/dnd5e/JsonSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,8 @@ public static String featureTypeToString(String featureType, Map<String, Homebre
// Parser.FEAT_CATEGORY_TO_FULL
// Parser.OPT_FEATURE_TYPE_TO_FULL
return switch (featureType.toUpperCase()) {
case "D" -> "Dragonmark";
case "D" -> "Dragonmark Feat";
case "DG" -> "Dark Gift Feat";
case "EB" -> "Epic Boon Feat";
case "FS" -> "Fighting Style Feat";
case "G" -> "General Feat";
Expand All @@ -1430,6 +1431,7 @@ public static String featureTypeToString(String featureType, Map<String, Homebre
case "FS:P" -> "Fighting Style, Paladin";
case "FS:R" -> "Fighting Style, Ranger";
case "PB" -> "Pact Boon";
case "PPACT" -> "Planar Pact Feat";
case "OR" -> "Onomancy Resonant";
case "RN" -> "Rune Knight Rune";
case "AF" -> "Alchemical Formula";
Expand Down
Loading