@optolith/entity-descriptions 0.3.2 → 0.4.1

package/lib/entities/elixir.js

@@ -1,7 +1,7 @@
 import { mapNullable } from "@elyukai/utils/nullable";
 import { sign } from "@elyukai/utils/string/number";
 import { createEntityDescriptionCreator } from "../creator.js";
-import { renderAlternativeNames, renderLaboratoryLevel, } from "./partial/herbary.js";
+import { renderAlternativeNames, renderLaboratoryLevel } from "./partial/herbary.js";
 import { printPlainGeneralPrerequisites } from "./partial/prerequisites/index.js";
 import { parensIf } from "./partial/rated/activatable/parensIf.js";
 /**
@@ -27,7 +27,9 @@ export const getElixirEntityDescription = createEntityDescriptionCreator(({ getI
                     },
                     {
                         label: translate("Price of Ingredients/Level"),
-                        value: translate(".input {$value :number} {{{$value} silverthalers}}", { value: entry.cost_per_ingredient_level }),
+                        value: translate(".input {$value :number} {{{$value} silverthalers}}", {
+                            value: entry.cost_per_ingredient_level,
+                        }),
                     },
                     {
                         label: translate("Laboratory"),
@@ -39,7 +41,7 @@ export const getElixirEntityDescription = createEntityDescriptionCreator(({ getI
                     },
                     {
                         label: `${translate("Prerequisites")} (${translate("Brewing Process")})`,
-                        value: translation?.brewing_process_prerequisites ?? translate("none"),
+                        value: translation.brewing_process_prerequisites ?? translate("none"),
                     },
                     {
                         label: `${translate("AP Value")} (${translate("Trade Secret")})`,
@@ -61,7 +63,7 @@ export const getElixirEntityDescription = createEntityDescriptionCreator(({ getI
                                 type: "definitionList",
                                 style: "nested",
                                 items: translation.quality_levels.map((effectForLevel, index) => ({
-                                    label: (index + 1).toString(),
+                                    label: (index + 1).toFixed(),
                                     value: effectForLevel,
                                 })),
                             },

package/lib/entities/equipment.js

@@ -66,15 +66,17 @@ const renderPrimaryAttributeAndDamageThreshold = (translateMap, getInstanceById,
     const getAttrAbbrv = (attrId) => translateMap(getInstanceById("Attribute", attrId)?.translations)?.abbreviation ?? MISSING_VALUE;
     switch (damageThreshold.kind) {
         case "Default":
-            return `${closeCombatTechnique?.primary_attribute.map(getAttrAbbrv).join("/") ?? MISSING_VALUE} ${damageThreshold.Default.threshold}`;
+            return `${closeCombatTechnique?.primary_attribute.map(getAttrAbbrv).join("/") ?? MISSING_VALUE} ${damageThreshold.Default.threshold.toFixed()}`;
         case "List":
             if (isNotEmpty(damageThreshold.List.list)) {
                 const { list } = damageThreshold.List;
                 if (list.some(item => item.threshold !== list[0].threshold)) {
-                    return list.map(item => `${getAttrAbbrv(item.attribute)} ${item.threshold}`).join("/");
+                    return list
+                        .map(item => `${getAttrAbbrv(item.attribute)} ${item.threshold.toFixed()}`)
+                        .join("/");
                 }
                 else {
-                    return `${list.map(item => getAttrAbbrv(item.attribute)).join("/")} ${list[0].threshold}`;
+                    return `${list.map(item => getAttrAbbrv(item.attribute)).join("/")} ${list[0].threshold.toFixed()}`;
                 }
             }
             else {
@@ -150,11 +152,9 @@ const renderReloadTime = (translate, reloadTime) => isNotEmpty(reloadTime)
         ? translate("{$value} actions", {
             value: reloadTime.map(time => time.value).join("/"),
         })
-        : translate(".input {$value :number} {{{$value} actions}}", {
-            value: reloadTime[0].value,
-        })
+        : formatTimeSpan(translate, ResponsiveTextSize.Full, "Actions", reloadTime[0].value)
     : MISSING_VALUE;
-const renderRangeBrackets = (rangeBrackets) => `${rangeBrackets.close}/${rangeBrackets.medium}/${rangeBrackets.far}`;
+const renderRangeBrackets = (rangeBrackets) => `${rangeBrackets.close.toFixed()}/${rangeBrackets.medium.toFixed()}/${rangeBrackets.far.toFixed()}`;
 const renderAmmunition = (translateMap, getInstanceById, ammunition) => ammunition === undefined
     ? "—"
     : (translateMap(getInstanceById("Ammunition", ammunition)?.translations)?.name ?? MISSING_VALUE);
@@ -320,7 +320,7 @@ const renderNote = (translate, translateMap, getInstanceById, localeJoin, melee_
         : renderMagicalTraditionRestriction(translate, translateMap, getInstanceById, localeJoin, name, restrictedTo.magicalTraditions),
     note,
 ].filter(isNotNullish))?.join("; ");
-const renderWeight = (translate, measurements, weight) => {
+const renderWeight = (translate, formatNumber, measurements, weight) => {
     if (typeof weight === "number") {
         return {
             label: translate("Weight"),
@@ -334,18 +334,18 @@ const renderWeight = (translate, measurements, weight) => {
             label: translate("Weight (Bronze/Silver/Gold)"),
             value: translate("{$value} pounds", {
                 value: [weight.bronze, weight.silver, weight.gold]
-                    .map(value => value * measurements.stonesMultiplier)
+                    .map(value => formatNumber(value * measurements.stonesMultiplier))
                     .join("/"),
             }),
         };
     }
 };
-const renderCost = (translate, translateMap, cost) => {
+const renderCost = (translate, translateMap, formatNumber, cost) => {
     const renderBookCostVariant = (bookCostVariant) => {
         switch (bookCostVariant.kind) {
             case "Definite": {
                 const translation = translateMap(bookCostVariant.Definite.translations);
-                return (renderCost(translate, translateMap, bookCostVariant.Definite.cost) +
+                return (renderCost(translate, translateMap, formatNumber, bookCostVariant.Definite.cost).value +
                     parensIf(translation?.label));
             }
             case "Indefinite": {
@@ -360,7 +360,7 @@ const renderCost = (translate, translateMap, cost) => {
         return {
             label: translate("Cost (Bronze/Silver/Gold)"),
             value: translate("{$value} silverthalers", {
-                value: [cost.bronze, cost.silver, cost.gold].join("/"),
+                value: [cost.bronze, cost.silver, cost.gold].map(formatNumber).join("/"),
             }),
         };
     }
@@ -404,8 +404,8 @@ const renderCost = (translate, translateMap, cost) => {
     }
 };
 const renderArmorValues = (translate, translateMap, localeCompare, getInstanceById, idMap, values) => [
-    { label: translate("Protection"), value: values.protection.toString() },
-    { label: translate("Encumbrance"), value: values.encumbrance.toString() },
+    { label: translate("Protection"), value: values.protection.toFixed() },
+    { label: translate("Encumbrance"), value: values.encumbrance.toFixed() },
     {
         label: translate("Additional Penalties"),
         value: values.has_additional_penalties
@@ -525,7 +525,7 @@ export const getEquipmentEntityDescription = createEntityDescriptionCreator(({ g
                     baseItemTranslation?.language !== undefined || baseItemTranslation?.script !== undefined
                         ? {
                             label: translate("Language/Script"),
-                            value: [baseItemTranslation?.language, baseItemTranslation?.script]
+                            value: [baseItemTranslation.language, baseItemTranslation.script]
                                 .map(value => value ?? "—")
                                 .join(" / "),
                         }
@@ -542,8 +542,8 @@ export const getEquipmentEntityDescription = createEntityDescriptionCreator(({ g
                                 }),
                         }
                         : undefined,
-                    mapNullable(baseItem.weight, weight => renderWeight(translate, locale.measurementAdjustments, weight)),
-                    mapNullable(baseItem.cost, cost => renderCost(translate, translateMap, cost)),
+                    mapNullable(baseItem.weight, weight => renderWeight(translate, locale.formatNumber, locale.measurementAdjustments, weight)),
+                    mapNullable(baseItem.cost, cost => renderCost(translate, translateMap, locale.formatNumber, cost)),
                     mapNullable(renderNote(translate, translateMap, getInstanceById, locale.join, combatValues?.type === "Weapon" ? combatValues.values.melee_uses : undefined, combatValues?.values.restrictedTo, name, baseItemTranslation?.note), note => ({
                         label: translate("Note"),
                         value: note,

package/lib/entities/equipmentPackage.js

@@ -115,7 +115,7 @@ const getAtomicEquipmentCost = (entry) => {
                 entry.content.cost.silver,
                 entry.content.cost.gold,
             ];
-            return costs.map(getAtomicCost).reduce(rangeAtomicEquipmentCost);
+            return costs.reduce(rangeAtomicEquipmentCost);
         }
         case "Ammunition":
         case "Animal":
@@ -188,7 +188,8 @@ const getAtomicEquipmentWeight = (entry) => {
                     return assertExhaustive(entry.content.type);
             }
         case "Jewelry": {
-            const values = Object.values(entry.content.weight);
+            const { bronze, silver, gold } = entry.content.weight;
+            const values = [bronze, silver, gold];
             return [Math.min(...values), Math.max(...values)];
         }
         case "Armor":
@@ -269,7 +270,7 @@ export const getEquipmentPackageEntityDescription = createEntityDescriptionCreat
         ...item,
         content: { entity: item.id.kind, content: getInstanceById(item.id) },
     }))
-        .filter((item) => item.content !== undefined) ?? [];
+        .filter((item) => item.content.content !== undefined) ?? [];
     return {
         title: translation.name,
         className: "equipment-package",

package/lib/entities/experienceLevel.js

@@ -16,31 +16,31 @@ export const getExperienceLevelEntityDescription = createEntityDescriptionCreato
                 items: [
                     {
                         label: translate("Adventure Points"),
-                        value: entry.adventure_points.toString(),
+                        value: entry.adventure_points.toFixed(),
                     },
                     {
                         label: translate("Maximum Attribute Value"),
-                        value: entry.max_attribute_value.toString(),
+                        value: entry.max_attribute_value.toFixed(),
                     },
                     {
                         label: translate("Maximum Skill Value"),
-                        value: entry.max_skill_rating.toString(),
+                        value: entry.max_skill_rating.toFixed(),
                     },
                     {
                         label: translate("Maximum Combat Technique"),
-                        value: entry.max_combat_technique_rating.toString(),
+                        value: entry.max_combat_technique_rating.toFixed(),
                     },
                     {
                         label: translate("Maximum Attribute Total"),
-                        value: entry.max_attribute_total.toString(),
+                        value: entry.max_attribute_total.toFixed(),
                     },
                     {
                         label: translate("Number of Spells/Liturgical Chants"),
-                        value: entry.max_number_of_spells_liturgical_chants.toString(),
+                        value: entry.max_number_of_spells_liturgical_chants.toFixed(),
                     },
                     {
                         label: translate("Number from other Traditions"),
-                        value: entry.max_number_of_unfamiliar_spells.toString(),
+                        value: entry.max_number_of_unfamiliar_spells.toFixed(),
                     },
                 ],
             },

package/lib/entities/focusRule.js

@@ -10,8 +10,8 @@ export const getFocusRuleEntityDescription = createEntityDescriptionCreator(({ g
         return undefined;
     }
     return {
-        title: `${translation.name} (${romanize(entry.level)})`,
-        subtitle: topicTranslation.name,
+        title: translation.name,
+        badge: entry.level,
         className: "focus-rule",
         body: [
             {

package/lib/entities/influence.js

@@ -24,10 +24,10 @@ export const getInfluenceEntityDescription = createEntityDescriptionCreator(({ g
                 : {
                     type: "definitionList",
                     items: [
-                        ...(translation.effects?.map(effect => ({
+                        ...translation.effects.map(effect => ({
                             label: effect.label,
                             value: effect.text,
-                        })) ?? []),
+                        })),
                         entry.prerequisites === undefined
                             ? undefined
                             : {

package/lib/entities/liturgicalChant.d.ts

@@ -1,6 +1,6 @@
 import { type RatedIdentifier } from "optolith-database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../helpers/getTypes.js";
-import { type IdMap } from "../index.js";
+import type { IdMap } from "../index.js";
 /**
  * Get a JSON representation of the rules text for a blessing.
  */

package/lib/entities/partial/adventurePointsValue.js

@@ -19,8 +19,8 @@ const renderSelectOptionsAdventurePointsValue = (locale, derivedLabel, getAllSel
         }
         case "Fixed":
             return Map.groupBy(getAllSelectOptions().map((item) => [
-                config.Fixed.map.find(mapItem => deepEqual(mapItem.id, item.id))
-                    ?.ap_value ?? config.Fixed.default,
+                config.Fixed.map.find(mapItem => deepEqual(mapItem.id, item.id))?.ap_value ??
+                    config.Fixed.default,
                 item,
             ]), item => item[0])
                 .entries()
@@ -52,10 +52,14 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
     switch (value.kind) {
         case "Fixed": {
             if (entry.levels === undefined) {
-                return translate(".input {$value :number} {{{$value} Adventure Points}}", { value: value.Fixed });
+                return translate(".input {$value :number} {{{$value} Adventure Points}}", {
+                    value: value.Fixed,
+                });
             }
             else {
-                return translate(".input {$value :number} {{{$value} Adventure Points per level}}", { value: value.Fixed });
+                return translate(".input {$value :number} {{{$value} Adventure Points per level}}", {
+                    value: value.Fixed,
+                });
             }
         }
         case "ByLevel": {
@@ -70,19 +74,11 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
                 return mainValue;
             }
             else {
-                const sizeCategories = [
-                    "tiny",
-                    "small",
-                    "medium",
-                    "large",
-                    "huge",
-                ];
+                const sizeCategories = ["tiny", "small", "medium", "large", "huge"];
                 const values = sizeCategories
                     .map(sizeCategory => additionalBySizeCategory[sizeCategory])
                     .join("/");
-                const labels = sizeCategories
-                    .map(sizeCategory => translate(sizeCategory))
-                    .join("/");
+                const labels = sizeCategories.map(sizeCategory => translate(sizeCategory)).join("/");
                 return `${mainValue} + ${translate("{$values} AP for size category {$labels} (per level)", { values, labels })}`;
             }
         }
@@ -111,8 +107,7 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
                     return translate("{$values} adventure points for a {$sized} animal shape", {
                         values: sizes.map(size => size.content.ap_value).join("/"),
                         sized: sizes
-                            .map(size => translateMap(size.content.translations)?.name ??
-                            MISSING_VALUE)
+                            .map(size => translateMap(size.content.translations)?.name ?? MISSING_VALUE)
                             .join("/"),
                     });
                 }
@@ -158,6 +153,7 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
                     return renderSelectOptionsAdventurePointsValue(locale, () => {
                         switch (derivedSelectOptions.Skills.categories.length) {
                             case 1: {
+                                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- ensured by the schema
                                 const first = derivedSelectOptions.Skills.categories[0];
                                 switch (first.kind) {
                                     case "Skills":
@@ -177,8 +173,7 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
                             case 2:
                                 return derivedSelectOptions.Skills.categories.every(category => category.kind === "Spells" || category.kind === "Rituals")
                                     ? translate("A/B/C/D spellwork")
-                                    : derivedSelectOptions.Skills.categories.every(category => category.kind === "LiturgicalChants" ||
-                                        category.kind === "Ceremonies")
+                                    : derivedSelectOptions.Skills.categories.every(category => category.kind === "LiturgicalChants" || category.kind === "Ceremonies")
                                         ? translate("A/B/C/D liturgical chant or ceremony")
                                         : translate("A/B/C/D ability");
                             default:
@@ -218,7 +213,7 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
                                 return assertExhaustive(exprValue);
                         }
                     })).join("/");
-                    const labels = Array.from({ length: entry.maximum ?? 3 }, (_, index) => `${index + 1}.`).join("/");
+                    const labels = Array.from({ length: entry.maximum ?? 3 }, (_, index) => `${(index + 1).toFixed()}.`).join("/");
                     if (entry.maximum !== undefined) {
                         return translate("{$values} Adventure Points for the {$labels} purchase", {
                             values,

package/lib/entities/partial/enhancements.d.ts

@@ -1,4 +1,4 @@
-import { RatedIdentifier, type ImprovementCost, type SkillWithEnhancementsIdentifier } from "optolith-database-schema/gen";
+import type { ImprovementCost, RatedIdentifier, SkillWithEnhancementsIdentifier } from "optolith-database-schema/gen";
 import type { RawEntityDescriptionSection } from "../../index.js";
 import { type StdReader } from "./reader.js";
 /**

package/lib/entities/partial/enhancements.js

@@ -10,7 +10,7 @@ import { getChildInstancesForInstanceIdR, translateMapR, translateR, } from "./r
  */
 export const renderEnhancements = (parentId, parentImprovementCost) => getChildInstancesForInstanceIdR("Enhancement", parentId).thenW(enhancements => Reader.traverse(enhancements.toSorted(on(e => e.content.skill_rating, compareNumber)), enhancement => translateMapR(enhancement.content.translations).thenW(translation => Reader.ask().map(env => translation === undefined
     ? undefined
-    : `- ^[${translation.name}](entity: "Enhancement") (${env.translate("SR {$value}", { value: enhancement.content.skill_rating })}, ${env.translate("{$value} AP", { value: enhancement.content.adventure_points_modifier * getAdventurePointsForActivation(parentImprovementCost.kind) })}): ${translation.effect ?? ""}${enhancement.content.prerequisites === undefined ? "" : ` ${env.translate(".input {$hiddenCount :number} {{Prerequisites}}", { hiddenCount: enhancement.content.prerequisites.length })}: ${printEnhancementPrerequisites(env.getInstanceById, { translate: env.translate, translateMap: env.translateMap, compare: env.localeCompare, join: env.localeJoin }, enhancement.content.prerequisites)}`}`))).thenW(enhancementDescriptions => {
+    : `- ^[${translation.name}](entity: "Enhancement") (${env.translate("SR {$value}", { value: enhancement.content.skill_rating })}, ${env.translate("{$value} AP", { value: enhancement.content.adventure_points_modifier * getAdventurePointsForActivation(parentImprovementCost.kind) })}): ${translation.effect}${enhancement.content.prerequisites === undefined ? "" : ` ${env.translate(".input {$hiddenCount :number} {{Prerequisites}}", { hiddenCount: enhancement.content.prerequisites.length })}: ${printEnhancementPrerequisites(env.getInstanceById, { translate: env.translate, translateMap: env.translateMap, compare: env.localeCompare, join: env.localeJoin }, enhancement.content.prerequisites)}`}`))).thenW(enhancementDescriptions => {
     const nonNullishDescriptions = enhancementDescriptions.filter(isNotNullish);
     if (nonNullishDescriptions.length === 0) {
         return Reader.of(undefined);

package/lib/entities/partial/herbary.js

@@ -24,12 +24,16 @@ export const renderLaboratoryLevel = (translate, level) => {
 export const renderResistance = (translate, translateMap, getInstanceById, idMap, resistance) => {
     switch (resistance.kind) {
         case "Spirit":
-            return (translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Spirit)?.translations)?.name ?? MISSING_VALUE);
+            return (translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Spirit)
+                ?.translations)?.name ?? MISSING_VALUE);
         case "Toughness":
-            return (translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Toughness)?.translations)?.name ?? MISSING_VALUE);
+            return (translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Toughness)
+                ?.translations)?.name ?? MISSING_VALUE);
         case "LowerOfSpiritAndToughness": {
-            const spiritTranslation = translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Spirit)?.translations)?.name ?? MISSING_VALUE;
-            const toughnessTranslation = translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Toughness)?.translations)?.name ?? MISSING_VALUE;
+            const spiritTranslation = translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Spirit)
+                ?.translations)?.name ?? MISSING_VALUE;
+            const toughnessTranslation = translateMap(getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic.Toughness)
+                ?.translations)?.name ?? MISSING_VALUE;
             return translate("{$first} or {$second}, depending on which value is lower", {
                 first: spiritTranslation,
                 second: toughnessTranslation,
@@ -46,7 +50,7 @@ export const renderChance = (translate, translateMap, item, includePercentage =
     (item.chance === undefined
         ? undefined
         : translate("{$valueRange} on {$dice}", {
-            valueRange: item.chance === 5 ? 1 : `1–${item.chance / 5}`,
+            valueRange: item.chance === 5 ? 1 : `1–${(item.chance / 5).toFixed()}`,
             dice: renderDice(translate, { number: 1, sides: 20 }),
         }) +
             (includePercentage
@@ -58,8 +62,8 @@ export const renderChance = (translate, translateMap, item, includePercentage =
 export const renderAlternativeNames = (translate, alternativeNames) => alternativeNames === undefined || !isNotEmpty(alternativeNames)
     ? undefined
     : {
-        label: translate(".input {$hiddenCount :number} {{Alternative Names}}", { hiddenCount: alternativeNames.length }),
-        value: alternativeNames
-            .map(name => name.name + parensIf(name.region))
-            .join(", "),
+        label: translate(".input {$hiddenCount :number} {{Alternative Names}}", {
+            hiddenCount: alternativeNames.length,
+        }),
+        value: alternativeNames.map(name => name.name + parensIf(name.region)).join(", "),
     };

package/lib/entities/partial/map.d.ts

@@ -1,4 +1,4 @@
-import type { ResponsiveTextOptional } from "optolith-database-schema/gen";
+import type { MapStyle, ResponsiveTextOptional } from "optolith-database-schema/gen";
 import type { LocaleMap, Translate, TranslateMap } from "../../helpers/translate.js";
 import { type StdReader } from "./reader.js";
 /**
@@ -6,6 +6,7 @@ import { type StdReader } from "./reader.js";
  */
 export declare const renderMap: <M extends {
     options: MO[];
+    style?: MapStyle;
     translations?: LocaleMap<MT>;
 }, MOT = M extends {
     options: {
@@ -28,6 +29,7 @@ export declare const renderMap: <M extends {
  */
 export declare const renderResponsiveMap: <M extends {
     options: MO[];
+    style?: MapStyle;
     translations?: LocaleMap<{
         list_prepend?: ResponsiveTextOptional;
         listPrefix?: ResponsiveTextOptional;

package/lib/entities/partial/map.js

@@ -8,14 +8,28 @@ import { MISSING_VALUE } from "./unknown.js";
  */
 export const renderMap = (translate, translateMap, map, getValue, surroundValues = values => values, getLabel, getListPrefix, getListSuffix, getReplacement, ...moreToAppend) => {
     const translation = translateMap(map.translations);
-    if (translation === undefined) {
-        return MISSING_VALUE;
-    }
-    const replacement = getReplacement(translation);
+    const replacement = mapNullable(translation, t => getReplacement(t));
     if (replacement !== undefined) {
         return replacement;
     }
-    return `${surroundValues(map.options.map(option => getValue(option)).join("/"))} ${translate("for")} ${mapNullableDefault(getListPrefix(translation), listPrefix => `${listPrefix} `, "")}${map.options
+    if (map.style?.kind === "Verbose") {
+        return map.options
+            .map(option => {
+            const value = getValue(option);
+            const optionTranslation = translateMap(option.translations);
+            return `${surroundValues(typeof value === "number" ? value.toFixed() : value)} ${translate("for")} ${mapNullableDefault(mapNullable(translation, getListPrefix), listPrefix => `${listPrefix} `, "")}${optionTranslation === undefined ? MISSING_VALUE : getLabel(optionTranslation)}${mapNullableDefault(mapNullable(translation, getListSuffix), listSuffix => ` ${listSuffix}`, "")}${moreToAppend
+                .filter(isNotNullish)
+                .map(({ surround, getAdditionalValue }) => {
+                const additionalValue = optionTranslation === undefined
+                    ? MISSING_VALUE
+                    : getAdditionalValue(option, optionTranslation);
+                return surround(typeof additionalValue === "number" ? additionalValue.toFixed() : additionalValue);
+            })
+                .join("")}`;
+        })
+            .join(", ");
+    }
+    return `${surroundValues(map.options.map(option => getValue(option)).join("/"))} ${translate("for")} ${mapNullableDefault(mapNullable(translation, getListPrefix), listPrefix => `${listPrefix} `, "")}${map.options
         .map(option => {
         const optionTranslation = translateMap(option.translations);
         if (optionTranslation === undefined) {
@@ -23,7 +37,7 @@ export const renderMap = (translate, translateMap, map, getValue, surroundValues
         }
         return getLabel(optionTranslation);
     })
-        .join("/")}${mapNullableDefault(getListSuffix(translation), listSuffix => ` ${listSuffix}`, "")}${moreToAppend
+        .join("/")}${mapNullableDefault(mapNullable(translation, getListSuffix), listSuffix => ` ${listSuffix}`, "")}${moreToAppend
         .filter(isNotNullish)
         .map(({ surround, getAdditionalValue }) => surround(map.options
         .map(option => {
@@ -39,5 +53,4 @@ export const renderMap = (translate, translateMap, map, getValue, surroundValues
 /**
  * Renders a map of options to a string.
  */
-export const renderResponsiveMap = (map, getValue, surroundValues, ...moreToAppend) => Reader.asks(({ translate, translateMap, responsiveTextSize }) => renderMap(translate, translateMap, map, getValue, surroundValues, translation => getResponsiveTextOptional(translation.label, responsiveTextSize) ??
-    translation.label.full, translation => mapNullable(translation.listPrefix ?? translation.list_prepend, text => getResponsiveTextOptional(text, responsiveTextSize)), translation => mapNullable(translation.listSuffix ?? translation.list_append, text => getResponsiveTextOptional(text, responsiveTextSize)), translation => mapNullable(translation.replacement, text => getResponsiveTextOptional(text, responsiveTextSize)), ...moreToAppend));
+export const renderResponsiveMap = (map, getValue, surroundValues, ...moreToAppend) => Reader.asks(({ translate, translateMap, responsiveTextSize }) => renderMap(translate, translateMap, map, getValue, surroundValues, translation => getResponsiveTextOptional(translation.label, responsiveTextSize) ?? translation.label.full, translation => mapNullable(translation.listPrefix ?? translation.list_prepend, text => getResponsiveTextOptional(text, responsiveTextSize)), translation => mapNullable(translation.listSuffix ?? translation.list_append, text => getResponsiveTextOptional(text, responsiveTextSize)), translation => mapNullable(translation.replacement, text => getResponsiveTextOptional(text, responsiveTextSize)), ...moreToAppend));

package/lib/entities/partial/mathOperation.js

@@ -1,45 +1,44 @@
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
+const printOperand = (operand) => typeof operand === "number" ? operand.toFixed() : operand;
 /**
  * Typographic formatter for addition.
  */
 export const additionFormatter = (left, right) => 
 // eslint-disable-next-line no-irregular-whitespace
-`${left} + ${right}`;
+`${printOperand(left)} + ${printOperand(right)}`;
 /**
  * Typographic formatter for subtraction.
  */
 export const subtractionFormatter = (left, right) => 
 // eslint-disable-next-line no-irregular-whitespace
-`${left} − ${right}`;
+`${printOperand(left)} − ${printOperand(right)}`;
 /**
  * Typographic formatter for multiplication.
  */
 export const multiplicationFormatter = (left, right) => 
 // eslint-disable-next-line no-irregular-whitespace
-`${left} × ${right}`;
+`${printOperand(left)} × ${printOperand(right)}`;
 /**
  * Typographic formatter for division.
  */
 export const divisionFormatter = (left, right) => 
 // eslint-disable-next-line no-irregular-whitespace
-`${left} / ${right}`;
+`${printOperand(left)} / ${printOperand(right)}`;
 /**
  * Typographic formatter for exponentiation. Uses Markdown syntax.
  */
-export const exponentiationFormatter = (left, right) => `${left}^${right}^`;
+export const exponentiationFormatter = (left, right) => `${printOperand(left)}^${printOperand(right)}^`;
 /**
  * Typographic formatter for grouping (parentheses).
  */
-export const groupFormatter = value => `(${value})`;
+export const groupFormatter = value => `(${printOperand(value)})`;
 /**
  * Render a math operation as a string, using the provided function to render the values.
  */
 export const renderMathOperation = (operation, renderValue) => {
     const renderWithParenthesis = (op, addParenthesisTo = []) => {
         const rendered = renderMathOperation(op, renderValue);
-        return addParenthesisTo.includes(op.kind)
-            ? groupFormatter(rendered)
-            : rendered;
+        return addParenthesisTo.includes(op.kind) ? groupFormatter(rendered) : rendered;
     };
     const renderBinary = ([left, right], options) => options.formatter(renderWithParenthesis(left, options.addParenthesisTo), renderWithParenthesis(right, options.addParenthesisToRight ?? options.addParenthesisTo));
     switch (operation.kind) {
@@ -79,23 +78,19 @@ export const evaluateMathOperation = (operation, evaluateValue) => {
             return evaluateValue(operation.Value);
         case "Addition": {
             const [left, right] = operation.Addition;
-            return (evaluateMathOperation(left, evaluateValue) +
-                evaluateMathOperation(right, evaluateValue));
+            return (evaluateMathOperation(left, evaluateValue) + evaluateMathOperation(right, evaluateValue));
         }
         case "Subtraction": {
             const [left, right] = operation.Subtraction;
-            return (evaluateMathOperation(left, evaluateValue) -
-                evaluateMathOperation(right, evaluateValue));
+            return (evaluateMathOperation(left, evaluateValue) - evaluateMathOperation(right, evaluateValue));
         }
         case "Multiplication": {
             const [left, right] = operation.Multiplication;
-            return (evaluateMathOperation(left, evaluateValue) *
-                evaluateMathOperation(right, evaluateValue));
+            return (evaluateMathOperation(left, evaluateValue) * evaluateMathOperation(right, evaluateValue));
         }
         case "Division": {
             const [left, right] = operation.Division;
-            return (evaluateMathOperation(left, evaluateValue) /
-                evaluateMathOperation(right, evaluateValue));
+            return (evaluateMathOperation(left, evaluateValue) / evaluateMathOperation(right, evaluateValue));
         }
         case "Exponentiation": {
             const [left, right] = operation.Exponentiation;

package/lib/entities/partial/prerequisites/displayOption.d.ts

@@ -1,6 +1,6 @@
-import { DisplayOption } from "optolith-database-schema/gen";
+import type { DisplayOption } from "optolith-database-schema/gen";
 import type { TranslateMap } from "../../../helpers/translate.js";
-import { PrerequisitePart } from "./part.js";
+import type { PrerequisitePart } from "./part.js";
 /**
  * Get the translation of a display option.
  */

package/lib/entities/partial/prerequisites/index.d.ts

@@ -1,7 +1,7 @@
-import { AdvantageDisadvantagePrerequisites, AnimistPowerPrerequisites, ArcaneTraditionPrerequisites, DerivedCharacteristicPrerequisites, EnhancementPrerequisites, GeneralPrerequisites, GeodeRitualPrerequisites, InfluencePrerequisites, LanguagePrerequisites, LiturgyPrerequisites, PersonalityTraitPrerequisites, PlainGeneralPrerequisites, ProfessionPrerequisites, PublicationPrerequisites, SpecialAbilityIdentifier, SpellworkPrerequisites, type ActivatableIdentifier, type RatedIdentifier } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisites, AnimistPowerPrerequisites, ArcaneTraditionPrerequisites, DerivedCharacteristicPrerequisites, EnhancementPrerequisites, GeneralPrerequisites, GeodeRitualPrerequisites, InfluencePrerequisites, LanguagePrerequisites, LiturgyPrerequisites, PersonalityTraitPrerequisites, PlainGeneralPrerequisites, ProfessionPrerequisites, PublicationPrerequisites, RatedIdentifier, SpecialAbilityIdentifier, SpellworkPrerequisites } from "optolith-database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../../../helpers/getTypes.js";
-import { LocaleEnvironment } from "../../../helpers/locale.js";
-import { GetResolvedSelectOptionById } from "./single/activatable.js";
+import type { LocaleEnvironment } from "../../../helpers/locale.js";
+import type { GetResolvedSelectOptionById } from "./single/activatable.js";
 /**
  * Print derived characteristic prerequisites as a string.
  */

package/lib/entities/partial/prerequisites/index.js

@@ -1,3 +1,4 @@
+import { isNotEmpty } from "@elyukai/utils/array/nonEmpty";
 import { on } from "@elyukai/utils/function";
 import { mapNullable } from "@elyukai/utils/nullable";
 import { numAsc } from "@optolith/helpers/compare";
@@ -18,12 +19,14 @@ const printPrerequisitesDisjunction = (getPrerequisiteTranslation, locale, disju
     if (disjunction.display_option !== undefined) {
         return printDisplayOption(locale.translateMap, disjunction.display_option);
     }
-    const [first, ...other] = disjunction.list.map(getPrerequisiteTranslation).filter(isNotNullish);
+    const { list: disjunctionList } = disjunction;
+    const [first, ...other] = disjunctionList.map(getPrerequisiteTranslation).filter(isNotNullish);
     if (first === undefined) {
         return undefined;
     }
-    if (disjunction.list.length < 2 ||
-        disjunction.list.slice(1).every(part => part.kind === disjunction.list[0].kind)) {
+    if (disjunctionList.length < 2 ||
+        (isNotEmpty(disjunctionList) &&
+            disjunctionList.slice(1).every(part => part.kind === disjunctionList[0].kind))) {
         return {
             label: first.label,
             value: hasPartValueObject(first) && other.every(hasPartValueObject)
@@ -36,7 +39,10 @@ const printPrerequisitesDisjunction = (getPrerequisiteTranslation, locale, disju
         };
     }
     return {
-        value: locale.join([first, ...other].map(part => (part.label ?? "") + part.value), "disjunction"),
+        value: locale.join([first, ...other].map(part => (part.label ?? "") +
+            (typeof part.value === "string"
+                ? part.value
+                : renderActivatableNameComponents(locale.translateMap, part.value, true))), "disjunction"),
         sentenceType: undefined,
         isMeta: false,
     };

package/lib/entities/partial/prerequisites/part.d.ts

@@ -1,4 +1,4 @@
-import { SentenceType } from "optolith-database-schema/gen";
+import type { SentenceType } from "optolith-database-schema/gen";
 import type { LocaleCompare } from "../../../helpers/locale.js";
 import type { Translate, TranslateMap } from "../../../helpers/translate.js";
 import { type ActivatableNameComponents } from "../activatableNameChunks.js";