@optolith/entity-descriptions 0.4.10 → 0.4.11

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.4.11](https://github.com/Optolith/entity-descriptions/compare/v0.4.10...v0.4.11) (2026-03-23)
+
+
+### Features
+
+* support schema version 0.42.0 ([80b2eaa](https://github.com/Optolith/entity-descriptions/commit/80b2eaacbcf445cf3222c11b86c1be77b7d973d6))
+
+
+### Bug Fixes
+
+* activatable cost by level separator ([a0119ff](https://github.com/Optolith/entity-descriptions/commit/a0119ffdafcc6027801c0ff7b502c9c65af107dd))
+* render attribute prerequisite as abbreviation ([6f258b1](https://github.com/Optolith/entity-descriptions/commit/6f258b1f6f4fb1c88b09fe9fb2013b180d91fc4b))
+
 ## [0.4.10](https://github.com/Optolith/entity-descriptions/compare/v0.4.9...v0.4.10) (2026-03-17)
 
 ## [0.4.9](https://github.com/Optolith/entity-descriptions/compare/v0.4.8...v0.4.9) (2026-03-17)

package/lib/entities/activatable.js

@@ -392,7 +392,7 @@ const renderArcaneEnergyCost = (translate, translateMap, localeJoin, responsiveT
                         cost: translate("{$value} AE", {
                             value: cost.ByLevel.levels.map(level => level.value).join("/"),
                         }),
-                        level: Array.from({ length: cost.ByLevel.levels.length }, (_, index) => romanize(index + 1)),
+                        level: Array.from({ length: cost.ByLevel.levels.length }, (_, index) => romanize(index + 1)).join("/"),
                     });
                 case "Verbose":
                     return cost.ByLevel.levels

package/lib/entities/derivedCharacteristic.d.ts

@@ -1,9 +1,7 @@
 import type { GetInstanceById } from "../helpers/getTypes.js";
-import type { IdMap } from "../index.js";
 /**
  * Get a JSON representation of the rules text for a derived characteristic.
  */
 export declare const getDerivedCharacteristicEntityDescription: import("../creator.js").EntityDescriptionCreator<"DerivedCharacteristic", {
     getInstanceById: GetInstanceById<"Publication" | "Attribute" | "DerivedCharacteristic">;
-    idMap: IdMap;
 }, import("../index.js").EntityDescription>;

package/lib/entities/derivedCharacteristic.js

@@ -14,12 +14,7 @@ const renderAttributeNameForStyle = (style, translation) => {
     }
 };
 const getAttribute = (getInstanceById, translateMap, attributeId, style = "full") => attributedCustomName(translateMap, getInstanceById, "derived-characteristic-calculation", translation => renderAttributeNameForStyle(style, translation), "Attribute", attributeId) ?? MISSING_VALUE;
-const getRaceBaseValue = (translate, translateMap, getInstanceById, idMap, raceBaseValue, style = "full") => {
-    const instance = getInstanceById("DerivedCharacteristic", idMap.DerivedCharacteristic[raceBaseValue.kind]);
-    const translation = translateMap(instance?.translations);
-    if (translation === undefined) {
-        return MISSING_VALUE;
-    }
+const getRaceBaseValue = (translate, translation, style = "full") => {
     switch (style) {
         case "full":
             return translate("Base {$name} from Race", translation);
@@ -29,14 +24,14 @@ const getRaceBaseValue = (translate, translateMap, getInstanceById, idMap, raceB
             return assertExhaustive(style);
     }
 };
-const renderBaseCalculation = (getInstanceById, translate, translateMap, idMap, calculation, style = "full") => renderMathOperation(calculation, value => {
+const renderBaseCalculation = (getInstanceById, translate, translateMap, translation, calculation, style = "full") => renderMathOperation(calculation, value => {
     switch (value.kind) {
         case "Constant":
             return value.Constant.toFixed();
         case "Attribute":
             return getAttribute(getInstanceById, translateMap, value.Attribute, style);
         case "RaceBaseValue":
-            return getRaceBaseValue(translate, translateMap, getInstanceById, idMap, value.RaceBaseValue, style);
+            return getRaceBaseValue(translate, translation, style);
         case "PrimaryAttribute":
             switch (style) {
                 case "full":
@@ -60,7 +55,7 @@ const renderBaseCalculation = (getInstanceById, translate, translateMap, idMap,
 /**
  * Get a JSON representation of the rules text for a derived characteristic.
  */
-export const getDerivedCharacteristicEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, { translate, translateMap }, { content: entry }) => {
+export const getDerivedCharacteristicEntityDescription = createEntityDescriptionCreator(({ getInstanceById }, { translate, translateMap }, { content: entry }) => {
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -80,7 +75,7 @@ export const getDerivedCharacteristicEntityDescription = createEntityDescription
                 items: [
                     {
                         label: translate("Base Value"),
-                        value: renderBaseCalculation(getInstanceById, translate, translateMap, idMap, entry.calculation.base),
+                        value: renderBaseCalculation(getInstanceById, translate, translateMap, translation, entry.calculation.base),
                     },
                 ],
             },

package/lib/entities/disease.js

@@ -25,7 +25,11 @@ export const getDiseaseEntityDescription = createEntityDescriptionCreator(({ get
         return undefined;
     }
     return {
-        title: translation.name,
+        title: translation.name +
+            parensIf(ensureNonEmpty([
+                baseEntry.isChildhoodDisease === true ? translate("childhood disease") : undefined,
+                baseEntry.isMagicalDisease === true ? translate("magical disease") : undefined,
+            ].filter(isNotNullish))?.join(", ")),
         className: "disease",
         body: [
             {

package/lib/entities/elixir.js

@@ -58,16 +58,18 @@ export const getElixirEntityDescription = createEntityDescriptionCreator(({ getI
                         },
                     {
                         label: translate("Quality Levels"),
-                        value: [
-                            {
-                                type: "definitionList",
-                                style: "nested",
-                                items: translation.quality_levels.map((effectForLevel, index) => ({
-                                    label: (index + 1).toFixed(),
-                                    value: effectForLevel,
-                                })),
-                            },
-                        ],
+                        value: translation.quality_levels.kind === "Plain"
+                            ? translation.quality_levels.Plain.text
+                            : [
+                                {
+                                    type: "definitionList",
+                                    style: "nested",
+                                    items: translation.quality_levels.ForEachQualityLevel.qualityLevels.map((effectForLevel, index) => ({
+                                        label: (index + 1).toFixed(),
+                                        value: effectForLevel,
+                                    })),
+                                },
+                            ],
                     },
                 ],
             },

package/lib/entities/equipment.d.ts

@@ -1,6 +1,7 @@
-import type { EquipmentIdentifier, GenMeleeWeapon, GenRangedWeapon, LocaleMeasurementAdjustments } from "optolith-database-schema/gen";
+import type { AmmunitionishIdentifier, EquipmentIdentifier, GenMeleeWeapon, GenRangedWeapon, LocaleMeasurementAdjustments } from "optolith-database-schema/gen";
 import { type TaggedEntity } from "../creator.js";
 import type { GetInstanceById } from "../helpers/getTypes.js";
+import type { LocaleJoin } from "../helpers/locale.js";
 import type { Translate, TranslateMap } from "../helpers/translate.js";
 import type { IdMap, LabeledEntityDescriptionSection, RawEntityDescriptionSectionContent } from "../index.js";
 /**
@@ -10,15 +11,15 @@ export declare const getEquipmentName: (translate: Translate, translateMap: Tran
 /**
  * Render combat values of a melee weapon.
  */
-export declare const renderMeleeWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, getInstanceById: GetInstanceById<"Attribute" | "CloseCombatTechnique" | "Reach">, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, closeCombatTechniqueId: string, use: GenMeleeWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
+export declare const renderMeleeWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, localeJoin: LocaleJoin, getInstanceById: GetInstanceById<"Attribute" | "CloseCombatTechnique" | "Reach">, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, closeCombatTechniqueId: string, use: GenMeleeWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
 /**
  * Render combat values of a ranged weapon.
  */
-export declare const renderRangedWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, getInstanceById: GetInstanceById<"RangedCombatTechnique" | "Ammunition">, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, rangedCombatTechniqueId: string, use: GenRangedWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
+export declare const renderRangedWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, getInstanceById: GetInstanceById<"RangedCombatTechnique" | AmmunitionishIdentifier["kind"]>, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, rangedCombatTechniqueId: string, use: GenRangedWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
 /**
  * Get a JSON representation of the rules text for equipment.
  */
-export declare const getEquipmentEntityDescription: import("../creator.js").EntityDescriptionCreator<"Weapon" | "Armor" | "Ammunition" | "Animal" | "AnimalCare" | "BandageOrRemedy" | "Book" | "CeremonialItem" | "Clothes" | "ClothingPackage" | "Container" | "EquipmentOfBlessedOnes" | "GemOrPreciousStone" | "IlluminationLightSource" | "IlluminationRefillOrSupply" | "Jewelry" | "Laboratory" | "Liebesspielzeug" | "LuxuryGood" | "MagicalArtifact" | "MusicalInstrument" | "Newspaper" | "OrienteeringAid" | "RopeOrChain" | "Stationery" | "ThievesTool" | "ToolOfTheTrade" | "TravelGearOrTool" | "Vehicle" | "WeaponAccessory" | "WorkingSupernaturalCreature", {
-    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "Reach" | "SocialStatus" | "CloseCombatTechnique" | "RangedCombatTechnique" | "MagicalTradition" | "BlessedTradition" | "DerivedCharacteristic" | "Ammunition" | "Race" | "Culture" | "Profession" | "Skill">;
+export declare const getEquipmentEntityDescription: import("../creator.js").EntityDescriptionCreator<"Ammunition" | "Weapon" | "Armor" | "Animal" | "AnimalCare" | "BandageOrRemedy" | "Book" | "CeremonialItem" | "Clothes" | "ClothingPackage" | "Container" | "EquipmentOfBlessedOnes" | "GemOrPreciousStone" | "IlluminationLightSource" | "IlluminationRefillOrSupply" | "Jewelry" | "Laboratory" | "Liebesspielzeug" | "LuxuryGood" | "MagicalArtifact" | "MusicalInstrument" | "Newspaper" | "OrienteeringAid" | "RopeOrChain" | "Stationery" | "ThievesTool" | "ToolOfTheTrade" | "TravelGearOrTool" | "Vehicle" | "WeaponAccessory" | "WorkingSupernaturalCreature", {
+    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "Reach" | "SocialStatus" | "CloseCombatTechnique" | "RangedCombatTechnique" | "MagicalTradition" | "BlessedTradition" | "DerivedCharacteristic" | AmmunitionishIdentifier["kind"] | "Race" | "Culture" | "Profession" | "Skill">;
     idMap: IdMap;
 }, import("../index.js").EntityDescription>;

package/lib/entities/equipment.js

@@ -1,11 +1,14 @@
 import { ensureNonEmpty, isNotEmpty } from "@elyukai/utils/array/nonEmpty";
+import { on } from "@elyukai/utils/function";
 import { isNotNullish } from "@elyukai/utils/nullable";
+import { compareNumber } from "@elyukai/utils/ordering";
 import { romanize } from "@elyukai/utils/roman";
 import { sign } from "@elyukai/utils/string/number";
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { mapNullable } from "@optolith/helpers/nullable";
 import { createEntityDescriptionCreator } from "../creator.js";
 import { renderDice, renderDiceAndFlat } from "./partial/dice.js";
+import { attributedName, attributedNameFromInstance } from "./partial/markdown.js";
 import { additionFormatter, subtractionFormatter } from "./partial/mathOperation.js";
 import { parensIf } from "./partial/rated/activatable/parensIf.js";
 import { ResponsiveTextSize } from "./partial/responsiveText.js";
@@ -91,9 +94,19 @@ const renderPrimaryAttributeAndDamageThreshold = (translateMap, getInstanceById,
 const renderAttackParryModifier = (attackModifier, parryModifier) => attackModifier === undefined && parryModifier === undefined
     ? "—"
     : `${attackModifier === undefined ? "—" : sign(attackModifier)}/${parryModifier === undefined ? "—" : sign(parryModifier)}`;
-const renderReach = (translateMap, getInstanceById, reach) => reach === undefined
+const renderReach = (translateMap, localeJoin, getInstanceById, reaches) => reaches === undefined
     ? "—"
-    : (translateMap(getInstanceById("Reach", reach)?.translations)?.name ?? MISSING_VALUE);
+    : localeJoin(reaches
+        .map((reach) => {
+        const instance = getInstanceById("Reach", reach);
+        return [
+            instance?.position ?? 0,
+            attributedNameFromInstance(translateMap, instance, "equipment", "Reach", reach) ??
+                MISSING_VALUE,
+        ];
+    })
+        .toSorted(on(e => e[0], compareNumber))
+        .map(e => e[1]), "conjunction");
 const renderLength = (translate, measurements, length) => length === undefined
     ? "—"
     : translate(".input {$value :number} {{{$value} inches}}", {
@@ -102,7 +115,7 @@ const renderLength = (translate, measurements, length) => length === undefined
 /**
  * Render combat values of a melee weapon.
  */
-export const renderMeleeWeapon = (translate, translateMap, getInstanceById, measurements, renderDamage, closeCombatTechniqueId, use) => {
+export const renderMeleeWeapon = (translate, translateMap, localeJoin, getInstanceById, measurements, renderDamage, closeCombatTechniqueId, use) => {
     const combatTechnique = getInstanceById("CloseCombatTechnique", closeCombatTechniqueId);
     const fields = combatTechnique?.special ?? {
         can_parry: { kind: "Prohibited" },
@@ -137,7 +150,7 @@ export const renderMeleeWeapon = (translate, translateMap, getInstanceById, meas
                     ? undefined
                     : {
                         label: translate("Reach"),
-                        value: renderReach(translateMap, getInstanceById, use.reach),
+                        value: renderReach(translateMap, localeJoin, getInstanceById, use.reach),
                     },
                 fields.has_length.kind === "Prohibited"
                     ? undefined
@@ -159,7 +172,7 @@ const renderReloadTime = (translate, reloadTime) => isNotEmpty(reloadTime)
 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);
+    : (attributedName(translateMap, getInstanceById, "equipment", ammunition) ?? MISSING_VALUE);
 const renderMeleeDamage = (translate) => (damage) => renderDiceAndFlat(translate, damage.dice, damage.flat);
 /**
  * Render combat values of a ranged weapon.
@@ -713,7 +726,7 @@ export const getEquipmentEntityDescription = createEntityDescriptionCreator(({ g
         className: "equipment",
         body: [
             ...(combatValues?.type === "Weapon"
-                ? Object.entries(combatValues.values.melee_uses ?? {}).map(([combatTechniqueId, use]) => renderMeleeWeapon(translate, translateMap, getInstanceById, locale.measurementAdjustments, renderMeleeDamage(translate), combatTechniqueId, use))
+                ? Object.entries(combatValues.values.melee_uses ?? {}).map(([combatTechniqueId, use]) => renderMeleeWeapon(translate, translateMap, locale.join, getInstanceById, locale.measurementAdjustments, renderMeleeDamage(translate), combatTechniqueId, use))
                 : []),
             ...(combatValues?.type === "Weapon"
                 ? Object.entries(combatValues.values.ranged_uses ?? {}).map(([combatTechniqueId, use]) => renderRangedWeapon(translate, translateMap, getInstanceById, locale.measurementAdjustments, renderRangedDamage(translate), combatTechniqueId, use))

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

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisites, AnimistPowerPrerequisites, ArcaneTraditionPrerequisites, DerivedCharacteristicPrerequisites, EnhancementPrerequisites, GeneralPrerequisites, GeodeRitualPrerequisites, InfluencePrerequisites, LanguagePrerequisites, LiturgyPrerequisites, PersonalityTraitPrerequisites, PlainGeneralPrerequisites, ProfessionPrerequisites, PublicationPrerequisites, RatedIdentifier, SpecialAbilityIdentifier, SpellworkPrerequisites } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisites, AnimistPowerPrerequisites, ArcaneTraditionPrerequisites, DerivedCharacteristicPrerequisites, EnhancementPrerequisites, GeneralPrerequisites, GeodeRitualPrerequisites, InfluencePrerequisites, LanguagePrerequisites, LiturgyPrerequisites, PersonalityTraitPrerequisites, PlainGeneralPrerequisites, ProfessionPrerequisites, PublicationPrerequisites, RatedIdentifier, SpellworkPrerequisites } from "optolith-database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../../helpers/locale.js";
 import type { GetResolvedSelectOptionById } from "./single/activatable.js";
@@ -18,7 +18,7 @@ export declare const printPlainGeneralPrerequisites: (getInstanceById: GetInstan
  * Print general prerequisites as a string.
  */
 export declare const printGeneralPrerequisites: (getInstanceById: GetInstanceById<"Race" | "Culture" | "PactCategory" | "PactDomain" | "SocialStatus" | "State" | ActivatableIdentifier["kind"] | RatedIdentifier["kind"] | "Property" | "Aspect" | "Enhancement">, getResolvedSelectOptionById: GetResolvedSelectOptionById, locale: LocaleEnvironment, value: GeneralPrerequisites, printPreviousLevelPrerequisites?: {
-    id: SpecialAbilityIdentifier;
+    id: ActivatableIdentifier;
     levels: number;
 }, trailingText?: string) => string;
 /**
@@ -60,7 +60,7 @@ export declare const printAnimistPowerPrerequisites: (getInstanceById: GetInstan
 /**
  * Print geode ritual prerequisites as a string.
  */
-export declare const printGeodeRitualPrerequisites: (getInstanceById: GetInstanceById<"Influence">, locale: LocaleEnvironment, value: GeodeRitualPrerequisites) => string;
+export declare const printGeodeRitualPrerequisites: (getInstanceById: GetInstanceById<"Influence" | ActivatableIdentifier["kind"] | "Aspect">, getResolvedSelectOptionById: GetResolvedSelectOptionById, locale: LocaleEnvironment, value: GeodeRitualPrerequisites) => string;
 /**
  * Print enhancement prerequisites as a string.
  */

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

@@ -201,7 +201,7 @@ export const printAnimistPowerPrerequisites = (getInstanceById, locale, value) =
 /**
  * Print geode ritual prerequisites as a string.
  */
-export const printGeodeRitualPrerequisites = (getInstanceById, locale, value) => printPlainPrerequisites(prerequisite => printGeodeRitualPrerequisiteGroup(getInstanceById, locale, prerequisite), locale, value);
+export const printGeodeRitualPrerequisites = (getInstanceById, getResolvedSelectOptionById, locale, value) => printPlainPrerequisites(prerequisite => printGeodeRitualPrerequisiteGroup(getInstanceById, getResolvedSelectOptionById, locale, prerequisite), locale, value);
 /**
  * Print enhancement prerequisites as a string.
  */

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

@@ -54,7 +54,7 @@ export declare const printAnimistPowerPrerequisiteGroup: (getInstanceById: GetIn
 /**
  * Print the translation of a geode ritual prerequisite group.
  */
-export declare const printGeodeRitualPrerequisiteGroup: (getInstanceById: GetInstanceById<"Influence">, locale: LocaleEnvironment, prerequisite: GeodeRitualPrerequisiteGroup) => PrerequisitePart | undefined;
+export declare const printGeodeRitualPrerequisiteGroup: (getInstanceById: GetInstanceById<"Influence" | ActivatableIdentifier["kind"] | "Aspect">, getResolvedSelectOptionById: GetResolvedSelectOptionById, locale: LocaleEnvironment, prerequisite: GeodeRitualPrerequisiteGroup) => PrerequisitePart | undefined;
 /**
  * Print the translation of an enhancement prerequisite group.
  */

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

@@ -241,13 +241,16 @@ printAnimistPowerPrerequisite(getInstanceById, locale, prerequisite.AnimistPower
 /**
  * Print the translation of a geode ritual prerequisite group.
  */
-export const printGeodeRitualPrerequisiteGroup = (getInstanceById, locale, prerequisite) => 
-// switch (prerequisite.tag) {
-//   case "Influence":
-//   default:
-//     return assertExhaustive(prerequisite)
-// }
-printInfluencePrerequisite(getInstanceById, locale, prerequisite.Influence);
+export const printGeodeRitualPrerequisiteGroup = (getInstanceById, getResolvedSelectOptionById, locale, prerequisite) => {
+    switch (prerequisite.kind) {
+        case "Activatable":
+            return printActivatablePrerequisite(getInstanceById, getResolvedSelectOptionById, locale, prerequisite.Activatable, false);
+        case "Influence":
+            return printInfluencePrerequisite(getInstanceById, locale, prerequisite.Influence);
+        default:
+            return assertExhaustive(prerequisite);
+    }
+};
 /**
  * Print the translation of an enhancement prerequisite group.
  */

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

@@ -1,4 +1,4 @@
-import { attributedName } from "../../markdown.js";
+import { attributedCustomName } from "../../markdown.js";
 import { MISSING_VALUE } from "../../unknown.js";
 import { printDisplayOption } from "../displayOption.js";
 /**
@@ -9,7 +9,7 @@ export const printRatedPrerequisite = (getInstanceById, locale, prerequisite) =>
         return printDisplayOption(locale.translateMap, prerequisite.display_option);
     }
     return {
-        value: `${attributedName(locale.translateMap, getInstanceById, "prerequisite", prerequisite.id) ?? MISSING_VALUE} ${prerequisite.value.toFixed()}`,
+        value: `${attributedCustomName(locale.translateMap, getInstanceById, "prerequisite", (t) => t.abbreviation ?? t.name, prerequisite.id) ?? MISSING_VALUE} ${prerequisite.value.toFixed()}`,
         sentenceType: undefined,
         isMeta: false,
     };

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

@@ -1,6 +1,6 @@
 import { mapNullableDefault } from "@optolith/helpers/nullable";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
-import { divisionFormatter, multiplicationFormatter, } from "../../mathOperation.js";
+import { divisionFormatter, multiplicationFormatter } from "../../mathOperation.js";
 import { translateR } from "../../reader.js";
 const renderCheckResultBaseValue = (baseValue) => {
     switch (baseValue.kind) {
@@ -8,6 +8,8 @@ const renderCheckResultBaseValue = (baseValue) => {
             return translateR("QL");
         case "SkillPoints":
             return translateR("SP");
+        case "SkillRating":
+            return translateR("SR");
         default:
             return assertExhaustive(baseValue);
     }

package/lib/entities/poison.js

@@ -3,7 +3,7 @@ import { isNotNullish, mapNullable } from "@elyukai/utils/nullable";
 import { sign } from "@elyukai/utils/string/number";
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { createEntityDescriptionCreator } from "../creator.js";
-import { renderDice, renderDiceAndFlat } from "./partial/dice.js";
+import { renderDice } from "./partial/dice.js";
 import { renderAlternativeNames, renderChance, renderLaboratoryLevel, renderResistance, } from "./partial/herbary.js";
 import { renderMathOperation } from "./partial/mathOperation.js";
 import { printPlainGeneralPrerequisites } from "./partial/prerequisites/index.js";
@@ -93,6 +93,12 @@ const renderSourceTypeBasedValues = (translate, translateMap, getInstanceById, s
             return {
                 level: renderLevel(translate, translateMap, sourceType.AnimalVenom.level),
                 sourceType: translate("animal venom"),
+                tradeSecret: mapNullable(sourceType.AnimalVenom.complexity, complexity => complexity.kind === "Complex"
+                    ? {
+                        apValue: complexity.Complex.ap_value,
+                        prerequisites: complexity.Complex.prerequisites,
+                    }
+                    : undefined),
             };
         case "AlchemicalPoison": {
             const translation = translateMap(sourceType.AlchemicalPoison.translations);
@@ -156,10 +162,19 @@ const renderStart = (translate, translateMap, start) => {
     switch (start.kind) {
         case "Immediate":
             return translate("immediate");
-        case "Constant":
-            return formatTimeSpan(translate, ResponsiveTextSize.Full, start.Constant.unit, start.Constant.value);
-        case "DiceBased":
-            return formatTimeSpan(translate, ResponsiveTextSize.Full, start.DiceBased.unit, renderDiceAndFlat(translate, start.DiceBased.dice, start.DiceBased.flat));
+        case "ExpressionBased":
+            return renderMathOperation(start.ExpressionBased.value, value => {
+                switch (value.kind) {
+                    case "Constant":
+                        return value.Constant.toFixed();
+                    case "Dice":
+                        return renderDice(translate, value.Dice);
+                    case "CircleOfDamnation":
+                        return translate("CoD");
+                    default:
+                        return assertExhaustive(value);
+                }
+            });
         case "Indefinite":
             return translateMap(start.Indefinite.translations)?.description ?? MISSING_VALUE;
         default:
@@ -170,10 +185,6 @@ const renderDuration = (translate, translateMap, duration) => {
     switch (duration.kind) {
         case "Instant":
             return translate("instant");
-        case "Constant":
-            return formatTimeSpan(translate, ResponsiveTextSize.Full, duration.Constant.unit, duration.Constant.value);
-        case "DiceBased":
-            return formatTimeSpan(translate, ResponsiveTextSize.Full, duration.DiceBased.unit, renderDiceAndFlat(translate, duration.DiceBased.dice, duration.DiceBased.flat));
         case "ExpressionBased":
             return renderMathOperation(duration.ExpressionBased.value, value => {
                 switch (value.kind) {

package/lib/entities/profession.d.ts

@@ -1,11 +1,11 @@
-import type { MagicalActionIdentifier, RatedIdentifier, SpecialAbilityIdentifier } from "optolith-database-schema/gen";
+import type { MagicalActionIdentifier, ProfessionSpecialAbilityIdentifier, RatedIdentifier } from "optolith-database-schema/gen";
 import type { GetAllChildInstancesForParent, GetAllInstances, GetInstanceById } from "../helpers/getTypes.js";
 import { type GetResolvedSelectOptionById } from "./partial/prerequisites/single/activatable.js";
 /**
  * Get a JSON representation of the rules text for a profession version.
  */
 export declare const getProfessionVersionEntityDescription: import("../creator.js").EntityDescriptionCreator<"ProfessionVersion", {
-    getInstanceById: GetInstanceById<"Publication" | "ExperienceLevel" | "Advantage" | "Disadvantage" | SpecialAbilityIdentifier["kind"] | "Aspect" | RatedIdentifier["kind"] | "Race" | "Culture" | MagicalActionIdentifier["kind"] | "SkillGroup" | "Cantrip" | "Blessing">;
+    getInstanceById: GetInstanceById<"Publication" | "ExperienceLevel" | "Advantage" | "Disadvantage" | ProfessionSpecialAbilityIdentifier["kind"] | "Aspect" | RatedIdentifier["kind"] | "Race" | "Culture" | MagicalActionIdentifier["kind"] | "SkillGroup" | "Cantrip" | "Blessing">;
     getAllInstances: GetAllInstances<"SkillGroup">;
     getChildInstancesForInstanceId: GetAllChildInstancesForParent<"ProfessionPackage" | "ProfessionVariant">;
     getResolvedSelectOptionById: GetResolvedSelectOptionById;

package/lib/entities/profession.js

@@ -7,7 +7,7 @@ import { omitKeys } from "@elyukai/utils/object";
 import { compareNumber } from "@elyukai/utils/ordering";
 import { Reader } from "@elyukai/utils/reader";
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
-import { fromUniformCase } from "tsondb/schema/gen";
+import { Case, fromUniformCase } from "tsondb/schema/gen";
 import { createEntityDescriptionCreator } from "../creator.js";
 import { combineNameComponents, getNameComponents, renderActivatableNameComponents, renderCombinedActivatableNameComponents, } from "./partial/activatableNameChunks.js";
 import { renderCommonnessRatedAdvantagesOrDisadvantages, renderValueWithPossibleTranslation, } from "./partial/commonnessRatedAdvantagesAndDisadvantages.js";
@@ -103,7 +103,7 @@ const renderCombatTechniquesOption = (option) => isNotEmpty(option.fixed)
         })), firstTextR);
         const completeTextR = fixedTextR.then(fixedText => option.rest_rating_modifier === undefined
             ? Reader.of(fixedText)
-            : translateR("{$previous}, all others {$rating}", {
+            : translateR("{$previous}, the others {$rating}", {
                 previous: fixedText,
                 rating: option.rest_rating_modifier + 6,
             }));
@@ -123,10 +123,36 @@ const getTotalingAPValues = (professionPackages, selector) => {
             options[0].ap_value
         : options.map(option => option?.ap_value ?? 0).join("/");
 };
-const renderSkillsOption = (professionPackages, skillGroup) => mapNullable(getTotalingAPValues(professionPackages, pkg => pkg.content.options?.skills?.group === skillGroup.id ? pkg.content.options.skills : undefined), apValue => translateR("{$apValue} AP to improve other {$skillsOfGroup}", {
-    apValue,
-    skillsOfGroup: skillGroup.nameOfSkillsOfGroup,
-})) ?? Reader.of(undefined);
+const renderSkillsOption = (professionPackages, skillGroup) => allSame(professionPackages.filter(pkg => pkg.content.options?.skills?.group === skillGroup.id), on(pkg => pkg.content.options?.skills?.specific, deepEqual))
+    ? (mapNullable(getTotalingAPValues(professionPackages, pkg => pkg.content.options?.skills?.group === skillGroup.id
+        ? pkg.content.options.skills
+        : undefined), apValue => professionPackages[0].content.options?.skills?.specific === undefined
+        ? translateR("{$apValue} AP to improve other {$skillsOfGroup}", {
+            apValue,
+            skillsOfGroup: skillGroup.nameOfSkillsOfGroup,
+        })
+        : Reader.traverse(professionPackages[0].content.options.skills.specific, id => attributedNameR("profession", "Skill", id).map(name => name ?? MISSING_VALUE))
+            .thenW(localeSortR)
+            .thenW(list => translateR("{$apValue} AP to distribute among the following skills: {$list}", {
+            apValue,
+            list: list.join(", "),
+        }))) ?? Reader.of(undefined))
+    : Reader.traverse(professionPackages, pkg => {
+        const skillsOption = pkg.content.options?.skills;
+        return skillsOption === undefined
+            ? Reader.of("—")
+            : skillsOption.specific === undefined
+                ? translateR("{$apValue} AP to improve other {$skillsOfGroup}", {
+                    apValue: skillsOption.ap_value,
+                    skillsOfGroup: skillGroup.nameOfSkillsOfGroup,
+                })
+                : Reader.traverse(skillsOption.specific, id => attributedNameR("profession", "Skill", id).map(name => name ?? MISSING_VALUE))
+                    .thenW(localeSortR)
+                    .thenW(list => translateR("{$apValue} AP to distribute among the following skills: {$list}", {
+                    apValue: skillsOption.ap_value,
+                    list: list.join(", "),
+                }));
+    }).map(list => list.join(" / "));
 const renderCantripList = (cantripIds) => Reader.traverse(cantripIds, id => attributedNameR("profession", "Cantrip", id).map(name => name ?? MISSING_VALUE))
     .thenW(localeSortR)
     .map(list => list.join(", "));
@@ -256,7 +282,69 @@ const renderVariantLiturgiesOption = (baseOptions, variantOptions) => renderVari
         apValue,
     })),
 });
-const getSpecialAbilityNameComponents = (getInstanceById, getResolvedSelectOptionById, translate, option) => {
+const getEnhancementBaseName = (translate, enhancement, parentName) => {
+    switch (enhancement.parent.kind) {
+        case "Spell":
+            return translate("Spell Enhancement {$spell}", { spell: parentName });
+        case "Ritual":
+            return translate("Ritual Enhancement {$ritual}", { ritual: parentName });
+        case "LiturgicalChant":
+        case "Ceremony":
+            return translate("Liturgical Enhancement {$liturgicalChantOrCeremony}", {
+                liturgicalChantOrCeremony: parentName,
+            });
+        default:
+            return assertExhaustive(enhancement.parent);
+    }
+};
+const isEnhancementNameComponents = (components) => components.id.kind === "Enhancement";
+const isActivatableNameComponents = (components) => !isEnhancementNameComponents(components);
+const getEnhancementNameComponents = (getInstanceById, translate, translateMap, id) => {
+    const instance = getInstanceById("Enhancement", id);
+    if (instance === undefined) {
+        return undefined;
+    }
+    return {
+        id: Case("Enhancement", id),
+        parent: instance.parent,
+        base: getEnhancementBaseName(translate, instance, attributedName(translateMap, getInstanceById, "profession", instance.parent) ?? MISSING_VALUE),
+        options: translateMap(instance.translations)?.name ?? MISSING_VALUE,
+    };
+};
+const renderEnhancementNameComponents = (chunk) => [chunk.base, chunk.options].join(" ");
+const isCombinedEnhancementNameComponents = (components) => Array.isArray(components.id);
+const combineEnhancementNameComponents = (chunks) => {
+    if (allSame(chunks, (a, b) => deepEqual(a.parent, b.parent)) && isNotEmpty(chunks)) {
+        const [first, ...rest] = chunks;
+        return {
+            id: [first.id, ...rest.map(chunk => chunk.id)],
+            parent: first.parent,
+            base: first.base,
+            options: [
+                [first.id, first.options],
+                ...rest.map((chunk) => [
+                    chunk.id,
+                    chunk.options,
+                ]),
+            ],
+        };
+    }
+    else {
+        return undefined;
+    }
+};
+const renderCombinedEnhancementNameComponents = (chunk) => [
+    chunk.base,
+    chunk.options
+        .map(([optionId, optionName]) => attributedInstance(optionName, optionId.kind, optionId.Enhancement, {
+        context: `"profession"`,
+    }))
+        .join(" + "),
+].join(" ");
+const getSpecialAbilityNameComponents = (getInstanceById, getResolvedSelectOptionById, translate, translateMap, option) => {
+    if (option.id.kind === "Enhancement") {
+        return getEnhancementNameComponents(getInstanceById, translate, translateMap, option.id.Enhancement);
+    }
     const instance = getInstanceById(option.id);
     if (instance === undefined) {
         return undefined;
@@ -264,26 +352,33 @@ const getSpecialAbilityNameComponents = (getInstanceById, getResolvedSelectOptio
     return getNameComponents(translate, option.id, option.options, option.level, "nameBuilderRules" in instance ? instance.nameBuilderRules : undefined, instance.translations, t => t.name, getResolvedSelectOptionById, true);
 };
 const wrapActivatableInAttributedString = (text, id) => attributedInstance(text, id.kind, fromUniformCase(id), { context: '"prerequisite"' });
+const renderSingleActivatableNameChunk = (translateMap, chunk) => chunk === undefined
+    ? MISSING_VALUE
+    : wrapActivatableInAttributedString(isEnhancementNameComponents(chunk)
+        ? renderEnhancementNameComponents(chunk)
+        : renderActivatableNameComponents(translateMap, chunk, false), chunk.id);
 const renderSpecialAbilityName = (specialAbility) => Reader.asks(({ translate, translateMap, localeJoin, getInstanceById, getResolvedSelectOptionById, }) => {
     switch (specialAbility.kind) {
         case "Constant": {
-            const chunk = getSpecialAbilityNameComponents(getInstanceById, getResolvedSelectOptionById, translate, specialAbility.Constant);
-            return chunk === undefined
-                ? MISSING_VALUE
-                : wrapActivatableInAttributedString(renderActivatableNameComponents(translateMap, chunk, false), chunk.id);
+            const chunk = getSpecialAbilityNameComponents(getInstanceById, getResolvedSelectOptionById, translate, translateMap, specialAbility.Constant);
+            return renderSingleActivatableNameChunk(translateMap, chunk);
         }
         case "Selection": {
-            const chunks = specialAbility.Selection.options.map(option => getSpecialAbilityNameComponents(getInstanceById, getResolvedSelectOptionById, translate, option));
+            const chunks = specialAbility.Selection.options.map(option => getSpecialAbilityNameComponents(getInstanceById, getResolvedSelectOptionById, translate, translateMap, option));
             const possiblyCombined = isNotEmpty(specialAbility.Selection.options) && chunks.every(isNotNullish)
-                ? combineNameComponents(chunks)
+                ? chunks.every(isEnhancementNameComponents)
+                    ? combineEnhancementNameComponents(chunks)
+                    : chunks.every(isActivatableNameComponents)
+                        ? combineNameComponents(chunks)
+                        : undefined
                 : undefined;
             if (possiblyCombined === undefined) {
-                return localeJoin(chunks.map(chunk => chunk === undefined
-                    ? MISSING_VALUE
-                    : wrapActivatableInAttributedString(renderActivatableNameComponents(translateMap, chunk, false), chunk.id)), "disjunction");
+                return localeJoin(chunks.map(chunk => renderSingleActivatableNameChunk(translateMap, chunk)), "disjunction");
             }
             else {
-                return wrapActivatableInAttributedString(renderCombinedActivatableNameComponents(translateMap, possiblyCombined, false, list => localeJoin(list, "disjunction")), possiblyCombined.id);
+                return isCombinedEnhancementNameComponents(possiblyCombined)
+                    ? renderCombinedEnhancementNameComponents(possiblyCombined)
+                    : wrapActivatableInAttributedString(renderCombinedActivatableNameComponents(translateMap, possiblyCombined, false, list => localeJoin(list, "disjunction")), possiblyCombined.id);
             }
         }
         default:

package/lib/entities/race.d.ts

@@ -3,7 +3,7 @@ import type { CountInstances, GetAllChildInstancesForParent, GetInstanceById } f
  * Get a JSON representation of the rules text for a race.
  */
 export declare const getRaceEntityDescription: import("../creator.js").EntityDescriptionCreator<"Race", {
-    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "Advantage" | "Disadvantage" | "Culture">;
+    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "Advantage" | "Disadvantage" | "Culture" | "DerivedCharacteristic">;
     countInstances: CountInstances<"Attribute">;
     getChildInstancesForInstanceId: GetAllChildInstancesForParent<"RaceVariant">;
 }, import("../index.js").EntityDescription>;