@optolith/entity-descriptions 0.4.10 → 0.4.12

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

@@ -1,4 +1,4 @@
-import type { InfluencePrerequisite } from "optolith-database-schema/gen";
+import type { InfluencePrerequisite } 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";

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

@@ -1,4 +1,4 @@
-import type { MagicalTraditionPrerequisite } from "optolith-database-schema/gen";
+import type { MagicalTraditionPrerequisite } from "@optolith/database-schema/gen";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { PactPrerequisite } from "optolith-database-schema/gen";
+import type { PactPrerequisite } 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";

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

@@ -1,4 +1,4 @@
-import type { PersonalityTraitPrerequisite } from "optolith-database-schema/gen";
+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";

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

@@ -1,4 +1,4 @@
-import type { PrimaryAttributePrerequisite } from "optolith-database-schema/gen";
+import type { PrimaryAttributePrerequisite } from "@optolith/database-schema/gen";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { ProfessionPrerequisite } from "optolith-database-schema/gen";
+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";

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

@@ -1,4 +1,4 @@
-import type { PublicationPrerequisite } from "optolith-database-schema/gen";
+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";

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

@@ -1,4 +1,4 @@
-import type { RacePrerequisite } from "optolith-database-schema/gen";
+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";

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

@@ -1,4 +1,4 @@
-import type { RatedPrerequisite } from "optolith-database-schema/gen";
+import type { RatedPrerequisite } 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";

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/prerequisites/single/ratedMinimumNumber.d.ts

@@ -1,4 +1,4 @@
-import type { RatedMinimumNumberPrerequisite } from "optolith-database-schema/gen";
+import type { RatedMinimumNumberPrerequisite } 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";

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

@@ -1,4 +1,4 @@
-import type { RatedSumPrerequisite } from "optolith-database-schema/gen";
+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";

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

@@ -1,4 +1,4 @@
-import type { RulePrerequisite } from "optolith-database-schema/gen";
+import type { RulePrerequisite } from "@optolith/database-schema/gen";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { SexPrerequisite } from "optolith-database-schema/gen";
+import type { SexPrerequisite } from "@optolith/database-schema/gen";
 import type { Translate } from "../../../../helpers/translate.js";
 import type { PrerequisitePart } from "../part.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { SexualCharacteristicPrerequisite } from "optolith-database-schema/gen";
+import type { SexualCharacteristicPrerequisite } from "@optolith/database-schema/gen";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { SocialStatusPrerequisite } from "optolith-database-schema/gen";
+import type { SocialStatusPrerequisite } 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";

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

@@ -1,4 +1,4 @@
-import type { StatePrerequisite } from "optolith-database-schema/gen";
+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";

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

@@ -1,4 +1,4 @@
-import type { TextPrerequisite } from "optolith-database-schema/gen";
+import type { TextPrerequisite } from "@optolith/database-schema/gen";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { Profession_ID, ProfessionPackage } from "optolith-database-schema/gen";
+import type { Profession_ID, ProfessionPackage } from "@optolith/database-schema/gen";
 import type { GetAllChildInstancesForParent, GetAllInstances } from "../../helpers/getTypes.js";
 import type { TranslateMap } from "../../helpers/translate.js";
 import type { IdMap } from "../../index.js";

package/lib/entities/partial/professions.js

@@ -9,11 +9,9 @@ export const getBaseProfessionPackageForCurriculum = (getAllInstances, getChildI
     if (baseProfession === undefined) {
         return undefined;
     }
-    return reduceWhile(getChildInstancesForInstanceId("ProfessionVersion", baseProfession.id), (_acc, version) => getChildInstancesForInstanceId("ProfessionPackage", version.id).find(professionPackage => professionPackage.content.experience_level ===
-        idMap.ExperienceLevel.Experienced), isNotNullish, undefined);
+    return reduceWhile(getChildInstancesForInstanceId("ProfessionVersion", baseProfession.id), (_acc, version) => getChildInstancesForInstanceId("ProfessionPackage", version.id).find(professionPackage => professionPackage.content.experience_level === idMap.ExperienceLevel.Experienced), isNotNullish, undefined);
 };
 /**
  * Gets the name of a profession, regardless of the profession version.
  */
-export const getProfessionName = (translateMap, getChildInstancesForInstanceId, professionId) => translateMap(getChildInstancesForInstanceId("ProfessionVersion", professionId)[0]
-    ?.content.translations)?.name.default;
+export const getProfessionName = (translateMap, getChildInstancesForInstanceId, professionId) => translateMap(getChildInstancesForInstanceId("ProfessionVersion", professionId)[0]?.content.translations)?.name.default;

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

@@ -1,4 +1,4 @@
-import type { 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/checkResultBased.d.ts

@@ -1,4 +1,4 @@
-import type { CheckResultBasedModifier, CheckResultValue } from "optolith-database-schema/gen";
+import type { CheckResultBasedModifier, CheckResultValue } from "@optolith/database-schema/gen";
 import { type StdReader } from "../../reader.js";
 interface CheckResultBased {
     /**

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/partial/rated/activatable/cost.d.ts

@@ -1,5 +1,5 @@
 import { Reader } from "@elyukai/utils/reader";
-import type { CheckResultBasedModifier, DurationUnitValue, ElvenMagicalSongPermanentCost, FirstPersonMagicalMelodyCost, NonModifiableOneTimeCostPerCountable, NonModifiableSustainedCost, OneTimeCost, OneTimeCostMap, ResponsiveText, ResponsiveTextOptional, ResponsiveTextReplace, SkillModificationLevel_ID, SustainedCost } 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/duration.d.ts

@@ -1,4 +1,4 @@
-import type { CastingTimeDuringLovemaking, CheckResultBasedDuration, DurationForSustained, FixedDuration, Immediate, MusicDuration, PermanentDuration, ResponsiveText } from "optolith-database-schema/gen";
+import type { CastingTimeDuringLovemaking, CheckResultBasedDuration, DurationForSustained, FixedDuration, Immediate, MusicDuration, PermanentDuration, ResponsiveText } from "@optolith/database-schema/gen";
 import type { LocaleMap } from "../../../../helpers/translate.js";
 import { type StdReader } from "../../reader.js";
 /**

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

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

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

@@ -1,4 +1,4 @@
-import type { FastOneTimePerformanceParameters, FastSustainedPerformanceParameters, OneTimePerformanceParameters, ResponsiveTextOptional, 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 = {

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

@@ -1,4 +1,4 @@
-import type { CheckResultBasedRange, FixedRange, Range, RangeValue } from "optolith-database-schema/gen";
+import type { CheckResultBasedRange, FixedRange, Range, RangeValue } from "@optolith/database-schema/gen";
 import { type StdReader } from "../../reader.js";
 /**
  * Returns the text for the non-modifiable range of an activatable skill.

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

@@ -1,4 +1,4 @@
-import type { 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.d.ts

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

package/lib/entities/partial/rated/improvementCost.d.ts

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

package/lib/entities/partial/rated/skillCheck.d.ts

@@ -1,4 +1,4 @@
-import type { SkillCheckPenalty as GeneralSkillCheckPenalty, MagicalRuneCombatTechniqueCheckPenalty, SkillCheck } from "optolith-database-schema/gen";
+import type { SkillCheckPenalty as GeneralSkillCheckPenalty, MagicalRuneCombatTechniqueCheckPenalty, SkillCheck } from "@optolith/database-schema/gen";
 import { type IdMap } from "../../../index.js";
 import { type StdReader } from "../reader.js";
 /**

package/lib/entities/partial/rated/skillCheck.js

@@ -8,8 +8,8 @@ import { MISSING_VALUE } from "../unknown.js";
 export const renderSkillCheck = (check) => Reader.asks(({ translate, translateMap, getInstanceById }) => ({
     label: translate("Check"),
     value: check
-        .map(id => translateMap(getInstanceById("Attribute", id)?.translations)
-        ?.abbreviation ?? MISSING_VALUE)
+        .map(id => translateMap(getInstanceById("Attribute", id)?.translations)?.abbreviation ??
+        MISSING_VALUE)
         .join("/"),
 }));
 const renderSkillCheckPenalty = (idMap, penalty) => {
@@ -53,7 +53,9 @@ const renderSkillCheckPenalty = (idMap, penalty) => {
 export const renderSkillCheckWithPenalty = (check, checkPenalty, idMap) => checkPenalty === undefined
     ? renderSkillCheck(check)
     : renderSkillCheck(check).thenW(checkText => renderSkillCheckPenalty(idMap, checkPenalty)
-        .then(penaltyText => responsiveTranslateR(" (modified by {$modifier})", " (−{$modifier})", { modifier: penaltyText }))
+        .then(penaltyText => responsiveTranslateR(" (modified by {$modifier})", " (−{$modifier})", {
+        modifier: penaltyText,
+    }))
         .map(penaltyText => ({
         ...checkText,
         value: checkText.value + penaltyText,

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

@@ -1,5 +1,5 @@
 import { Reader } from "@elyukai/utils/reader";
-import type { ChildEntityMap, EntityMap, FastSkillModificationLevelConfig, ResponsiveText, ResponsiveTextOptional, SkillModificationLevel, SlowSkillModificationLevelConfig } from "optolith-database-schema/gen";
+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 { FormatNumber, LocaleCompare, LocaleJoin, LocaleJoinType } from "../../helpers/locale.js";

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

@@ -1,5 +1,5 @@
 import { Reader } from "@elyukai/utils/reader";
-import type { ResponsiveText, ResponsiveTextOptional, ResponsiveTextReplace } from "optolith-database-schema/gen";
+import type { ResponsiveText, ResponsiveTextOptional, ResponsiveTextReplace } from "@optolith/database-schema/gen";
 import { type LocaleMap } from "../../helpers/translate.js";
 import { type StdEnv } from "./reader.js";
 /**

package/lib/entities/poison.d.ts

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier, RatedIdentifier } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier, RatedIdentifier } from "@optolith/database-schema/gen";
 import type { GetInstanceById } from "../helpers/getTypes.js";
 import type { IdMap } from "../index.js";
 import type { GetResolvedSelectOptionById } from "./partial/prerequisites/single/activatable.js";

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("maximum SR per skill: {$maxSR}", { maxSR: 8 }).then(maxSRText => translateR("{$apValue} AP to distribute among the following skills: {$list}", {
+                    apValue: skillsOption.ap_value,
+                    list: list.join(", ") + parensIf(maxSRText),
+                })));
+    }).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:
@@ -612,10 +707,10 @@ export const getProfessionVersionEntityDescription = createEntityDescriptionCrea
                             value,
                         })
                         .run(env),
-                    renderValueWithPossibleTranslation("Suggested Advantages", entry.suggested_advantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Advantage", values).run(env), translation.suggested_advantages).run(env),
-                    renderValueWithPossibleTranslation("Suggested Disadvantages", entry.suggested_disadvantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Disadvantage", values).run(env), translation.suggested_disadvantages).run(env),
-                    renderValueWithPossibleTranslation("Unsuitable Advantages", entry.unsuitable_advantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Advantage", values).run(env), translation.unsuitable_advantages).run(env),
-                    renderValueWithPossibleTranslation("Unsuitable Disadvantages", entry.unsuitable_disadvantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Disadvantage", values).run(env), translation.unsuitable_disadvantages).run(env),
+                    renderValueWithPossibleTranslation("Suggested Advantages", entry.suggested_advantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Advantage", values, translate("none")).run(env), translation.suggested_advantages).run(env),
+                    renderValueWithPossibleTranslation("Suggested Disadvantages", entry.suggested_disadvantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Disadvantage", values, translate("none")).run(env), translation.suggested_disadvantages).run(env),
+                    renderValueWithPossibleTranslation("Unsuitable Advantages", entry.unsuitable_advantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Advantage", values, translate("none")).run(env), translation.unsuitable_advantages).run(env),
+                    renderValueWithPossibleTranslation("Unsuitable Disadvantages", entry.unsuitable_disadvantages, values => renderCommonnessRatedAdvantagesOrDisadvantages("Disadvantage", values, translate("none")).run(env), translation.unsuitable_disadvantages).run(env),
                     renderProfessionVariants(professionPackages)
                         .map(value => value === undefined
                         ? undefined

package/lib/entities/race.d.ts

@@ -1,9 +1,11 @@
 import type { CountInstances, GetAllChildInstancesForParent, GetInstanceById } from "../helpers/getTypes.js";
+import type { GetResolvedSelectOptionById } from "./partial/prerequisites/single/activatable.js";
 /**
  * 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">;
+    getResolvedSelectOptionById: GetResolvedSelectOptionById;
 }, import("../index.js").EntityDescription>;