@optolith/entity-descriptions 0.11.0 → 0.11.2

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 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.11.2](https://github.com/Optolith/entity-descriptions/compare/v0.11.1...v0.11.2) (2026-09-14)
+
+### Bug Fixes
+
+* activatable prerequisite disjunctions ([7895f89](https://github.com/Optolith/entity-descriptions/commit/7895f89735315a6a97a7a03bbcdc1c58361763b9)), closes [#52](https://github.com/Optolith/entity-descriptions/issues/52)
+* correctly signed and labeled AP value depending on active entries ([27e3a7a](https://github.com/Optolith/entity-descriptions/commit/27e3a7a4975368651b443520f08bdd918e81a019))
+* correctly signed value in IC derived AP value ([99fa203](https://github.com/Optolith/entity-descriptions/commit/99fa20395d8e9a378194673388d38e26938982bd))
+* derived combat technique ap value ([0ad0554](https://github.com/Optolith/entity-descriptions/commit/0ad0554f2eee7857dbaa7717a3742e70b5735f1f))
+## [0.11.1](https://github.com/Optolith/entity-descriptions/compare/v0.11.0...v0.11.1) (2026-09-13)
+
+### Features
+
+* attributed target category ([8411c00](https://github.com/Optolith/entity-descriptions/commit/8411c00eb0ac8df5f4335a41db951578cbaffe26))
+
+### Bug Fixes
+
+* advanced special ability sorting ([fd8ec9c](https://github.com/Optolith/entity-descriptions/commit/fd8ec9cf41625bc67f243850045f2bdf358bae5b)), closes [#50](https://github.com/Optolith/entity-descriptions/issues/50)
+* advanced special ability sorting (other parts) ([75ccc67](https://github.com/Optolith/entity-descriptions/commit/75ccc671ad4a60116067a0b5df143d0b1c1cc3f9))
+* display additional name ([460385e](https://github.com/Optolith/entity-descriptions/commit/460385ee19ea7be58766fb46859256514c75208f))
 ## [0.11.0](https://github.com/Optolith/entity-descriptions/compare/v0.10.0...v0.11.0) (2026-09-13)
 
 ### ⚠ BREAKING CHANGES

package/lib/entities/activatable.d.ts

@@ -34,6 +34,7 @@ export type BaseActivatable = {
  */
 export type BaseActivatableTranslation = {
     name: string;
+    additionalName?: string;
     name_in_library?: string;
     rules?: string;
     range?: string;
@@ -48,7 +49,7 @@ export type BaseActivatableTranslation = {
 /**
  * Get a JSON representation of the rules text for a special ability.
  */
-export declare const getActivatableEntityDescription: import("../creator.js").EntityDescriptionCreator<"AdvancedCombatSpecialAbility" | "AdvancedKarmaSpecialAbility" | "AdvancedMagicalSpecialAbility" | "AdvancedSkillSpecialAbility" | "Advantage" | "AncestorGlyph" | "ArcaneOrbEnchantment" | "AttireEnchantment" | "Beutelzauber" | "BlessedTradition" | "BowlEnchantment" | "BrawlingSpecialAbility" | "CauldronEnchantment" | "CeremonialItemSpecialAbility" | "ChronicleEnchantment" | "CombatSpecialAbility" | "CombatStyleSpecialAbility" | "CommandSpecialAbility" | "DaggerRitual" | "Disadvantage" | "FamiliarSpecialAbility" | "FatePointSexSpecialAbility" | "FatePointSpecialAbility" | "FoolsHatEnchantment" | "GeneralSpecialAbility" | "Haubenzauber" | "Hauerkettenzauber" | "InstrumentEnchantment" | "KarmaSpecialAbility" | "Keulenzauber" | "Krallenkettenzauber" | "Kristallkugelzauber" | "LiturgicalStyleSpecialAbility" | "LycantropicGift" | "MagicStyleSpecialAbility" | "MagicalSign" | "MagicalSpecialAbility" | "MagicalTradition" | "OrbEnchantment" | "PactGift" | "ProtectiveWardingCircleSpecialAbility" | "RingEnchantment" | "Schweinetrommelzauber" | "Sermon" | "SexSpecialAbility" | "SickleRitual" | "SikaryanDrainSpecialAbility" | "SkillStyleSpecialAbility" | "SpellSwordEnchantment" | "StaffEnchantment" | "ToyEnchantment" | "Trinkhornzauber" | "VampiricGift" | "Vision" | "WandEnchantment" | "WeaponEnchantment", {
+export declare const getActivatableEntityDescription: import("../creator.js").EntityDescriptionCreator<"Advantage" | "Disadvantage" | "AdvancedCombatSpecialAbility" | "AdvancedKarmaSpecialAbility" | "AdvancedMagicalSpecialAbility" | "AdvancedSkillSpecialAbility" | "AncestorGlyph" | "ArcaneOrbEnchantment" | "AttireEnchantment" | "Beutelzauber" | "BlessedTradition" | "BowlEnchantment" | "BrawlingSpecialAbility" | "CauldronEnchantment" | "CeremonialItemSpecialAbility" | "ChronicleEnchantment" | "CombatSpecialAbility" | "CombatStyleSpecialAbility" | "CommandSpecialAbility" | "DaggerRitual" | "FamiliarSpecialAbility" | "FatePointSexSpecialAbility" | "FatePointSpecialAbility" | "FoolsHatEnchantment" | "GeneralSpecialAbility" | "Haubenzauber" | "Hauerkettenzauber" | "InstrumentEnchantment" | "KarmaSpecialAbility" | "Keulenzauber" | "Krallenkettenzauber" | "Kristallkugelzauber" | "LiturgicalStyleSpecialAbility" | "LycantropicGift" | "MagicalSign" | "MagicalSpecialAbility" | "MagicalTradition" | "MagicStyleSpecialAbility" | "OrbEnchantment" | "PactGift" | "ProtectiveWardingCircleSpecialAbility" | "RingEnchantment" | "Schweinetrommelzauber" | "Sermon" | "SexSpecialAbility" | "SickleRitual" | "SikaryanDrainSpecialAbility" | "SkillStyleSpecialAbility" | "SpellSwordEnchantment" | "StaffEnchantment" | "ToyEnchantment" | "Trinkhornzauber" | "VampiricGift" | "Vision" | "WandEnchantment" | "WeaponEnchantment", {
     getInstanceById: GetInstanceById<"Publication" | "Subject" | ActivatableIdentifier["kind"] | RatedIdentifier["kind"] | "TradeSecret" | "Aspect" | "Property" | "Race" | "Culture" | "State" | "Enhancement" | "PactCategory" | "PactDomain" | "SocialStatus" | "Weapon" | "Patron" | "PersonalityTrait" | "Brew" | "Blessing" | "Cantrip">;
     getAllInstances: GetAllInstances<"Script">;
     getResolvedSelectOptionById: GetResolvedSelectOptionById;

package/lib/entities/activatable.js

@@ -4,6 +4,7 @@ import { count } from "@elyukai/utils/array/reductions";
 import { deepEqual } from "@elyukai/utils/equality";
 import { constant, on } from "@elyukai/utils/function";
 import { isNotNullish } from "@elyukai/utils/nullable";
+import { reduceCompare } from "@elyukai/utils/ordering";
 import { Reader } from "@elyukai/utils/reader";
 import { numAsc } from "@optolith/helpers/compare";
 import { sign } from "@optolith/helpers/math";
@@ -21,7 +22,7 @@ import { printAdvantageDisadvantagePrerequisites, printGeneralPrerequisites, } f
 import { printActivatableName, } from "./partial/prerequisites/single/activatable.js";
 import { renderStandaloneCostMap } from "./partial/rated/activatable/cost.js";
 import { parensIf } from "./partial/rated/activatable/parensIf.js";
-import { attributedNameR, localeSortR, nameR, translateR, } from "./partial/reader.js";
+import { attributedNameR, localeSortR, nameR, translateR } from "./partial/reader.js";
 import { getResponsiveText, getResponsiveTextOptional, ResponsiveTextSize, } from "./partial/responsiveText.js";
 import { formatTimeSpan } from "./partial/units/timeSpan.js";
 import { MISSING_VALUE } from "./partial/unknown.js";
@@ -544,9 +545,14 @@ const normalizeId = (entityName, id) => {
 };
 const renderAdvancedSpecialAbilityName = (translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, id, option) => {
     const normalizedId = normalizeId(entityName, id);
-    return `^[${mapNullable(printActivatableName(getInstanceById, translate, normalizedId, option, undefined, getResolvedSelectOptionById, false), name => renderActivatableNameComponents(translateMap, name, false)) ?? MISSING_VALUE}](entity: "${normalizedId.kind}", instance: "${fromUniformCase(normalizedId)}", style: "normal")`;
+    return `^[${mapNullable(printActivatableName(normalizedId, option, undefined).run({
+        getInstanceById,
+        translate,
+        getResolvedSelectOptionById,
+        displayedInProfession: false,
+    }), name => renderActivatableNameComponents(translateMap, name, false)) ?? MISSING_VALUE}](entity: "${normalizedId.kind}", instance: "${fromUniformCase(normalizedId)}", style: "normal")`;
 };
-const renderAdvancedValue = (translate, translateMap, localeJoin, getInstanceById, getResolvedSelectOptionById, entityName, advanced) => {
+const renderAdvancedValue = (translate, translateMap, localeJoin, localeCompare, getInstanceById, getResolvedSelectOptionById, entityName, advanced) => {
     if (advanced.every(entry => entry.kind === "OneOf") &&
         isNotEmpty(advanced) &&
         advanced.every(entry => entry.OneOf.options.length === 3)) {
@@ -558,7 +564,9 @@ const renderAdvancedValue = (translate, translateMap, localeJoin, getInstanceByI
             if (uniqueOptions.length === advanced.length) {
                 const [first, second] = optionsInAllEntries.map(option => renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, option));
                 return [
-                    ...uniqueOptions.map(option => renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, option)),
+                    ...uniqueOptions
+                        .map(option => renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, option))
+                        .toSorted(localeCompare),
                     translate("one or two of these special abilities can alternatively be replaced by advanced special abilities {$first} and/or {$second}", { first, second }),
                 ].join(", ");
             }
@@ -568,25 +576,38 @@ const renderAdvancedValue = (translate, translateMap, localeJoin, getInstanceByI
         entry.DeriveFromExternalOption.display_option === undefined);
     const anyEntriesToGenerate = count(advanced, entry => entry.kind === "Any");
     const arr = [
-        ...advanced.map((entry) => {
+        ...advanced
+            .map((entry) => {
             switch (entry.kind) {
                 case "General":
-                    return renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, entry.General);
+                    return [
+                        "general",
+                        renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, entry.General),
+                    ];
                 case "RestrictOptions":
-                    return renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, entry.RestrictOptions.id, entry.RestrictOptions.option);
+                    return [
+                        "general",
+                        renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, entry.RestrictOptions.id, entry.RestrictOptions.option),
+                    ];
                 case "OneOf": {
                     if (entry.OneOf.display_option !== undefined) {
                         switch (entry.OneOf.display_option.kind) {
                             case "Hide":
                                 return undefined;
                             case "ReplaceWith":
-                                return (translateMap(entry.OneOf.display_option.ReplaceWith.translations)?.replacement ??
-                                    MISSING_VALUE);
+                                return [
+                                    "special",
+                                    translateMap(entry.OneOf.display_option.ReplaceWith.translations)
+                                        ?.replacement ?? MISSING_VALUE,
+                                ];
                             default:
                                 return assertExhaustive(entry.OneOf.display_option);
                         }
                     }
-                    return localeJoin(entry.OneOf.options.map(option => renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, option)), "disjunction");
+                    return [
+                        "general",
+                        localeJoin(entry.OneOf.options.map(option => renderAdvancedSpecialAbilityName(translate, translateMap, getInstanceById, getResolvedSelectOptionById, entityName, option)), "disjunction"),
+                    ];
                 }
                 case "DeriveFromExternalOption":
                     if (entry.DeriveFromExternalOption.display_option !== undefined) {
@@ -594,7 +615,10 @@ const renderAdvancedValue = (translate, translateMap, localeJoin, getInstanceByI
                             case "Hide":
                                 return undefined;
                             case "ReplaceWith":
-                                return (translateMap(entry.DeriveFromExternalOption.display_option.ReplaceWith.translations)?.replacement ?? MISSING_VALUE);
+                                return [
+                                    "special",
+                                    translateMap(entry.DeriveFromExternalOption.display_option.ReplaceWith.translations)?.replacement ?? MISSING_VALUE,
+                                ];
                             default:
                                 return assertExhaustive(entry.DeriveFromExternalOption.display_option);
                         }
@@ -605,7 +629,10 @@ const renderAdvancedValue = (translate, translateMap, localeJoin, getInstanceByI
                 default:
                     return assertExhaustive(entry);
             }
-        }),
+        })
+            .filter((item) => isNotNullish(item) && item[1] !== undefined)
+            .toSorted(reduceCompare(on(([type]) => type, localeCompare), on(([, value]) => value, localeCompare)))
+            .map(value => value[1]),
         derivedFromExternalOptionEntriesToGenerate === 0
             ? undefined
             : translate(".input {$count :number} {{{$count} more by primary patron}}", {
@@ -770,6 +797,7 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
         getInstanceById,
         localeCompare: locale.compare,
         localeJoin: locale.join,
+        getResolvedSelectOptionById,
     };
     const baseEntry = entry;
     const wrappedId = Case(entityName, id);
@@ -782,8 +810,7 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
         ? name => translate("Tradition ({$tradition})", { tradition: name })
         : name => name;
     return {
-        title: makeTraditionName(translation.name_in_library ?? translation.name) +
-            (baseEntry.levels !== undefined ? ` I–${romanize(baseEntry.levels)}` : ""),
+        title: makeTraditionName(translation.name_in_library ?? translation.name + parensIf(translation.additionalName)) + (baseEntry.levels !== undefined ? ` I–${romanize(baseEntry.levels)}` : ""),
         subtitle: mapNullable(baseEntry.subtype, subtype => renderAdvantageDisadvantageSubtype(subtype).run(env)) ??
             mapNullable(baseEntry.usage_type, usageType => renderCombatSpecialAbilityType(usageType).run(env)),
         badge: mapNullable(entityName === "CombatStyleSpecialAbility" || entityName === "AdvancedCombatSpecialAbility"
@@ -839,7 +866,7 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
                     mapNullable(baseEntry.advanced, advanced => isStyleSpecialAbilityKind(entityName)
                         ? {
                             label: renderAdvancedLabel(translate, entityName),
-                            value: renderAdvancedValue(translate, translateMap, locale.join, getInstanceById, getResolvedSelectOptionById, entityName, advanced),
+                            value: renderAdvancedValue(translate, translateMap, locale.join, locale.compare, getInstanceById, getResolvedSelectOptionById, entityName, advanced),
                         }
                         : undefined),
                     mapNullable(baseEntry.penalty, penalty => ({
@@ -849,11 +876,11 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
                     mapNullable(entry.prerequisites ?? (isAdvancedSpecialAbilityKind(entityName) ? [] : undefined), prerequisites => ({
                         label: translate("Prerequisites"),
                         value: wrappedId.kind === "Advantage" || wrappedId.kind === "Disadvantage"
-                            ? printAdvantageDisadvantagePrerequisites(getInstanceById, getResolvedSelectOptionById, locale, prerequisites, translation.name, wrappedId.kind)
-                            : printGeneralPrerequisites(getInstanceById, getResolvedSelectOptionById, locale, prerequisites, mapNullable(baseEntry.levels, levels => ({
+                            ? printAdvantageDisadvantagePrerequisites(prerequisites, translation.name, wrappedId.kind).run(env)
+                            : printGeneralPrerequisites(prerequisites, mapNullable(baseEntry.levels, levels => ({
                                 id: wrappedId,
                                 levels,
-                            })), renderTrailingAdvancedPrerequisitesNote(translate, entityName)),
+                            })), renderTrailingAdvancedPrerequisitesNote(translate, entityName)).run(env),
                     })),
                     mapNullable(baseEntry.combat_techniques, combatTechniques => ({
                         label: translate("Combat Techniques"),

package/lib/entities/disease.d.ts

@@ -3,7 +3,7 @@ import type { IdMap } from "../index.js";
 /**
  * Get a JSON representation of the rules text for an optional rule.
  */
-export declare const getDiseaseEntityDescription: import("../creator.js").EntityDescriptionCreator<"AnimalDisease" | "Disease", {
+export declare const getDiseaseEntityDescription: import("../creator.js").EntityDescriptionCreator<"Disease" | "AnimalDisease", {
     getInstanceById: GetInstanceById<"Publication" | "AnimalType" | "DerivedCharacteristic">;
     idMap: IdMap;
 }, import("../index.js").EntityDescription>;

package/lib/entities/elixir.js

@@ -13,6 +13,14 @@ export const getElixirEntityDescription = createEntityDescriptionCreator(({ getI
     if (translation === undefined) {
         return undefined;
     }
+    const env = {
+        translate,
+        translateMap,
+        getInstanceById,
+        localeCompare: locale.compare,
+        localeJoin: locale.join,
+        getResolvedSelectOptionById,
+    };
     return {
         title: translation.name,
         className: "elixir",
@@ -48,7 +56,7 @@ export const getElixirEntityDescription = createEntityDescriptionCreator(({ getI
                         value: translate("{$value} AP", {
                             value: entry.trade_secret.ap_value,
                         }) +
-                            parensIf(mapNullable(entry.trade_secret.prerequisites, prerequisites => `${translate("Prerequisites")}: ${printPlainGeneralPrerequisites(getInstanceById, getResolvedSelectOptionById, locale, prerequisites)}`)),
+                            parensIf(mapNullable(entry.trade_secret.prerequisites, prerequisites => `${translate("Prerequisites")}: ${printPlainGeneralPrerequisites(prerequisites).run(env)}`)),
                     },
                     translation.special === undefined
                         ? undefined

package/lib/entities/equipment.d.ts

@@ -19,7 +19,7 @@ export declare const renderRangedWeapon: <Damage>(translate: Translate, translat
 /**
  * Get a JSON representation of the rules text for equipment.
  */
-export declare const getEquipmentEntityDescription: import("../creator.js").EntityDescriptionCreator<"Ammunition" | "Animal" | "AnimalCare" | "Armor" | "BandageOrRemedy" | "Book" | "CeremonialItem" | "Clothes" | "ClothingPackage" | "Container" | "EquipmentOfBlessedOnes" | "GemOrPreciousStone" | "IlluminationLightSource" | "IlluminationRefillOrSupply" | "Jewelry" | "Laboratory" | "Liebesspielzeug" | "LuxuryGood" | "MagicalArtifact" | "MusicalInstrument" | "Newspaper" | "OrienteeringAid" | "RopeOrChain" | "Stationery" | "ThievesTool" | "ToolOfTheTrade" | "TravelGearOrTool" | "Vehicle" | "Weapon" | "WeaponAccessory" | "WorkingSupernaturalCreature", {
+export declare const getEquipmentEntityDescription: import("../creator.js").EntityDescriptionCreator<"Weapon" | "Ammunition" | "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/influence.js

@@ -9,6 +9,15 @@ export const getInfluenceEntityDescription = createEntityDescriptionCreator(({ g
     if (translation === undefined) {
         return undefined;
     }
+    const env = {
+        translate,
+        translateMap,
+        getInstanceById,
+        localeCompare: locale.compare,
+        localeJoin: locale.join,
+        getResolvedSelectOptionById,
+        getChildInstancesForInstanceId,
+    };
     return {
         title: translation.name,
         className: "influence",
@@ -32,7 +41,7 @@ export const getInfluenceEntityDescription = createEntityDescriptionCreator(({ g
                             ? undefined
                             : {
                                 label: translate("Prerequisites"),
-                                value: printInfluencePrerequisites(getInstanceById, getResolvedSelectOptionById, getChildInstancesForInstanceId, locale, entry.prerequisites),
+                                value: printInfluencePrerequisites(entry.prerequisites).run(env),
                             },
                     ],
                 },

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

@@ -43,7 +43,7 @@ export declare const combineNameComponents: (elements: ActivatableNameComponents
 /**
  * Renders the name components of an activatable entry, combining multiple options into one string.
  */
-export declare const renderCombinedActivatableNameComponents: (translateMap: TranslateMap, components: CombinedActivatableNameComponents, formatAsPrerequisite: boolean, join?: (list: string[]) => string) => string;
+export declare const renderCombinedActivatableNameComponents: (translateMap: TranslateMap, components: CombinedActivatableNameComponents, formatAsPrerequisite: boolean, join?: (list: string[]) => string, context?: string) => string;
 /**
  * Renders the name components of multiple activatable entries.
  */
@@ -51,7 +51,7 @@ export declare const renderMultipleStandaloneActivatableNameComponents: (transla
 /**
  * Renders the name components of multiple activatable entries, combining parts if possible.
  */
-export declare const renderActivatableNameComponentsCombinedIfPossible: (translateMap: TranslateMap, components: ActivatableNameComponents[], formatAsPrerequisite: boolean, join?: (list: string[]) => string) => string;
+export declare const renderActivatableNameComponentsCombinedIfPossible: (translate: Translate, translateMap: TranslateMap, components: ActivatableNameComponents[], formatAsPrerequisite: boolean, join?: (list: string[]) => string) => string;
 /**
  * Renders the options of an activatable entry, combining them if necessary.
  */

package/lib/entities/partial/activatableNameChunks.js

@@ -6,6 +6,8 @@ import { isNotNullish } from "@elyukai/utils/nullable";
 import { mapObject } from "@optolith/helpers/object";
 import { romanize } from "@optolith/helpers/roman";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
+import { fromUniformCase } from "tsondb/schema/gen";
+import { attributedInstance } from "./markdown.js";
 import { MISSING_VALUE } from "./unknown.js";
 const combineChunks = (a, b, join) => {
     if (typeof a === "string") {
@@ -127,22 +129,34 @@ export const combineNameComponents = (elements) => {
 /**
  * Renders the name components of an activatable entry, combining multiple options into one string.
  */
-export const renderCombinedActivatableNameComponents = (translateMap, components, formatAsPrerequisite, join = list => list.join(", ")) => renderActivatableNameComponents(translateMap, {
+export const renderCombinedActivatableNameComponents = (translateMap, components, formatAsPrerequisite, join = list => list.join(", "), context = "prerequisite") => attributedInstance(renderActivatableNameComponents(translateMap, {
     ...components,
     nameBuilderRules: {
         ...components.nameBuilderRules,
         useParenthesis: true,
     },
     options: join(components.options.map(chunk => renderActivatableNameChunk(translateMap, normalizeChunks(chunk)))),
-}, formatAsPrerequisite);
+}, formatAsPrerequisite), components.id.kind, fromUniformCase(components.id), { context });
 /**
  * Renders the name components of multiple activatable entries.
  */
-export const renderMultipleStandaloneActivatableNameComponents = (translateMap, components, formatAsPrerequisite, join = list => list.join(", ")) => join(components.map(item => renderActivatableNameComponents(translateMap, item, formatAsPrerequisite)));
+export const renderMultipleStandaloneActivatableNameComponents = (translateMap, components, formatAsPrerequisite, join = list => list.join(", ")) => join(components.map(item => attributedInstance(renderActivatableNameComponents(translateMap, item, formatAsPrerequisite), item.id.kind, fromUniformCase(item.id), { context: '"prerequisite"' })));
 /**
  * Renders the name components of multiple activatable entries, combining parts if possible.
  */
-export const renderActivatableNameComponentsCombinedIfPossible = (translateMap, components, formatAsPrerequisite, join = list => list.join(", ")) => {
+export const renderActivatableNameComponentsCombinedIfPossible = (translate, translateMap, components, formatAsPrerequisite, join = list => list.join(", ")) => {
+    if (isNotEmpty(components) &&
+        components.length > 1 &&
+        (components.every(c => c.id.kind === "MagicalTradition") ||
+            components.every(c => c.id.kind === "BlessedTradition"))) {
+        return (attributedInstance(`${translate("Tradition")} (`, components[0].id.kind, undefined, {
+            context: '"prerequisite"',
+        }) +
+            join(components.map(c => c.options === undefined
+                ? MISSING_VALUE
+                : attributedInstance(renderActivatableNameChunk(translateMap, normalizeChunks(c.options)), c.id.kind, fromUniformCase(c.id), { context: '"prerequisite"' }))) +
+            attributedInstance(`)`, components[0].id.kind, undefined, { context: '"prerequisite"' }));
+    }
     const combined = combineNameComponents(components);
     if (combined === undefined) {
         return renderMultipleStandaloneActivatableNameComponents(translateMap, components, formatAsPrerequisite, join);

package/lib/entities/partial/adventurePointsValue.js

@@ -35,7 +35,7 @@ const renderFixedSelectOptionsAdventurePointsValue = (locale, getAllSelectOption
             .join("; ");
     }
 };
-const renderSelectOptionsAdventurePointsValue = (locale, derivedLabel, getAllSelectOptions, getNameForSelectOptionId, config, applyNegative) => {
+const renderSelectOptionsAdventurePointsValue = (locale, derivedLabel, derivedRangeStart, getAllSelectOptions, getNameForSelectOptionId, config, applyNegative) => {
     if (config === undefined) {
         return MISSING_VALUE;
     }
@@ -43,8 +43,8 @@ const renderSelectOptionsAdventurePointsValue = (locale, derivedLabel, getAllSel
         case "DerivedFromImprovementCost": {
             const start = derivedLabel();
             return `${start}: ${locale.translate("{$value} Adventure Points", {
-                value: Array.from({ length: 4 }, (_, index) => (index + 1) * (config.DerivedFromImprovementCost.multiplier ?? 1) +
-                    (config.DerivedFromImprovementCost.offset ?? 0)).join("/"),
+                value: Array.from({ length: 5 - derivedRangeStart }, (_, index) => applyNegative((index + derivedRangeStart) * (config.DerivedFromImprovementCost.multiplier ?? 1) +
+                    (config.DerivedFromImprovementCost.offset ?? 0))).join("/"),
             })}`;
         }
         case "Fixed":
@@ -220,9 +220,9 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
                             default:
                                 return translate("A/B/C/D ability");
                         }
-                    }, getAllSelectOptions, getNameForSelectOptionId, derivedSelectOptions.Skills.ap_value, applyNegative);
+                    }, 1, getAllSelectOptions, getNameForSelectOptionId, derivedSelectOptions.Skills.ap_value, applyNegative);
                 case "CombatTechniques":
-                    return renderSelectOptionsAdventurePointsValue(locale, () => translate("B/C/D combat technique"), getAllSelectOptions, getNameForSelectOptionId, derivedSelectOptions.CombatTechniques.ap_value, applyNegative);
+                    return renderSelectOptionsAdventurePointsValue(locale, () => translate("B/C/D combat technique"), 2, getAllSelectOptions, getNameForSelectOptionId, derivedSelectOptions.CombatTechniques.ap_value, applyNegative);
                 case "TargetCategories":
                     return MISSING_VALUE;
                 default:
@@ -231,20 +231,27 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
         }
         case "DependingOnActive":
             return `${translate(".input {$value :number} {{{$value} Adventure Points}}", {
-                value: value.DependingOnActive.inactive,
+                value: applyNegative(value.DependingOnActive.inactive),
             })} (${translate(".input {$value :number} {{{$value} Adventure Points with {$name}}}", {
-                value: value.DependingOnActive.active,
+                value: applyNegative(value.DependingOnActive.active),
                 name: getNameForId(value.DependingOnActive.id) ?? MISSING_VALUE,
             })})`;
         case "DependingOnActiveInstances":
             switch (value.DependingOnActiveInstances.kind) {
                 case "Threshold":
-                    return translate(".input {$value :number} {{{$value} Adventure Points}}", {
-                        value: value.DependingOnActiveInstances.Threshold.normal,
-                    });
+                    if (entry.levels === undefined) {
+                        return translate(".input {$value :number} {{{$value} Adventure Points}}", {
+                            value: applyNegative(value.DependingOnActiveInstances.Threshold.normal),
+                        });
+                    }
+                    else {
+                        return translate(".input {$value :number} {{{$value} Adventure Points per level}}", {
+                            value: applyNegative(value.DependingOnActiveInstances.Threshold.normal),
+                        });
+                    }
                 case "Expression": {
                     const expression = value.DependingOnActiveInstances.Expression;
-                    const values = Array.from({ length: entry.maximum ?? 3 }, (_, index) => evaluateMathOperation(expression, exprValue => {
+                    const values = Array.from({ length: entry.maximum ?? 3 }, (_, index) => applyNegative(evaluateMathOperation(expression, exprValue => {
                         switch (exprValue.kind) {
                             case "Constant":
                                 return exprValue.Constant;
@@ -253,7 +260,7 @@ export const renderAdventurePointsValue = (locale, getNameForId, getNameForSelec
                             default:
                                 return assertExhaustive(exprValue);
                         }
-                    })).join("/");
+                    }))).join("/");
                     const labels = Array.from({ length: entry.maximum ?? 3 }, (_, index) => `${(index + 1).toFixed()}.`).join("/");
                     if (entry.maximum !== undefined) {
                         return translate("{$values} Adventure Points for the {$labels} purchase", {

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

@@ -1,7 +1,7 @@
 import type { CommonnessRatedAdvantageDisadvantage } from "@optolith/database-schema/gen";
+import type { StdReader } from "../../env.js";
 import type { TranslationKeysWithoutParams } from "../../helpers/translate.js";
 import type { RawDefinitionListEntityDescriptionSectionItem } from "../../index.js";
-import type { StdReader } from "./reader.js";
 /**
  * Render the names of either commonness-rated advantages or commonness-rated disadvantages.
  */

package/lib/entities/partial/commonnessRatedAdvantagesAndDisadvantages.js

@@ -50,7 +50,7 @@ const renderCommonnessRatedAdvantageOrDisadvantageName = (translateMap, getInsta
             level,
             nameBuilderRules: makeNameBuilderRulesWithDefaults(instance.nameBuilderRules),
             options,
-        }, false, list => list.toSorted(localeCompare).join(", "));
+        }, false, list => list.toSorted(localeCompare).join(", "), "commonness");
     }, entity, item.id) ?? MISSING_VALUE);
 };
 /**

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

@@ -1,6 +1,6 @@
 import type { ImprovementCost, RatedIdentifier, SkillWithEnhancementsIdentifier } from "@optolith/database-schema/gen";
+import type { StdReader } from "../../env.js";
 import type { RawEntityDescriptionSection } from "../../index.js";
-import { type StdReader } from "./reader.js";
 /**
  * Render the enhancements section for an entity description, if applicable.
  */

package/lib/entities/partial/enhancements.js

@@ -6,7 +6,7 @@ import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { getAdventurePointsForActivation } from "@optolith/adventure-points/improvement-cost";
 import { filterIncludedPublicationEntriesMapR } from "../../references/publicationOptions.js";
 import { printEnhancementPrerequisites } from "./prerequisites/index.js";
-import { getChildInstancesForInstanceIdR, translateMapR, translateR, } from "./reader.js";
+import { getChildInstancesForInstanceIdR, translateMapR, translateR } from "./reader.js";
 const getEnhancementAPValue = (adventurePoints, parentImprovementCost) => {
     switch (adventurePoints.kind) {
         case "DerivedFromImprovementCost":
@@ -18,9 +18,18 @@ const getEnhancementAPValue = (adventurePoints, parentImprovementCost) => {
             return assertExhaustive(adventurePoints);
     }
 };
-const renderEnhancement = (enhancement, parentImprovementCost) => translateMapR(enhancement.content.translations).thenW(translation => Reader.ask().map(env => translation === undefined
-    ? undefined
-    : `- ^[${translation.name}](entity: "Enhancement") (${env.translate("SR {$value}", { value: enhancement.content.skill_rating })}, ${env.translate("{$value} AP", { value: getEnhancementAPValue(enhancement.content.adventurePoints, parentImprovementCost) })}): ${translation.effect.split("\n").join("\n  ")}${enhancement.content.prerequisites === undefined ? "" : ` ${env.translate(".input {$hiddenCount :number} {{Prerequisites}}", { hiddenCount: enhancement.content.prerequisites.length })}: ${printEnhancementPrerequisites(env.getInstanceById, { translate: env.translate, translateMap: env.translateMap, compare: env.localeCompare, join: env.localeJoin }, enhancement.content.prerequisites)}`}`));
+const renderEnhancement = (enhancement, parentImprovementCost) => {
+    const { prerequisites } = enhancement.content;
+    return translateMapR(enhancement.content.translations).thenW(translation => translation === undefined
+        ? Reader.of(undefined)
+        : translateR("SR {$value}", { value: enhancement.content.skill_rating }).thenW(sr => translateR("{$value} AP", {
+            value: getEnhancementAPValue(enhancement.content.adventurePoints, parentImprovementCost),
+        }).thenW(ap => (prerequisites === undefined
+            ? Reader.of("")
+            : translateR(".input {$hiddenCount :number} {{Prerequisites}}", {
+                hiddenCount: prerequisites.length,
+            }).thenW(prerequisitesLabel => printEnhancementPrerequisites(prerequisites).map(prerequisitesText => ` ${prerequisitesLabel}: ${prerequisitesText}`))).map(prerequisitesText => `- ^[${translation.name}](entity: "Enhancement") (${sr}, ${ap}): ${translation.effect.split("\n").join("\n  ")}${prerequisitesText}`))));
+};
 /**
  * Render the enhancements section for an entity description, if applicable.
  */

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

@@ -1,7 +1,7 @@
 import { Reader } from "@elyukai/utils/reader";
 import type { ParameterMapStyle, ResponsiveTextOptional } from "@optolith/database-schema/gen";
+import type { StdEnv, StdReader } from "../../env.js";
 import type { LocaleMap } from "../../helpers/translate.js";
-import { type StdEnv, type StdReader } from "./reader.js";
 /**
  * Renders a map of options to a string.
  */

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

@@ -1,12 +1,7 @@
 import type { DisplayOption } from "@optolith/database-schema/gen";
-import type { TranslateMap } from "../../../helpers/translate.js";
-import type { StdReader } from "../reader.js";
+import type { StdReader } from "../../../env.js";
 import type { PrerequisitePart } from "./part.js";
 /**
  * Get the translation of a display option.
  */
-export declare const printDisplayOption: (translateMap: TranslateMap, displayOption: DisplayOption) => PrerequisitePart | undefined;
-/**
- * Get the translation of a display option.
- */
-export declare const printDisplayOptionR: (displayOption: DisplayOption) => StdReader<PrerequisitePart | undefined, "tm">;
+export declare const printDisplayOption: (displayOption: DisplayOption) => StdReader<PrerequisitePart | undefined, "tm">;

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

@@ -4,24 +4,7 @@ import { MISSING_VALUE } from "../unknown.js";
 /**
  * Get the translation of a display option.
  */
-export const printDisplayOption = (translateMap, displayOption) => {
-    switch (displayOption.kind) {
-        case "Hide":
-            return undefined;
-        case "ReplaceWith":
-            return {
-                value: translateMap(displayOption.ReplaceWith.translations)?.replacement ?? MISSING_VALUE,
-                sentenceType: displayOption.ReplaceWith.sentence_type,
-                isMeta: false,
-            };
-        default:
-            return assertExhaustive(displayOption);
-    }
-};
-/**
- * Get the translation of a display option.
- */
-export const printDisplayOptionR = (displayOption) => {
+export const printDisplayOption = (displayOption) => {
     switch (displayOption.kind) {
         case "Hide":
             return Reader.of(undefined);