@optolith/entity-descriptions 0.4.0 → 0.4.2

package/lib/entities/curriculum.js

@@ -19,8 +19,8 @@ const renderElectiveSpellworks = (translate, translateMap, localeCompare, getIns
                     return name;
                 }
                 return (name +
-                    parensIf(translateMap(getInstanceById("Element", item.restriction.Element)
-                        ?.translations)?.name ?? MISSING_VALUE));
+                    parensIf(translateMap(getInstanceById("Element", item.restriction.Element)?.translations)
+                        ?.name ?? MISSING_VALUE));
             }))
                 .filter(isNotNullish)
                 .toSorted(localeCompare)
@@ -32,11 +32,9 @@ const renderElectiveSpellworks = (translate, translateMap, localeCompare, getIns
 const renderRestrictedSpellworks = (translate, translateMap, localeCompare, localeJoin, getInstanceById, restrictedSpellworks) => {
     const restrictedGroups = Dictionary.groupBy(restrictedSpellworks, restriction => restriction.kind === "Spellwork"
         ? "spellwork"
-        : restriction.kind === "Property" &&
-            restriction.Property.maximum !== undefined
+        : restriction.kind === "Property" && restriction.Property.maximum !== undefined
             ? "restrictedProperty"
-            : restriction.kind === "Property" ||
-                restriction.kind === "DemonSummoning"
+            : restriction.kind === "Property" || restriction.kind === "DemonSummoning"
                 ? "property"
                 : "other");
     const addExclusion = (excludedSpellworks) => {
@@ -55,16 +53,16 @@ const renderRestrictedSpellworks = (translate, translateMap, localeCompare, loca
     };
     const restrictedProperties = restrictedGroups.get("restrictedProperty")?.map(restriction => translate(".input {$count :number} {{only {$count} additional spellworks with the Property {$property}}}", {
         count: restriction.Property.maximum,
-        property: translateMap(getInstanceById("Property", restriction.Property.id)
-            ?.translations)?.name ?? MISSING_VALUE,
+        property: translateMap(getInstanceById("Property", restriction.Property.id)?.translations)
+            ?.name ?? MISSING_VALUE,
     }) + addExclusion(restriction.Property.exclude)) ?? [];
     const propertyGroup = restrictedGroups.get("property");
     const translatedProperties = propertyGroup
         ?.map(restriction => {
         switch (restriction.kind) {
             case "Property":
-                return translateMap(getInstanceById("Property", restriction.Property.id)
-                    ?.translations)?.name;
+                return translateMap(getInstanceById("Property", restriction.Property.id)?.translations)
+                    ?.name;
             case "DemonSummoning":
                 return translate("Demon Summoning");
             default:
@@ -82,8 +80,7 @@ const renderRestrictedSpellworks = (translate, translateMap, localeCompare, loca
         : [];
     const spellworkGroup = restrictedGroups.get("spellwork");
     const translatedSpellworks = spellworkGroup
-        ?.map(restriction => translateMap(getInstanceById(restriction.Spellwork)?.translations)
-        ?.name)
+        ?.map(restriction => translateMap(getInstanceById(restriction.Spellwork)?.translations)?.name)
         .filter(isNotNullish)
         .toSorted(localeCompare) ?? [];
     const spellworks = translatedSpellworks.length > 0
@@ -104,29 +101,26 @@ const renderRestrictedSpellworks = (translate, translateMap, localeCompare, loca
                 return assertExhaustive(restriction);
         }
     }) ?? [];
-    return [
-        ...restrictedProperties,
-        ...properties,
-        ...others,
-        ...spellworks,
-    ].join("; ");
+    return [...restrictedProperties, ...properties, ...others, ...spellworks].join("; ");
 };
-const renderSpellworkAdjustment = (translateMap, getInstanceById, adjustment) => `${translateMap(getInstanceById(adjustment.id)?.translations)?.name ??
-    MISSING_VALUE} ${adjustment.points}${parensIf(adjustment.tradition === undefined
+const renderSpellworkAdjustment = (translateMap, getInstanceById, adjustment) => `${translateMap(getInstanceById(adjustment.id)?.translations)?.name ?? MISSING_VALUE} ${adjustment.points.toFixed()}${parensIf(adjustment.tradition === undefined
     ? undefined
-    : translateMap(getInstanceById("MagicalTradition", adjustment.tradition)
-        ?.translations)?.name)}`;
+    : translateMap(getInstanceById("MagicalTradition", adjustment.tradition)?.translations)?.name)}`;
 const renderAbilityAdjustmentName = (translateMap, getInstanceById, abilityAdjustment) => {
     switch (abilityAdjustment.kind) {
         case "Skill":
-            return (translateMap(getInstanceById("Skill", abilityAdjustment.Skill.id)?.translations)?.name ?? MISSING_VALUE);
+            return (translateMap(getInstanceById("Skill", abilityAdjustment.Skill.id)?.translations)?.name ??
+                MISSING_VALUE);
         case "CombatTechnique":
-            return (translateMap(getInstanceById(abilityAdjustment.CombatTechnique.id)?.translations)?.name ?? MISSING_VALUE);
+            return (translateMap(getInstanceById(abilityAdjustment.CombatTechnique.id)?.translations)?.name ??
+                MISSING_VALUE);
         case "Spellwork":
-            return ((translateMap(getInstanceById(abilityAdjustment.Spellwork.id)?.translations)?.name ?? MISSING_VALUE) +
+            return ((translateMap(getInstanceById(abilityAdjustment.Spellwork.id)?.translations)?.name ??
+                MISSING_VALUE) +
                 parensIf(abilityAdjustment.Spellwork.tradition === undefined
                     ? undefined
-                    : translateMap(getInstanceById("MagicalTradition", abilityAdjustment.Spellwork.tradition)?.translations)?.name));
+                    : translateMap(getInstanceById("MagicalTradition", abilityAdjustment.Spellwork.tradition)
+                        ?.translations)?.name));
         default:
             return assertExhaustive(abilityAdjustment);
     }
@@ -134,7 +128,8 @@ const renderAbilityAdjustmentName = (translateMap, getInstanceById, abilityAdjus
 const renderAbilityAdjustmentBaseValue = (baseProfessionPackage, abilityAdjustment) => {
     switch (abilityAdjustment.kind) {
         case "Skill":
-            return baseProfessionPackage.skills?.find(skill => skill.id === abilityAdjustment.Skill.id)?.rating_modifier;
+            return baseProfessionPackage.skills?.find(skill => skill.id === abilityAdjustment.Skill.id)
+                ?.rating_modifier;
         case "CombatTechnique":
             return baseProfessionPackage.combat_techniques?.find(skill => deepEqual(skill.id, abilityAdjustment.CombatTechnique.id))?.rating_modifier;
         case "Spellwork":
@@ -171,16 +166,17 @@ const renderAbilityAdjustmentDefaultValue = (abilityAdjustment) => {
 const renderAbilityAdjustment = (translate, translateMap, getInstanceById, baseProfessionPackage) => baseProfessionPackage === undefined
     ? abilityAdjustment => `${renderAbilityAdjustmentName(translateMap, getInstanceById, abilityAdjustment)} ${sign(renderAbilityAdjustmentModifierValue(abilityAdjustment))}`
     : abilityAdjustment => {
-        const basePoints = (renderAbilityAdjustmentBaseValue(baseProfessionPackage, abilityAdjustment) ?? 0) + renderAbilityAdjustmentDefaultValue(abilityAdjustment);
+        const basePoints = (renderAbilityAdjustmentBaseValue(baseProfessionPackage, abilityAdjustment) ?? 0) +
+            renderAbilityAdjustmentDefaultValue(abilityAdjustment);
         return translate("{$replacement} instead of {$base}", {
             base: basePoints,
-            replacement: `${renderAbilityAdjustmentName(translateMap, getInstanceById, abilityAdjustment)} ${basePoints + renderAbilityAdjustmentModifierValue(abilityAdjustment)}`,
+            replacement: `${renderAbilityAdjustmentName(translateMap, getInstanceById, abilityAdjustment)} ${(basePoints + renderAbilityAdjustmentModifierValue(abilityAdjustment)).toFixed()}`,
         });
     };
 const renderAbilityAdjustments = (translate, translateMap, localeCompare, getInstanceById, baseProfessionPackage, list) => list
-    ?.map(renderAbilityAdjustment(translate, translateMap, getInstanceById, baseProfessionPackage))
+    .map(renderAbilityAdjustment(translate, translateMap, getInstanceById, baseProfessionPackage))
     .toSorted(localeCompare)
-    .join(", ") ?? translate("none");
+    .join(", ");
 /**
  * Get a JSON representation of the rules text for a curriculum.
  */
@@ -199,7 +195,8 @@ export const getCurriculumEntityDescription = createEntityDescriptionCreator(({
                 items: [
                     {
                         label: translate("Guideline"),
-                        value: translateMap(getInstanceById("Guideline", entry.guideline)?.translations)?.name ?? MISSING_VALUE,
+                        value: translateMap(getInstanceById("Guideline", entry.guideline)?.translations)?.name ??
+                            MISSING_VALUE,
                     },
                     {
                         label: translate("Elective Spellworks Package"),
@@ -237,7 +234,7 @@ export const getCurriculumEntityDescription = createEntityDescriptionCreator(({
                         items: [
                             {
                                 label: translate("Spellwork Changes"),
-                                value: lessonPackageTranslation?.spellwork_changes ??
+                                value: lessonPackageTranslation.spellwork_changes ??
                                     lessonPackage.content.spellwork_changes
                                         ?.map(change => translate("{$replacement} instead of {$base}", {
                                         base: renderSpellworkAdjustment(translateMap, getInstanceById, change.base),

package/lib/entities/derivedCharacteristic.js

@@ -34,7 +34,7 @@ const getRaceBaseValue = (translate, translateMap, getInstanceById, idMap, raceB
 const renderBaseCalculation = (getInstanceById, translate, translateMap, idMap, calculation, style = "full") => renderMathOperation(calculation, value => {
     switch (value.kind) {
         case "Constant":
-            return value.Constant.toString(10);
+            return value.Constant.toFixed();
         case "Attribute":
             return getAttribute(getInstanceById, translateMap, value.Attribute, style);
         case "RaceBaseValue":
@@ -87,5 +87,6 @@ export const getDerivedCharacteristicEntityDescription = createEntityDescription
                 ],
             },
         ],
+        references: entry.src,
     };
 });

package/lib/entities/disease.js

@@ -2,7 +2,7 @@ import { ensureNonEmpty } from "@elyukai/utils/array/nonEmpty";
 import { isNotNullish } from "@elyukai/utils/nullable";
 import { createEntityDescriptionCreator } from "../creator.js";
 import { renderAnimalTypesSection } from "./partial/animalTypes.js";
-import { renderAlternativeNames, renderChance, renderResistance, } from "./partial/herbary.js";
+import { renderAlternativeNames, renderChance, renderResistance } from "./partial/herbary.js";
 import { parensIf } from "./partial/rated/activatable/parensIf.js";
 import { MISSING_VALUE } from "./partial/unknown.js";
 const renderCauses = (translate, translateMap, causes) => causes
@@ -12,10 +12,7 @@ const renderCauses = (translate, translateMap, causes) => causes
         return MISSING_VALUE;
     }
     return (causeTranslation.name +
-        parensIf(ensureNonEmpty([
-            renderChance(translate, translateMap, cause, true),
-            causeTranslation.note,
-        ].filter(isNotNullish))?.join("; ")));
+        parensIf(ensureNonEmpty([renderChance(translate, translateMap, cause, true), causeTranslation.note].filter(isNotNullish))?.join("; ")));
 })
     .join(", ");
 /**
@@ -35,7 +32,7 @@ export const getDiseaseEntityDescription = createEntityDescriptionCreator(({ get
                 type: "definitionList",
                 items: [
                     renderAlternativeNames(translate, translation.alternative_names),
-                    { label: translate("Level"), value: baseEntry.level.toString() },
+                    { label: translate("Level"), value: baseEntry.level.toFixed() },
                     { label: translate("Progress"), value: translation.progress },
                     {
                         label: translate("Resistance"),

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/liturgicalChant.js

@@ -5,7 +5,7 @@ import { createEntityDescriptionCreator } from "../creator.js";
 import { renderEnhancements } from "./partial/enhancements.js";
 import { renderOneTimeDuration } from "./partial/rated/activatable/duration.js";
 import { renderEffect } from "./partial/rated/activatable/effect.js";
-import { renderFastPerformanceParameters, renderSlowPerformanceParameters, } from "./partial/rated/activatable/index.js";
+import { combineGeneratedTextWithStaticTranslation, renderFastPerformanceParameters, renderSlowPerformanceParameters, } from "./partial/rated/activatable/index.js";
 import { ModifiableParameter } from "./partial/rated/activatable/nonModifiableSuffix.js";
 import { renderNonModifiableRange } from "./partial/rated/activatable/range.js";
 import { renderTargetCategory } from "./partial/rated/activatable/targetCategory.js";
@@ -73,16 +73,8 @@ export const getBlessingEntityDescription = createEntityDescriptionCreator(({ ge
                         label: translate("Effect"),
                         value: translation.effect,
                     },
-                    {
-                        label: translate("Range"),
-                        value: range !== translation.range ? `***${range}*** (${translation.range})` : range,
-                    },
-                    {
-                        label: translate("Duration"),
-                        value: duration !== translation.duration
-                            ? `***${duration}*** (${translation.duration})`
-                            : duration,
-                    },
+                    combineGeneratedTextWithStaticTranslation(translate("Range"), range, translation.range),
+                    combineGeneratedTextWithStaticTranslation(translate("Duration"), duration, translation.duration),
                     renderTargetCategory(entry.target).run(env),
                 ],
             },
@@ -132,30 +124,10 @@ export const getLiturgicalChantEntityDescription = createEntityDescriptionCreato
                 items: [
                     renderSkillCheckWithPenalty(entry.check, entry.check_penalty, idMap).run(env),
                     renderEffect(translation.effect).run(env),
-                    {
-                        label: translate("Liturgical Time"),
-                        value: translation.casting_time && castingTime !== translation.casting_time.full
-                            ? `***${castingTime}*** (${translation.casting_time.full})`
-                            : castingTime,
-                    },
-                    {
-                        label: translate("KP Cost"),
-                        value: translation.cost && cost !== translation.cost.full
-                            ? `***${cost}*** (${translation.cost.full})`
-                            : cost,
-                    },
-                    {
-                        label: translate("Range"),
-                        value: translation.range && range !== translation.range.full
-                            ? `***${range}*** (${translation.range.full})`
-                            : range,
-                    },
-                    {
-                        label: translate("Duration"),
-                        value: translation.duration && duration !== translation.duration.full
-                            ? `***${duration}*** (${translation.duration.full})`
-                            : duration,
-                    },
+                    combineGeneratedTextWithStaticTranslation(translate("Liturgical Time"), castingTime, translation.casting_time),
+                    combineGeneratedTextWithStaticTranslation(translate("KP Cost"), cost, translation.cost),
+                    combineGeneratedTextWithStaticTranslation(translate("Range"), range, translation.range),
+                    combineGeneratedTextWithStaticTranslation(translate("Duration"), duration, translation.duration),
                     renderTargetCategory(entry.target).run(env),
                     getTextForTraditions({
                         translate,
@@ -213,30 +185,10 @@ export const getCeremonyEntityDescription = createEntityDescriptionCreator(({ ge
                 items: [
                     renderSkillCheckWithPenalty(entry.check, entry.check_penalty, idMap).run(env),
                     renderEffect(translation.effect).run(env),
-                    {
-                        label: translate("Ceremonial Time"),
-                        value: translation.casting_time && castingTime !== translation.casting_time.full
-                            ? `***${castingTime}*** (${translation.casting_time.full})`
-                            : castingTime,
-                    },
-                    {
-                        label: translate("KP Cost"),
-                        value: translation.cost && cost !== translation.cost.full
-                            ? `***${cost}*** (${translation.cost.full})`
-                            : cost,
-                    },
-                    {
-                        label: translate("Range"),
-                        value: translation.range && range !== translation.range.full
-                            ? `***${range}*** (${translation.range.full})`
-                            : range,
-                    },
-                    {
-                        label: translate("Duration"),
-                        value: translation.duration && duration !== translation.duration.full
-                            ? `***${duration}*** (${translation.duration.full})`
-                            : duration,
-                    },
+                    combineGeneratedTextWithStaticTranslation(translate("Ceremonial Time"), castingTime, translation.casting_time),
+                    combineGeneratedTextWithStaticTranslation(translate("KP Cost"), cost, translation.cost),
+                    combineGeneratedTextWithStaticTranslation(translate("Range"), range, translation.range),
+                    combineGeneratedTextWithStaticTranslation(translate("Duration"), duration, translation.duration),
                     renderTargetCategory(entry.target).run(env),
                     getTextForTraditions({
                         translate,

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";
 /**