@optolith/entity-descriptions 0.4.0 → 0.4.2

package/lib/entities/partial/prerequisites/single/socialStatus.d.ts

@@ -1,7 +1,7 @@
 import type { SocialStatusPrerequisite } from "optolith-database-schema/gen";
-import { type GetInstanceById } from "../../../../helpers/getTypes.js";
-import { LocaleEnvironment } from "../../../../helpers/locale.js";
-import { PrerequisitePart } from "../part.js";
+import type { GetInstanceById } from "../../../../helpers/getTypes.js";
+import type { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a social status prerequisite.
  */

package/lib/entities/partial/prerequisites/single/state.d.ts

@@ -1,7 +1,7 @@
-import { StatePrerequisite } from "optolith-database-schema/gen";
-import { type GetInstanceById } from "../../../../helpers/getTypes.js";
-import { LocaleEnvironment } from "../../../../helpers/locale.js";
-import { PrerequisitePart } from "../part.js";
+import type { StatePrerequisite } from "optolith-database-schema/gen";
+import type { GetInstanceById } from "../../../../helpers/getTypes.js";
+import type { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a state prerequisite.
  */

package/lib/entities/partial/prerequisites/single/text.d.ts

@@ -1,6 +1,6 @@
-import { TextPrerequisite } from "optolith-database-schema/gen";
-import { LocaleEnvironment } from "../../../../helpers/locale.js";
-import { PrerequisitePart } from "../part.js";
+import type { TextPrerequisite } from "optolith-database-schema/gen";
+import type { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a text prerequisite.
  */

package/lib/entities/partial/rated/activatable/castingTime.d.ts

@@ -1,4 +1,4 @@
-import { CastingTime, FastCastingTime, FastSkillNonModifiableCastingTime, SlowCastingTime, SlowSkillNonModifiableCastingTime } from "optolith-database-schema/gen";
+import type { CastingTime, FastCastingTime, FastSkillNonModifiableCastingTime, SlowCastingTime, SlowSkillNonModifiableCastingTime } from "optolith-database-schema/gen";
 import { type StdReader } from "../../reader.js";
 /**
  * Renders the text for a non-modifiable casting time of a fast activatable skill.

package/lib/entities/partial/rated/activatable/castingTime.js

@@ -2,17 +2,15 @@ import { Reader } from "@elyukai/utils/reader";
 import { isNotNullish, mapNullable } from "@optolith/helpers/nullable";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { Case } from "../../../../helpers/enums.js";
-import { getInstanceByIdFnR, modifiableBySpeedR, } from "../../reader.js";
-import { formatCombinedTimeSpanR, formatTimeSpanR, } from "../../units/timeSpan.js";
+import { getInstanceByIdFnR, modifiableBySpeedR } from "../../reader.js";
+import { formatCombinedTimeSpanR, formatTimeSpanR } from "../../units/timeSpan.js";
 import { MISSING_VALUE } from "../../unknown.js";
-import { appendNonModifiableSuffix, ModifiableParameter, } from "./nonModifiableSuffix.js";
+import { appendNonModifiableSuffix, ModifiableParameter } from "./nonModifiableSuffix.js";
 import { Speed } from "./speed.js";
 const deriveModifiableCastingTime = (modificationLevelId) => getInstanceByIdFnR().thenW(getInstanceById => mapNullable(getInstanceById("SkillModificationLevel", modificationLevelId), modificationLevel => modifiableBySpeedR("casting_time", modificationLevel).map(castingTime => typeof castingTime === "number"
     ? { value: castingTime, unit: Case("Actions") }
     : castingTime)) ?? Reader.of(undefined));
-const renderModifiableCastingTime = (value) => deriveModifiableCastingTime(value.initial_modification_level).thenW(castingTime => castingTime === undefined
-    ? Reader.of(MISSING_VALUE)
-    : formatCombinedTimeSpanR(castingTime));
+const renderModifiableCastingTime = (value) => deriveModifiableCastingTime(value.initial_modification_level).thenW(castingTime => castingTime === undefined ? Reader.of(MISSING_VALUE) : formatCombinedTimeSpanR(castingTime));
 const renderCastingTimeDuringLovemaking = (value) => formatCombinedTimeSpanR(value);
 /**
  * Renders the text for a non-modifiable casting time of a fast activatable skill.
@@ -36,9 +34,9 @@ export const renderCastingTime = (renderNonModifiableCastingTime, value) => {
     }
 };
 const renderCastingTimeIncludingLovemaking = (renderNonModifiableCastingTime, value) => Reader.sequence([
-    mapNullable(value.default, def => renderCastingTime(renderNonModifiableCastingTime, def)) ?? Reader.of(undefined),
-    mapNullable(value.during_lovemaking, renderCastingTimeDuringLovemaking) ??
+    mapNullable(value.default, def => renderCastingTime(renderNonModifiableCastingTime, def)) ??
         Reader.of(undefined),
+    mapNullable(value.during_lovemaking, renderCastingTimeDuringLovemaking) ?? Reader.of(undefined),
 ]).map(texts => texts.filter(isNotNullish).join(" / "));
 /**
  * Get the text for the casting time of a fast activatable skill.

package/lib/entities/partial/rated/activatable/cost.d.ts

@@ -1,5 +1,5 @@
 import { Reader } from "@elyukai/utils/reader";
-import { NonModifiableSustainedCost, OneTimeCost, SustainedCost, type CheckResultBasedModifier, type DurationUnitValue, type ElvenMagicalSongPermanentCost, type FirstPersonMagicalMelodyCost, type NonModifiableOneTimeCostPerCountable, type OneTimeCostMap, type ResponsiveText, type ResponsiveTextOptional, type ResponsiveTextReplace, type SkillModificationLevel_ID } from "optolith-database-schema/gen";
+import type { CheckResultBasedModifier, DurationUnitValue, ElvenMagicalSongPermanentCost, FirstPersonMagicalMelodyCost, NonModifiableOneTimeCostPerCountable, NonModifiableSustainedCost, OneTimeCost, OneTimeCostMap, ResponsiveText, ResponsiveTextOptional, ResponsiveTextReplace, SkillModificationLevel_ID, SustainedCost } from "optolith-database-schema/gen";
 import { type LocaleMap } from "../../../../helpers/translate.js";
 import { type StdEnv, type StdReader } from "../../reader.js";
 /**

package/lib/entities/partial/rated/activatable/cost.js

@@ -3,14 +3,13 @@ import { Reader } from "@elyukai/utils/reader";
 import { mapNullable } from "@optolith/helpers/nullable";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { renderResponsiveMap } from "../../map.js";
-import { additionFormatter } from "../../mathOperation.js";
 import { formatEnergyFnR, formatEnergyR, getInstanceByIdFnR, modifiableBySpeedR, responsiveLocaleJoinR, responsiveR, responsiveTextR, responsiveTranslateR, translateMapR, translateR, } from "../../reader.js";
-import { appendNoteIfNeeded, replaceTextIfNeeded, } from "../../responsiveText.js";
+import { appendNoteIfNeeded, replaceTextIfNeeded } from "../../responsiveText.js";
 import { formatCombinedTimeSpanR } from "../../units/timeSpan.js";
 import { MISSING_VALUE } from "../../unknown.js";
 import { appendCheckResultModifier } from "./checkResultBased.js";
 import { wrapIfMinimum } from "./isMinimumMaximum.js";
-import { appendNonModifiableSuffix, ModifiableParameter, } from "./nonModifiableSuffix.js";
+import { appendNonModifiableSuffix, ModifiableParameter } from "./nonModifiableSuffix.js";
 const deriveModifiableCost = (modificationLevelId) => getInstanceByIdFnR().thenW(getInstanceById => mapNullable(getInstanceById("SkillModificationLevel", modificationLevelId), modificationLevel => modifiableBySpeedR("cost", modificationLevel)) ?? Reader.of(undefined));
 const appendPerCountableToCostIfNeeded = (value, baseCost) => {
     if (value === undefined) {
@@ -22,7 +21,10 @@ const appendPerCountableToCostIfNeeded = (value, baseCost) => {
             return Reader.of(baseCost);
         }
         return responsiveTextR(translation.countable)
-            .thenW(countable => responsiveTranslateR("{$cost} per {$countable}", "{$cost}/{$countable}", { cost: baseCost, countable }))
+            .thenW(countable => responsiveTranslateR("{$cost} per {$countable}", "{$cost}/{$countable}", {
+            cost: baseCost,
+            countable,
+        }))
             .thenW(text => minimum_total === undefined
             ? Reader.of(text)
             : formatEnergyR(minimum_total).then(cost => translateR("{$baseCost}, minimum of {$value}", {
@@ -32,7 +34,9 @@ const appendPerCountableToCostIfNeeded = (value, baseCost) => {
     });
 };
 const appendPermanentCostIfNeeded = (permanentValue, baseCost) => mapNullable(permanentValue, value => responsiveTranslateR(".input {$value :number} {{, {$value} of which are permanent}}", " ({$value} perm.)", { value }).map(text => baseCost + text)) ?? Reader.of(baseCost);
-const appendElvenPermanentCostIfNeeded = (permanent, baseCost) => mapNullable(permanent, value => responsiveTranslateR(".input {$value :number} {{{$value} permanent AE}}", "{$value} pAE", { value: value.value })
+const appendElvenPermanentCostIfNeeded = (permanent, baseCost) => mapNullable(permanent, value => responsiveTranslateR(".input {$value :number} {{{$value} permanent AE}}", "{$value} pAE", {
+    value: value.value,
+})
     .thenW(text => replaceTextIfNeeded(value.translations, text))
     .map(text => baseCost + text)) ?? Reader.of(baseCost);
 const appendFamiliarsTrickLPCostIfNeeded = (lpValue, baseCost) => lpValue === undefined
@@ -51,11 +55,11 @@ export const renderModifiableOneTimeCost = (value) => deriveModifiableCost(value
         if (translation?.additional === undefined) {
             return Reader.of(text);
         }
-        return responsiveTextR(translation.additional).map(additional => additionFormatter(text, additional));
+        return responsiveTextR(translation.additional).map(additional => `${text} + ${additional}`);
     })));
 const appendIntervalToCost = (interval, baseCost) => interval === undefined
     ? Reader.of(baseCost)
-    : formatCombinedTimeSpanR(interval).then(formattedInterval => responsiveTranslateR("{$cost} per {$interval}", "{$cost}/{$interval}", {
+    : formatCombinedTimeSpanR(interval, true).then(formattedInterval => responsiveTranslateR("{$cost} per {$interval}", "{$cost}/{$interval}", {
         cost: baseCost,
         interval: formattedInterval,
     }));
@@ -72,7 +76,7 @@ export const renderNonModifiableOneTimeCost = (value, shouldAppendNonModifiableS
     .then(base => appendNoteIfNeeded(value.translations, base))
     .then(shouldAppendNonModifiableSuffix
     ? base => appendNonModifiableSuffix(ModifiableParameter.Cost, base)
-    : Reader.of);
+    : base => Reader.of(base));
 /**
  * Returns the text for the indefinite cost of an activatable skill.
  */
@@ -82,12 +86,10 @@ export const renderIndefiniteCost = (value, shouldAppendNonModifiableSuffix) =>
         .thenW(translation => translation === undefined
         ? Reader.of(MISSING_VALUE)
         : responsiveTextR(translation.description))
-        .map(modifier === undefined
-        ? identity
-        : base => appendCheckResultModifier(base, modifier))
+        .map(modifier === undefined ? identity : base => appendCheckResultModifier(base, modifier))
         .thenW(shouldAppendNonModifiableSuffix
         ? base => appendNonModifiableSuffix(ModifiableParameter.Cost, base)
-        : Reader.of);
+        : base => Reader.of(base));
 };
 const renderSingleOneTimeCost = (value) => {
     switch (value.kind) {
@@ -104,7 +106,7 @@ const renderSingleOneTimeCost = (value) => {
 const renderMultipleOneTimeCosts = (type, value) => {
     const appendNonModifiableIfRequested = !value.every(part => part.kind === "Modifiable")
         ? (text) => appendNonModifiableSuffix(ModifiableParameter.Cost, text)
-        : Reader.of;
+        : (text) => Reader.of(text);
     return Reader.sequence(value.map(renderSingleOneTimeCost))
         .thenW(list => responsiveLocaleJoinR(list, type))
         .then(text => appendNonModifiableIfRequested(text));
@@ -118,6 +120,7 @@ export const renderOneTimeCostMap = (value) => Reader.asks(({ translate }) => tr
         surround: values => translate(", {$value} of which are permanent", {
             value: values,
         }),
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- is checked beforehand
         getAdditionalValue: option => option.permanent_value,
     }
     : undefined))
@@ -145,7 +148,7 @@ export const renderOneTimeCost = (value) => {
 const buildSustainedCost = (activationCost, intervalCost, interval) => {
     const activationCostWithLabel = responsiveR(() => translateR("activation").map(label => `${activationCost} (${label})`), () => Reader.of(activationCost)).thenW(identity);
     const intervalCostWithLabel = appendIntervalToCost(interval, intervalCost);
-    return activationCostWithLabel.map2(intervalCostWithLabel, additionFormatter);
+    return activationCostWithLabel.map2(intervalCostWithLabel, (activationStr, intervalStr) => `${activationStr} + ${intervalStr}`);
 };
 const renderModifiableSustainedCost = (value) => deriveModifiableCost(value.initial_modification_level).thenW(cost => cost === undefined
     ? Reader.of(MISSING_VALUE)

package/lib/entities/partial/rated/activatable/duration.js

@@ -3,7 +3,7 @@ import { mapNullable } from "@optolith/helpers/nullable";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { responsiveTextR, responsiveTranslateR, translateMapR, translateR, } from "../../reader.js";
 import { replaceTextIfNeeded } from "../../responsiveText.js";
-import { formatCombinedTimeSpanR, formatTimeSpanR, } from "../../units/timeSpan.js";
+import { formatCombinedTimeSpanR, formatTimeSpanR } from "../../units/timeSpan.js";
 import { MISSING_VALUE } from "../../unknown.js";
 import { renderCheckResultBasedValue } from "./checkResultBased.js";
 import { wrapAsMaximum, wrapIfMaximum } from "./isMinimumMaximum.js";
@@ -15,8 +15,8 @@ const renderImmediateDuration = (value) => translateR("Immediate")
     .thenW(text => replaceTextIfNeeded(value?.translations, text));
 const renderPermanentDuration = (value) => translateR("Permanent").thenW(text => replaceTextIfNeeded(value.translations, text));
 const renderFixedDuration = (value) => formatCombinedTimeSpanR(value)
-    .then(text => wrapIfMaximum(value.is_maximum, text))
-    .thenW(text => replaceTextIfNeeded(value.translations, text));
+    .then(text => wrapIfMaximum(value.is_maximum, text).map(wrapped => [wrapped, text]))
+    .thenW(([wrapped, text]) => replaceTextIfNeeded(value.translations, wrapped, text));
 /**
  * Renders a duration that is based on the result of the skill check.
  */
@@ -30,7 +30,7 @@ const renderIndefiniteDuration = (value) => {
         ? responsiveTextR(translation.description)
         : Reader.of(translation?.description ?? MISSING_VALUE))
         .thenW(maximum === undefined
-        ? Reader.of
+        ? text => Reader.of(text)
         : text => 
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         renderOneTimeDuration(maximum).then(maximumText => translateR("{$defaultDuration}, but no more than {$maximumDuration}", {

package/lib/entities/partial/rated/activatable/effect.js

@@ -37,7 +37,7 @@ export const renderEffect = (effect) => {
         case "ForEachQualityLevel":
             return getContentPartsForQualityLevels(index => index + 1, effect.ForEachQualityLevel);
         case "ForEachTwoQualityLevels":
-            return getContentPartsForQualityLevels(index => `${index * 2 + 1}–${index * 2 + 2}`, effect.ForEachTwoQualityLevels);
+            return getContentPartsForQualityLevels(index => `${(index * 2 + 1).toFixed()}–${(index * 2 + 2).toFixed()}`, effect.ForEachTwoQualityLevels);
         default:
             return assertExhaustive(effect);
     }

package/lib/entities/partial/rated/activatable/index.d.ts

@@ -1,4 +1,5 @@
-import type { FastOneTimePerformanceParameters, FastSustainedPerformanceParameters, OneTimePerformanceParameters, SlowOneTimePerformanceParameters, SlowSustainedPerformanceParameters } from "optolith-database-schema/gen";
+import type { FastOneTimePerformanceParameters, FastSustainedPerformanceParameters, OneTimePerformanceParameters, ResponsiveTextOptional, SlowOneTimePerformanceParameters, SlowSustainedPerformanceParameters } from "optolith-database-schema/gen";
+import type { RawDefinitionListEntityDescriptionSectionItem } from "../../../../index.js";
 import type { StdReader } from "../../reader.js";
 type RenderedPerformanceParameters = {
     castingTime: string;
@@ -42,4 +43,8 @@ export declare const renderSlowPerformanceParameters: (value: {
     kind: "Sustained";
     Sustained: SlowSustainedPerformanceParameters;
 }) => StdReader<RenderedPerformanceParameters, "t" | "tm" | "lj" | "eu" | "rts" | "nms" | "ibi", "SkillModificationLevel">;
+/**
+ * Diff the generated text with the static translation and combine them into a single text, highlighting the differences.
+ */
+export declare const combineGeneratedTextWithStaticTranslation: (label: string, generatedText: string | undefined, staticText: ResponsiveTextOptional | string | undefined) => RawDefinitionListEntityDescriptionSectionItem | undefined;
 export {};

package/lib/entities/partial/rated/activatable/index.js

@@ -1,4 +1,5 @@
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
+import { diffWordsWithSpace } from "diff";
 import { renderFastCastingTime, renderSlowCastingTime } from "./castingTime.js";
 import { renderOneTimeCost, renderSustainedCost } from "./cost.js";
 import { renderOneTimeDuration, renderSustainedDuration } from "./duration.js";
@@ -74,3 +75,27 @@ export const renderSlowPerformanceParameters = (value) => {
             return assertExhaustive(value);
     }
 };
+/**
+ * Diff the generated text with the static translation and combine them into a single text, highlighting the differences.
+ */
+export const combineGeneratedTextWithStaticTranslation = (label, generatedText, staticText) => {
+    if (generatedText === undefined) {
+        return undefined;
+    }
+    const normalizedStaticText = typeof staticText === "string" ? staticText : staticText?.full;
+    const diff = normalizedStaticText === undefined
+        ? undefined
+        : diffWordsWithSpace(normalizedStaticText, generatedText);
+    return {
+        label,
+        value: diff === undefined
+            ? generatedText
+            : diff
+                .map(part => part.added
+                ? `<ins>${part.value}</ins>`
+                : part.removed
+                    ? `<del>${part.value}</del>`
+                    : part.value)
+                .join(""),
+    };
+};

package/lib/entities/partial/rated/activatable/isMinimumMaximum.js

@@ -8,7 +8,7 @@ export const wrapAsMinimum = (text) => responsiveTranslateR("at least {$value}",
  * Wraps the text in a translation that indicates it’s a minimum value if the
  * `is_minimum` property says it’s a minimum value.
  */
-export const wrapIfMinimum = (is_minimum, text) => is_minimum === true ? wrapAsMinimum(text) : Reader.of("");
+export const wrapIfMinimum = (is_minimum, text) => (is_minimum === true ? wrapAsMinimum(text) : Reader.of(text));
 /**
  * Wraps the text in a translation that indicates it’s a maximum value.
  */
@@ -19,4 +19,4 @@ export const wrapAsMaximum = (text) => responsiveTranslateR("no more than {$valu
  * Wraps the text in a translation that indicates it’s a maximum value if the
  * `is_maximum` property says it’s a maximum value.
  */
-export const wrapIfMaximum = (is_maximum, text) => is_maximum === true ? wrapAsMaximum(text) : Reader.of("");
+export const wrapIfMaximum = (is_maximum, text) => (is_maximum === true ? wrapAsMaximum(text) : Reader.of(text));

package/lib/entities/partial/rated/activatable/range.js

@@ -2,24 +2,24 @@ import { Reader } from "@elyukai/utils/reader";
 import { mapNullable } from "@optolith/helpers/nullable";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { getInstanceByIdFnR, modifiableBySpeedOptionalR, modifiableBySpeedR, translateFnR, translateMapR, translateR, } from "../../reader.js";
-import { appendNoteIfNeeded, replaceTextIfNeeded, } from "../../responsiveText.js";
+import { appendNoteIfNeeded, replaceTextIfNeeded } from "../../responsiveText.js";
 import { formatCombinedLengthR, formatLengthR } from "../../units/length.js";
 import { MISSING_VALUE } from "../../unknown.js";
 import { renderCheckResultBasedValue } from "./checkResultBased.js";
 import { wrapIfMaximum } from "./isMinimumMaximum.js";
-import { appendNonModifiableSuffix, ModifiableParameter, } from "./nonModifiableSuffix.js";
+import { appendNonModifiableSuffix, ModifiableParameter } from "./nonModifiableSuffix.js";
 const deriveModifiableRange = (modificationLevelId) => getInstanceByIdFnR().thenW(getInstanceById => mapNullable(getInstanceById("SkillModificationLevel", modificationLevelId), modificationLevel => modifiableBySpeedR("range", modificationLevel).thenW(value => translateMapR(modificationLevel.translations).thenW(translation => translation === undefined
     ? Reader.of({ value, translation: undefined })
     : modifiableBySpeedOptionalR("range", translation).map(valueTranslation => ({
         value,
         translation: valueTranslation,
     }))))) ?? Reader.of(undefined));
-const wrapIfRadius = (is_radius, text) => translateFnR.map(translate => is_radius === true ? `${text} ${translate("Radius")}` : text);
+const wrapIfRadius = (is_radius, text) => translateFnR.map(translate => (is_radius === true ? `${text} ${translate("Radius")}` : text));
 const renderModifiableRange = (value) => deriveModifiableRange(value.initial_modification_level)
     .thenW(range => range === undefined
     ? Reader.of(MISSING_VALUE)
-    : typeof range === "string"
-        ? Reader.of(range)
+    : range.translation !== undefined
+        ? Reader.of(range.translation)
         : formatLengthR("Steps", range.value))
     .then(text => wrapIfRadius(value.is_radius, text))
     .then(text => wrapIfMaximum(value.is_maximum, text));
@@ -36,7 +36,7 @@ const getCheckResultBasedRangeTranslation = (value) => renderCheckResultBasedVal
 export const renderNonModifiableRange = (value, shouldAppendNonModifiableSuffix) => {
     const appendNonModifiableSuffixIfNeeded = shouldAppendNonModifiableSuffix
         ? (text) => appendNonModifiableSuffix(ModifiableParameter.Range, text)
-        : Reader.of;
+        : (text) => Reader.of(text);
     switch (value.kind) {
         case "Sight":
             return translateR("Sight");

package/lib/entities/partial/rated/activatable/speed.d.ts

@@ -1,4 +1,4 @@
-import { FastSkillModificationLevelConfig, SkillModificationLevel, SlowSkillModificationLevelConfig } from "optolith-database-schema/gen";
+import type { FastSkillModificationLevelConfig, SkillModificationLevel, SlowSkillModificationLevelConfig } from "optolith-database-schema/gen";
 /**
  * The speed of an activatable skill.
  */

package/lib/entities/partial/rated/activatable/targetCategory.js

@@ -1,7 +1,7 @@
 import { Reader } from "@elyukai/utils/reader";
 import { mapNullable } from "@optolith/helpers/nullable";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
-import { getInstanceByIdFnR, translateMapR, translateR, } from "../../reader.js";
+import { getInstanceByIdFnR, translateMapR, translateR } from "../../reader.js";
 import { MISSING_VALUE } from "../../unknown.js";
 import { appendInParensIfNotEmpty } from "./parensIf.js";
 const renderPredefined = (targetCategoryId) => getInstanceByIdFnR()
@@ -32,4 +32,4 @@ export const renderTargetCategory = (values) => translateR("Target Category").th
     ? translateR("all")
     : Reader.sequence(values.map(({ id, translations }) => getTargetCategoryTranslationByType(id).then(text => translateMapR(translations)
         .map(translation => translation?.note)
-        .map(note => appendInParensIfNotEmpty(note, text)) ?? text))).map(texts => texts.join(", "))).map(value => ({ label, value })));
+        .map(note => appendInParensIfNotEmpty(note, text))))).map(texts => texts.join(", "))).map(value => ({ label, value })));

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

@@ -2,7 +2,7 @@ import { Reader } from "@elyukai/utils/reader";
 import type { ChildEntityMap, EntityMap, FastSkillModificationLevelConfig, ResponsiveText, ResponsiveTextOptional, SkillModificationLevel, SlowSkillModificationLevelConfig } from "optolith-database-schema/gen";
 import type { IdArgsVariant } from "tsondb/schema/gen";
 import type { GetAllChildInstancesForParent, GetAllInstances, GetInstanceById } from "../../helpers/getTypes.js";
-import type { LocaleCompare, LocaleJoin, LocaleJoinType } from "../../helpers/locale.js";
+import type { FormatNumber, LocaleCompare, LocaleJoin, LocaleJoinType } from "../../helpers/locale.js";
 import type { Format, LocaleMap, Translate, TranslateMap, TranslationKeyMatchingParamsOfKey, TranslationKeysWithoutParams, TranslationParamsInArray, Translations } from "../../helpers/translate.js";
 import type { GetResolvedSelectOptionById } from "./prerequisites/single/activatable.js";
 import type { ModifiableParameter } from "./rated/activatable/nonModifiableSuffix.js";
@@ -14,6 +14,7 @@ import { type EnergyUnit } from "./units/energy.js";
  */
 export type EnvMap<E extends keyof EntityMap = never, AE extends keyof EntityMap = never, CE extends keyof ChildEntityMap = never> = {
     format: Format;
+    formatNumber: FormatNumber;
     translate: Translate;
     translateMap: TranslateMap;
     localeJoin: LocaleJoin;
@@ -32,6 +33,7 @@ export type EnvMap<E extends keyof EntityMap = never, AE extends keyof EntityMap
  */
 export type EnvMapAbbr = {
     f: "format";
+    fn: "formatNumber";
     t: "translate";
     tm: "translateMap";
     lj: "localeJoin";
@@ -60,7 +62,7 @@ export type StdReader<T, K extends keyof EnvMapAbbr, E extends keyof EntityMap =
 /**
  * Treats the text as a translation string and applies supplied arguments.
  */
-export declare const formatR: (text: string, args?: Record<string, unknown> | undefined) => Reader<{
+export declare const formatR: (text: string, args?: Record<string, unknown>) => Reader<{
     format: Format;
 }, string>;
 /**

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

@@ -29,7 +29,11 @@ export declare const getResponsiveTextOptional: (value: ResponsiveTextOptional |
  */
 export declare const replaceTextIfNeeded: (translations: LocaleMap<{
     replacement?: ResponsiveTextReplace;
-}> | undefined, valueToReplace: string) => Reader<StdEnv<"rts" | "tm">, string>;
+}> | undefined, valueToReplace: string, differentValueToInsert?: string) => Reader<{
+    translateMap: import("../../helpers/translate.js").TranslateMap;
+} & {
+    responsiveTextSize: ResponsiveTextSize;
+}, string>;
 /**
  * Appends a note to a given value if a note is requested, otherwise just return
  * the given value.

package/lib/entities/partial/responsiveText.js

@@ -2,7 +2,7 @@ import { identity } from "@elyukai/utils/function";
 import { Reader } from "@elyukai/utils/reader";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { appendInParensIfNotEmpty } from "./rated/activatable/parensIf.js";
-import { responsiveTextOptionalR, responsiveTextR, translateMapR, } from "./reader.js";
+import { responsiveTextOptionalR, responsiveTextR, translateMapR } from "./reader.js";
 import { MISSING_VALUE } from "./unknown.js";
 /**
  * Whether the entry is displayed in a normal or compressed setting. Normal/full
@@ -49,13 +49,11 @@ export const getResponsiveTextOptional = (value, size) => {
  * Replaces a text with a given value if a replacement is requested, otherwise
  * just return the given value.
  */
-export const replaceTextIfNeeded = (translations, valueToReplace) => translateMapR(translations)
-    .with(identity)
-    .then(translation => {
+export const replaceTextIfNeeded = (translations, valueToReplace, differentValueToInsert = valueToReplace) => translateMapR(translations).thenW(translation => {
     if (translation?.replacement === undefined) {
         return Reader.of(valueToReplace);
     }
-    return responsiveTextR(translation.replacement).map(note => note.replace("$1", valueToReplace));
+    return responsiveTextR(translation.replacement).map(note => note.replace("$1", differentValueToInsert));
 });
 /**
  * Appends a note to a given value if a note is requested, otherwise just return

package/lib/entities/partial/units/length.d.ts

@@ -1,6 +1,6 @@
 import type { Translate } from "../../../helpers/translate.js";
 import type { StdReader } from "../reader.js";
-import { ResponsiveTextSize } from "../responsiveText.js";
+import { type ResponsiveTextSize } from "../responsiveText.js";
 type LengthUnit = "Steps" | "Miles";
 /**
  * Returns the text for a length unit.

package/lib/entities/partial/units/length.js

@@ -1,16 +1,8 @@
 import { Reader } from "@elyukai/utils/reader";
 import { responsive } from "../responsiveText.js";
 const lengthUnitTranslationKeys = {
-    Steps: [
-        ".input {$value :number} {{{$value} yards}}",
-        "{$value} yards",
-        "{$value} yd",
-    ],
-    Miles: [
-        ".input {$value :number} {{{$value} miles}}",
-        "{$value} miles",
-        "{$value} mi.",
-    ],
+    Steps: [".input {$value :number} {{{$value} yards}}", "{$value} yards", "{$value} yd"],
+    Miles: [".input {$value :number} {{{$value} miles}}", "{$value} miles", "{$value} mi."],
 };
 /**
  * Returns the text for a length unit.

package/lib/entities/partial/units/timeSpan.d.ts

@@ -1,7 +1,7 @@
 import { Reader } from "@elyukai/utils/reader";
 import type { Translate } from "../../../helpers/translate.js";
 import type { StdEnv } from "../reader.js";
-import { ResponsiveTextSize } from "../responsiveText.js";
+import { type ResponsiveTextSize } from "../responsiveText.js";
 /**
  * Possible units to use for time spans.
  */
@@ -11,13 +11,13 @@ export type TimeSpanUnit = "Seconds" | "Minutes" | "Hours" | "Days" | "Weeks" |
  */
 export declare const formatTimeSpan: (translate: Translate, responsiveTextSize: ResponsiveTextSize, unit: {
     kind: TimeSpanUnit;
-} | TimeSpanUnit, value: number | string) => string;
+} | TimeSpanUnit, value: number | string, interval?: boolean) => string;
 /**
  * Returns the text for a time span unit.
  */
 export declare const formatTimeSpanR: (unit: {
     kind: TimeSpanUnit;
-} | TimeSpanUnit, value: number | string) => Reader<StdEnv<"t" | "rts">, string>;
+} | TimeSpanUnit, value: number | string, interval?: boolean) => Reader<StdEnv<"t" | "rts">, string>;
 /**
  * Returns the text for a time span unit.
  */
@@ -26,4 +26,4 @@ export declare const formatCombinedTimeSpanR: (object: {
         kind: TimeSpanUnit;
     };
     value: number | string;
-}) => Reader<StdEnv<"t" | "rts">, string>;
+}, interval?: boolean) => Reader<StdEnv<"t" | "rts">, string>;

package/lib/entities/partial/units/timeSpan.js

@@ -2,33 +2,37 @@ import { Reader } from "@elyukai/utils/reader";
 import { responsive } from "../responsiveText.js";
 // prettier-ignore
 const timeSpanUnitTranslationKeys = {
-    Seconds: [".input {$value :number} {{{$value} seconds}}", "{$value} seconds", "{$value} s"],
-    Minutes: [".input {$value :number} {{{$value} minutes}}", "{$value} minutes", "{$value} min"],
-    Hours: [".input {$value :number} {{{$value} hours}}", "{$value} hours", "{$value} h"],
-    Days: [".input {$value :number} {{{$value} days}}", "{$value} days", "{$value} d"],
-    Weeks: [".input {$value :number} {{{$value} weeks}}", "{$value} weeks", ".input {$value :number} {{{$value} wks.}}"],
-    Months: [".input {$value :number} {{{$value} months}}", "{$value} months", ".input {$value :number} {{{$value} mos.}}"],
-    Years: [".input {$value :number} {{{$value} years}}", "{$value} years", ".input {$value :number} {{{$value} yrs.}}"],
-    Centuries: [".input {$value :number} {{{$value} centuries}}", "{$value} centuries", "{$value} cent."],
-    Actions: [".input {$value :number} {{{$value} actions}}", "{$value} actions", "{$value} act"],
-    CombatRounds: [".input {$value :number} {{{$value} combat rounds}}", "{$value} combat rounds", "{$value} CR"],
-    SeductionActions: [".input {$value :number} {{{$value} seduction actions}}", "{$value} seduction actions", "{$value} SA"],
-    Rounds: [".input {$value :number} {{{$value} rounds}}", "{$value} rounds", "{$value} rnds"],
+    Seconds: [".input {$value :number} .input {$style :string} {{{$value} seconds}}", "{$value} seconds", ".input {$value :number} .input {$style :string} {{{$value} s}}", "{$value} s"],
+    Minutes: [".input {$value :number} .input {$style :string} {{{$value} minutes}}", "{$value} minutes", ".input {$value :number} .input {$style :string} {{{$value} min}}", "{$value} min"],
+    Hours: [".input {$value :number} .input {$style :string} {{{$value} hours}}", "{$value} hours", ".input {$value :number} .input {$style :string} {{{$value} h}}", "{$value} h"],
+    Days: [".input {$value :number} .input {$style :string} {{{$value} days}}", "{$value} days", ".input {$value :number} .input {$style :string} {{{$value} d}}", "{$value} d"],
+    Weeks: [".input {$value :number} .input {$style :string} {{{$value} weeks}}", "{$value} weeks", ".input {$value :number} .input {$style :string} {{{$value} wks.}}", "{$value} wks."],
+    Months: [".input {$value :number} .input {$style :string} {{{$value} months}}", "{$value} months", ".input {$value :number} .input {$style :string} {{{$value} mos.}}", "{$value} mos."],
+    Years: [".input {$value :number} .input {$style :string} {{{$value} years}}", "{$value} years", ".input {$value :number} .input {$style :string} {{{$value} yrs.}}", "{$value} yrs."],
+    Centuries: [".input {$value :number} .input {$style :string} {{{$value} centuries}}", "{$value} centuries", ".input {$value :number} .input {$style :string} {{{$value} cent.}}", "{$value} cent."],
+    Actions: [".input {$value :number} .input {$style :string} {{{$value} actions}}", "{$value} actions", ".input {$value :number} .input {$style :string} {{{$value} act}}", "{$value} act"],
+    CombatRounds: [".input {$value :number} .input {$style :string} {{{$value} combat rounds}}", "{$value} combat rounds", ".input {$value :number} .input {$style :string} {{{$value} CR}}", "{$value} CR"],
+    SeductionActions: [".input {$value :number} .input {$style :string} {{{$value} seduction actions}}", "{$value} seduction actions", ".input {$value :number} .input {$style :string} {{{$value} SA}}", "{$value} SA"],
+    Rounds: [".input {$value :number} .input {$style :string} {{{$value} rounds}}", "{$value} rounds", ".input {$value :number} .input {$style :string} {{{$value} rnds}}", "{$value} rnds"],
 };
 /**
  * Returns the text for a time span unit.
  */
-export const formatTimeSpan = (translate, responsiveTextSize, unit, value) => {
-    const [fullNumberKey, fullKey, compressedKey] = timeSpanUnitTranslationKeys[typeof unit === "string" ? unit : unit.kind];
+export const formatTimeSpan = (translate, responsiveTextSize, unit, value, interval = false) => {
+    const [fullNumberKey, fullKey, compressedNumberKey, compressedKey] = timeSpanUnitTranslationKeys[typeof unit === "string" ? unit : unit.kind];
     return responsive(responsiveTextSize, () => translate(typeof value === "number" ? fullNumberKey : fullKey, {
         value,
-    }), () => translate(compressedKey, { value }));
+        style: interval ? "interval" : "default",
+    }), () => translate(typeof value === "number" ? compressedNumberKey : compressedKey, {
+        value,
+        style: interval ? "interval" : "default",
+    }));
 };
 /**
  * Returns the text for a time span unit.
  */
-export const formatTimeSpanR = (unit, value) => Reader.asks(({ translate, responsiveTextSize }) => formatTimeSpan(translate, responsiveTextSize, unit, value));
+export const formatTimeSpanR = (unit, value, interval) => Reader.asks(({ translate, responsiveTextSize }) => formatTimeSpan(translate, responsiveTextSize, unit, value, interval));
 /**
  * Returns the text for a time span unit.
  */
-export const formatCombinedTimeSpanR = (object) => formatTimeSpanR(object.unit, object.value);
+export const formatCombinedTimeSpanR = (object, interval) => formatTimeSpanR(object.unit, object.value, interval);

package/lib/entities/personalityTrait.js

@@ -23,10 +23,10 @@ export const getPersonalityTraitEntityDescription = createEntityDescriptionCreat
             {
                 type: "definitionList",
                 items: [
-                    ...(translation.effects.map(effect => ({
+                    ...translation.effects.map(effect => ({
                         label: effect.label,
                         value: effect.text,
-                    })) ?? []),
+                    })),
                     entry.combination_options === undefined
                         ? undefined
                         : {
@@ -37,8 +37,7 @@ export const getPersonalityTraitEntityDescription = createEntityDescriptionCreat
                                 .toSorted(on(group => group[0], compareNullish(numAsc)))
                                 .map(([level, options]) => level === null
                                 ? MISSING_VALUE
-                                : `${translate("Level {$level}", { level: romanize(level) })} ${localeJoin(options.map(option => translateMap(option?.translations)?.name ??
-                                    MISSING_VALUE), "disjunction")}`)
+                                : `${translate("Level {$level}", { level: romanize(level) })} ${localeJoin(options.map(option => translateMap(option?.translations)?.name ?? MISSING_VALUE), "disjunction")}`)
                                 .join(", "),
                         },
                     entry.prerequisites === undefined

package/lib/entities/poison.js

@@ -37,7 +37,7 @@ const renderLevel = (translate, translateMap, level) => {
         case "Constant":
             return typeof level.Constant === "number" ? level.Constant : level.Constant.value;
         case "BySubtype":
-            return level.BySubtype.map(subtype => `${subtype.value} (${translateMap(subtype.translations)?.name ?? MISSING_VALUE})`).join(", ");
+            return level.BySubtype.map(subtype => `${subtype.value.toFixed()} (${translateMap(subtype.translations)?.name ?? MISSING_VALUE})`).join(", ");
         default:
             return assertExhaustive(level);
     }
@@ -82,7 +82,7 @@ const renderIntoxicantValues = (translate, translateMap, getInstanceById, intoxi
         overdose: translation?.overdose ?? MISSING_VALUE,
         legality: intoxicant.legality.is_legal ? translate("legal") : translate("illegal"),
         special: translation?.special,
-        addiction: intoxicant?.addiction === undefined
+        addiction: intoxicant.addiction === undefined
             ? undefined
             : renderAddiction(translate, translateMap, getInstanceById, intoxicant.addiction),
     };
@@ -178,7 +178,7 @@ const renderDuration = (translate, translateMap, duration) => {
             return renderMathOperation(duration.ExpressionBased.value, value => {
                 switch (value.kind) {
                     case "Constant":
-                        return value.Constant.toString();
+                        return value.Constant.toFixed();
                     case "Dice":
                         return renderDice(translate, value.Dice);
                     case "CircleOfDamnation":
@@ -247,7 +247,7 @@ export const getPoisonEntityDescription = createEntityDescriptionCreator(({ getI
                     renderAlternativeNames(translate, translation.alternative_names),
                     {
                         label: translate("Level"),
-                        value: level.toString(),
+                        value: typeof level === "number" ? level.toFixed() : level,
                     },
                     {
                         label: translate("Type"),