Skip to content

馃悰 Consolidate item detail contents for weapons #930

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 27, 2026
Merged

馃悰 Consolidate item detail contents for weapons #930

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
17 changes: 9 additions & 8 deletions src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ private Variant createVariant(JsonNode variantNode, Tags tags) {
typeAssembly.addStaff(staff);
typeAssembly.addAmmo(ammo);
typeAssembly.addAge(age);
typeAssembly.addWeaponCategory(weaponCategory, baseItem);
typeAssembly.addWeaponCategory(itemType, weaponCategory, baseItem);
typeAssembly.addStaffMeleeNote(staff, itemType, itemTypeAlt);
typeAssembly.addItemType(itemType, baseItem);
typeAssembly.addItemType(itemTypeAlt, baseItem);
typeAssembly.addItemType(itemType, weaponCategory, baseItem);
typeAssembly.addItemType(itemTypeAlt, weaponCategory, baseItem);
typeAssembly.addFirearm(firearm);
typeAssembly.addPoison(poison, poisonTypes, itemProperties);
typeAssembly.addCursed(cursed, itemProperties);
Expand Down Expand Up @@ -229,13 +229,14 @@ void addAge(String age) {
}
}

void addWeaponCategory(String weaponCategory, String baseItem) {
void addWeaponCategory(ItemType type, String weaponCategory, String baseItem) {
if (!isPresent(weaponCategory)) {
return;
}
ItemTag.weapon.add(tags, weaponCategory);
baseItemIncluded = isPresent(baseItem);
typeDescription.add("weapon"
typeDescription.add(weaponCategory
+ ((type == null) ? "" : " " + type.name())
+ (baseItemIncluded ? " (" + baseItem + ")" : ""));
subTypeDescription.add(weaponCategory + " weapon");
}
Expand All @@ -250,7 +251,7 @@ void addStaffMeleeNote(boolean staff, ItemType itemType, ItemType itemTypeAlt) {
}

// render.js _getHtmlAndTextTypes_type
void addItemType(ItemType type, String baseItem) {
void addItemType(ItemType type, String weaponCategory, String baseItem) {
if (type == null) {
return;
}
Expand All @@ -265,9 +266,9 @@ void addItemType(ItemType type, String baseItem) {

if (EncodedType.S.typeIn(type, null)) {
target.add("armor (" + linkify(Tools5eIndexType.item, "shield|phb") + ")");
} else if (!baseItemIncluded && isPresent(baseItem)) {
} else if (!baseItemIncluded && isPresent(baseItem) && !isPresent(weaponCategory)) {
target.add(fullType + " (" + baseItem + ")");
} else if (EncodedType.GV.not(type)) {
} else if (EncodedType.GV.not(type) && !isPresent(weaponCategory)) {
target.add(fullType);
}
subTypeDescription.add(type.linkify());
Expand Down
Loading