@optolith/entity-descriptions 0.4.0 → 0.4.1

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

@@ -1,8 +1,8 @@
-import { AdvantageDisadvantagePrerequisiteGroup, AnimistPowerPrerequisiteGroup, ArcaneTraditionPrerequisiteGroup, DerivedCharacteristicPrerequisiteGroup, EnhancementPrerequisiteGroup, GeneralPrerequisiteGroup, GeodeRitualPrerequisiteGroup, InfluencePrerequisiteGroup, LanguagePrerequisiteGroup, LiturgyPrerequisiteGroup, PersonalityTraitPrerequisiteGroup, PreconditionGroup, ProfessionPrerequisiteGroup, PublicationPrerequisiteGroup, SpellworkPrerequisiteGroup, type ActivatableIdentifier, type RatedIdentifier } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisiteGroup, AnimistPowerPrerequisiteGroup, ArcaneTraditionPrerequisiteGroup, DerivedCharacteristicPrerequisiteGroup, EnhancementPrerequisiteGroup, GeneralPrerequisiteGroup, GeodeRitualPrerequisiteGroup, InfluencePrerequisiteGroup, LanguagePrerequisiteGroup, LiturgyPrerequisiteGroup, PersonalityTraitPrerequisiteGroup, PreconditionGroup, ProfessionPrerequisiteGroup, PublicationPrerequisiteGroup, RatedIdentifier, SpellworkPrerequisiteGroup } from "optolith-database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../../../helpers/getTypes.js";
-import { LocaleEnvironment } from "../../../helpers/locale.js";
-import { PrerequisitePart } from "./part.js";
-import { GetResolvedSelectOptionById } from "./single/activatable.js";
+import type { LocaleEnvironment } from "../../../helpers/locale.js";
+import type { PrerequisitePart } from "./part.js";
+import { type GetResolvedSelectOptionById } from "./single/activatable.js";
 /**
  * Print the translation of a derived characteristic prerequisite group.
  */

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

@@ -1,5 +1,5 @@
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
-import { printActivatablePrerequisite } from "./single/activatable.js";
+import { printActivatablePrerequisite, } from "./single/activatable.js";
 import { printAnimistPowerPrerequisite } from "./single/animistPower.js";
 import { printBlessedTraditionPrerequisite } from "./single/blessedTradition.js";
 import { printCommonSuggestedByRCPPrerequisite } from "./single/commonSuggestedByRCP.js";

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

@@ -1,9 +1,9 @@
 import type { ResolvedSelectOption, ResolvedSelectOptionIdentifier } from "optolith-database-schema/cache";
 import type { ActivatableIdentifier, ActivatablePrerequisite, RequirableSelectOptionIdentifier } from "optolith-database-schema/gen";
-import { type GetInstanceById } from "../../../../helpers/getTypes.js";
-import { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { GetInstanceById } from "../../../../helpers/getTypes.js";
+import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { Translate } from "../../../../helpers/translate.js";
-import { PrerequisitePart } from "../part.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Gets a resolved select option by its identifier.
  */

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

@@ -1,7 +1,7 @@
 import type { AnimistPowerPrerequisite } 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 { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a culture prerequisite.
  */

package/lib/entities/partial/prerequisites/single/animistPower.js

@@ -13,7 +13,7 @@ export const printAnimistPowerPrerequisite = (getInstanceById, locale, prerequis
         value: [
             locale.translateMap(animistPower?.translations)?.name ?? "MISSING_VALUE",
             prerequisite.level === undefined ? undefined : romanize(prerequisite.level),
-            prerequisite.value.toString(),
+            prerequisite.value.toFixed(),
         ]
             .filter(isNotNullish)
             .join(" "),

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

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

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

@@ -1,5 +1,5 @@
-import { LocaleEnvironment } from "../../../../helpers/locale.js";
-import { PrerequisitePart } from "../part.js";
+import type { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a culture prerequisite.
  */

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

@@ -1,7 +1,7 @@
-import { CulturePrerequisite } 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 { CulturePrerequisite } 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 culture prerequisite.
  */

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

@@ -1,7 +1,7 @@
-import { type EnhancementPrerequisite } 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 { EnhancementPrerequisite } 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 an external enhancement prerequisite.
  */

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

@@ -1,7 +1,7 @@
-import { InfluencePrerequisite } from "optolith-database-schema/gen";
+import type { InfluencePrerequisite } 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 { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a culture prerequisite.
  */

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

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

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

@@ -1,5 +1,5 @@
-import { LocaleEnvironment } from "../../../../helpers/locale.js";
-import { PrerequisitePart } from "../part.js";
+import type { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a culture prerequisite.
  */

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

@@ -1,7 +1,7 @@
 import type { PactPrerequisite } 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 culture prerequisite.
  */

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

@@ -1,7 +1,7 @@
-import { type PersonalityTraitPrerequisite } 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 { PersonalityTraitPrerequisite } 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 personality trait prerequisite.
  */

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

@@ -1,6 +1,6 @@
-import { PrimaryAttributePrerequisite } from "optolith-database-schema/gen";
-import { LocaleEnvironment } from "../../../../helpers/locale.js";
-import { PrerequisitePart } from "../part.js";
+import type { PrimaryAttributePrerequisite } from "optolith-database-schema/gen";
+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/primaryAttribute.js

@@ -8,7 +8,7 @@ export const printPrimaryAttributePrerequisite = (locale, prerequisite) => {
     }
     return {
         label: `${locale.translate("Primary Attribute")} `,
-        value: prerequisite.value.toString(),
+        value: prerequisite.value.toFixed(),
         sentenceType: undefined,
         isMeta: false,
     };

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

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

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

@@ -1,7 +1,7 @@
-import { PublicationPrerequisite } 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 { PublicationPrerequisite } 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/race.d.ts

@@ -1,7 +1,7 @@
-import { RacePrerequisite } 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 { RacePrerequisite } 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 race prerequisite.
  */

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

@@ -1,7 +1,7 @@
 import type { RatedPrerequisite } 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 { LocaleEnvironment } from "../../../../helpers/locale.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a blessed tradition prerequisite.
  */

package/lib/entities/partial/prerequisites/single/rated.js

@@ -4,7 +4,7 @@ import { printDisplayOption } from "../displayOption.js";
 const printRatedName = (getInstanceById, translateMap, id) => {
     switch (id.kind) {
         case "Attribute":
-            return (translateMap(getInstanceById("Attribute", id.Attribute)?.translations)?.name ??
+            return (translateMap(getInstanceById("Attribute", id.Attribute)?.translations)?.abbreviation ??
                 MISSING_VALUE);
         case "Skill":
             return translateMap(getInstanceById("Skill", id.Skill)?.translations)?.name ?? MISSING_VALUE;
@@ -34,7 +34,7 @@ export const printRatedPrerequisite = (getInstanceById, locale, prerequisite) =>
         return printDisplayOption(locale.translateMap, prerequisite.display_option);
     }
     return {
-        value: `${printRatedName(getInstanceById, locale.translateMap, prerequisite.id)} ${prerequisite.value}`,
+        value: `${printRatedName(getInstanceById, locale.translateMap, prerequisite.id)} ${prerequisite.value.toFixed()}`,
         sentenceType: undefined,
         isMeta: false,
     };

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

@@ -1,7 +1,7 @@
 import type { RatedMinimumNumberPrerequisite } 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 rated minimum number prerequisite.
  */

package/lib/entities/partial/prerequisites/single/ratedMinimumNumber.js

@@ -56,7 +56,7 @@ export const printRatedMinimumNumberPrerequisite = (getInstanceById, locale, pre
             // fr-FR: "Ranged Combat 10"
             // it-IT: "Una tecnica di combattimento a distanza 10"
             return {
-                value: `${printNumberOfCombatTechniques(locale, prerequisite.targets.CombatTechniques.group, prerequisite.number)} ${prerequisite.value}`,
+                value: `${printNumberOfCombatTechniques(locale, prerequisite.targets.CombatTechniques.group, prerequisite.number)} ${prerequisite.value.toFixed()}`,
                 sentenceType: undefined,
                 isMeta: false,
             };

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

@@ -1,7 +1,7 @@
-import { RatedSumPrerequisite } 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 { RatedSumPrerequisite } 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 rated sum prerequisite.
  */

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

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

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

@@ -1,6 +1,6 @@
 import type { SexPrerequisite } from "optolith-database-schema/gen";
 import type { Translate } from "../../../../helpers/translate.js";
-import { PrerequisitePart } from "../part.js";
+import type { PrerequisitePart } from "../part.js";
 /**
  * Get the translation of a (binary) sex prerequisite.
  */

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

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

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/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));