@optolith/database-schema 0.47.4 → 0.48.0

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 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.48.0](https://github.com/Optolith/database-schema/compare/v0.47.4...v0.48.0) (2026-06-13)
+
+
+### ⚠ BREAKING CHANGES
+
+* unify some skill durations and ranges with expressions
+
+### Features
+
+* unify some skill durations and ranges with expressions ([31798ca](https://github.com/Optolith/database-schema/commit/31798ca33fab12b1d1c0c6edec0c543173c8f4ac))
+
 ## [0.47.4](https://github.com/Optolith/database-schema/compare/v0.47.3...v0.47.4) (2026-06-13)
 
 

package/gen/types.d.ts

@@ -260,7 +260,6 @@ export type EnumMap = {
   CastingTime: CastingTime<unknown>
   CastingTimeDuringLovemakingUnit: CastingTimeDuringLovemakingUnit
   CheckResultArithmetic: CheckResultArithmetic
-  CheckResultValue: CheckResultValue
   CollectorsValue: CollectorsValue
   CombatAnimalPowerType: CombatAnimalPowerType
   CombatRelatedSpecialAbilityIdentifier: CombatRelatedSpecialAbilityIdentifier
@@ -301,6 +300,7 @@ export type EnumMap = {
   EncumbranceInfluence: EncumbranceInfluence
   EnhancementPrerequisiteGroup: EnhancementPrerequisiteGroup
   EquipmentIdentifier: EquipmentIdentifier
+  ExpressionBasedParameterExpressionValue: ExpressionBasedParameterExpressionValue
   ExpressionBasedPoisonTimeExpressionValue: ExpressionBasedPoisonTimeExpressionValue
   ExtensionRuleIdentifier: ExtensionRuleIdentifier
   FamiliarsTrickOneTimeCost: FamiliarsTrickOneTimeCost
@@ -527,9 +527,7 @@ export type TypeAliasMap = {
   CastingTimeDuringLovemaking: CastingTimeDuringLovemaking
   CastingTimeIncludingLovemaking: CastingTimeIncludingLovemaking<unknown>
   Cause: Cause
-  CheckResultBasedDuration: CheckResultBasedDuration
   CheckResultBasedModifier: CheckResultBasedModifier
-  CheckResultBasedRange: CheckResultBasedRange
   ChildNode: ChildNode
   CloseCombatTechniqueSpecialRules: CloseCombatTechniqueSpecialRules
   CombatAnimalPower: CombatAnimalPower
@@ -597,8 +595,11 @@ export type TypeAliasMap = {
   Errata: Errata
   Erratum: Erratum
   ExclusiveCantripNote: ExclusiveCantripNote
+  ExpressionBasedDuration: ExpressionBasedDuration
+  ExpressionBasedParameterValue: ExpressionBasedParameterValue
   ExpressionBasedPoisonTime: ExpressionBasedPoisonTime
   ExpressionBasedPoisonTimeValue: ExpressionBasedPoisonTimeValue
+  ExpressionBasedRange: ExpressionBasedRange
   FamiliarsTrickAllOneTimeCost: FamiliarsTrickAllOneTimeCost
   FamiliarsTrickFixedOneTimeCost: FamiliarsTrickFixedOneTimeCost
   FamiliarsTrickOneTimeIntervalCost: FamiliarsTrickOneTimeIntervalCost
@@ -622,11 +623,8 @@ export type TypeAliasMap = {
   FixedCantripDuration: FixedCantripDuration
   FixedCost: FixedCost
   FixedCurseCost: FixedCurseCost
-  FixedDominationRitualDuration: FixedDominationRitualDuration
-  FixedDuration: FixedDuration
   FixedGeodeRitualCost: FixedGeodeRitualCost
   FixedGeodeRitualRange: FixedGeodeRitualRange
-  FixedJesterTrickDuration: FixedJesterTrickDuration
   FixedJesterTrickRange: FixedJesterTrickRange
   FixedLifePointsCost: FixedLifePointsCost
   FixedMagicalDanceCost: FixedMagicalDanceCost
@@ -6862,12 +6860,8 @@ export type RangeValue =
     kind: "Touch"
   }
   | {
-    kind: "Fixed"
-    Fixed: FixedRange
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedRange
+    kind: "Expression"
+    Expression: ExpressionBasedRange
   }
 
 export interface ModifiableRange {
@@ -6887,51 +6881,16 @@ export interface ModifiableRange {
   is_radius?: boolean
 }
 
-export interface FixedRange {
-  /**
-   * If `true`, the range is a maximum range.
-   */
-  is_maximum?: boolean
-
-  /**
-   * The (unitless) range value.
-   */
-  value: number
-
-  /**
-   * The unit of the `value`.
-   */
-  unit: RangeUnit
-
-  /**
-   * If `true`, the range is a radius.
-   */
-  is_radius?: boolean
-}
-
-export type RangeUnit =
-  | {
-    kind: "Steps"
-  }
-  | {
-    kind: "Miles"
-  }
-
-export interface CheckResultBasedRange {
+export interface ExpressionBasedRange {
   /**
    * If the range is the maximum range.
    */
   is_maximum?: boolean
 
   /**
-   * The base value that is derived from the check result.
-   */
-  base: CheckResultValue
-
-  /**
-   * If defined, it modifies the base value.
+   * An expression that evaluates to the range.
    */
-  modifier?: CheckResultBasedModifier
+  value: ExpressionBasedParameterValue
 
   /**
    * The duration unit.
@@ -6944,41 +6903,26 @@ export interface CheckResultBasedRange {
   is_radius?: boolean
 }
 
-/**
- * Defines the derived (unitless) value.
- */
-export type CheckResultValue =
+export type ExpressionBasedParameterValue = MathOperation<ExpressionBasedParameterExpressionValue>
+
+export type ExpressionBasedParameterExpressionValue =
   | {
-    kind: "QualityLevels"
+    kind: "Constant"
+    Constant: number
   }
   | {
-    kind: "SkillPoints"
+    kind: "QualityLevels"
   }
   | {
-    kind: "SkillRating"
+    kind: "SkillPoints"
   }
 
-export interface CheckResultBasedModifier {
-  /**
-   * The arithmetic how to apply the `value` to the `base`.
-   */
-  arithmetic: CheckResultArithmetic
-
-  /**
-   * The value that is applied to the `base` using the defined `arithmetic`.
-   */
-  value: number
-}
-
-/**
- * Defines how the the `value` is set off against the check result.
- */
-export type CheckResultArithmetic =
+export type RangeUnit =
   | {
-    kind: "Multiply"
+    kind: "Steps"
   }
   | {
-    kind: "Divide"
+    kind: "Miles"
   }
 
 export type DurationForOneTime =
@@ -6991,12 +6935,8 @@ export type DurationForOneTime =
     Permanent: PermanentDuration
   }
   | {
-    kind: "Fixed"
-    Fixed: FixedDuration
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
   | {
     kind: "Indefinite"
@@ -7084,52 +7024,16 @@ export interface PermanentDurationTranslation {
   replacement?: ResponsiveTextReplace
 }
 
-export interface FixedDuration {
-  /**
-   * If the duration is the maximum duration, so it may end earlier.
-   */
-  is_maximum?: boolean
-
-  /**
-   * The (unitless) duration.
-   */
-  value: number
-
-  /**
-   * The duration unit.
-   */
-  unit: DurationUnit
-
-  /**
-   * All translations for the entry, identified by IETF language tag (BCP47).
-   */
-  translations?: {
-    [localeId: string]: FixedDurationTranslation
-  }
-}
-
-export interface FixedDurationTranslation {
-  /**
-   * A replacement string.
-   */
-  replacement?: ResponsiveTextReplace
-}
-
-export interface CheckResultBasedDuration {
+export interface ExpressionBasedDuration {
   /**
    * If the duration is the maximum duration, so it may end earlier.
    */
   is_maximum?: boolean
 
   /**
-   * The base value that is derived from the check result.
-   */
-  base: CheckResultValue
-
-  /**
-   * If defined, it modifies the base value.
+   * An expression that evaluates to the duration.
    */
-  modifier?: CheckResultBasedModifier
+  value: ExpressionBasedParameterValue
 
   /**
    * The duration unit.
@@ -7140,11 +7044,11 @@ export interface CheckResultBasedDuration {
    * All translations for the entry, identified by IETF language tag (BCP47).
    */
   translations?: {
-    [localeId: string]: CheckResultBasedDurationTranslation
+    [localeId: string]: ExpressionBasedDurationTranslation
   }
 }
 
-export interface CheckResultBasedDurationTranslation {
+export interface ExpressionBasedDurationTranslation {
   /**
    * A replacement string.
    */
@@ -7672,6 +7576,28 @@ export type BlessingRange =
     Fixed: FixedRange
   }
 
+export interface FixedRange {
+  /**
+   * If `true`, the range is a maximum range.
+   */
+  is_maximum?: boolean
+
+  /**
+   * The (unitless) range value.
+   */
+  value: number
+
+  /**
+   * The unit of the `value`.
+   */
+  unit: RangeUnit
+
+  /**
+   * If `true`, the range is a radius.
+   */
+  is_radius?: boolean
+}
+
 export type BlessingDuration =
   | {
     kind: "Immediate"
@@ -17810,12 +17736,12 @@ export interface BannzeichenDuration {
   /**
    * The duration on slow Bannzeichen application.
    */
-  slow: CheckResultBasedDuration
+  slow: ExpressionBasedDuration
 
   /**
    * The duration on fast Bannzeichen application.
    */
-  fast: CheckResultBasedDuration
+  fast: ExpressionBasedDuration
 }
 
 export type BannzeichenImprovementCost =
@@ -17940,12 +17866,8 @@ export type CurseDuration =
     kind: "Immediate"
   }
   | {
-    kind: "Fixed"
-    Fixed: DurationUnitValue
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
   | {
     kind: "Indefinite"
@@ -17975,12 +17897,8 @@ export interface IndefiniteCurseDurationTranslation {
 
 export type MaximumIndefiniteCurseDuration =
   | {
-    kind: "Fixed"
-    Fixed: DurationUnitValue
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
 
 export interface ElvenMagicalSong {
@@ -18196,30 +18114,14 @@ export interface DominationRitualCostTranslation {
 
 export type DominationRitualDuration =
   | {
-    kind: "Fixed"
-    Fixed: FixedDominationRitualDuration
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
   | {
     kind: "Indefinite"
     Indefinite: IndefiniteDominationRitualDuration
   }
 
-export interface FixedDominationRitualDuration {
-  /**
-   * The (unitless) duration.
-   */
-  value: number
-
-  /**
-   * The duration unit.
-   */
-  unit: DurationUnit
-}
-
 export interface IndefiniteDominationRitualDuration {
   /**
    * Specified if the duration has a maximum time span.
@@ -18243,12 +18145,8 @@ export interface IndefiniteDominationRitualDurationTranslation {
 
 export type MaximumIndefiniteDominationRitualDuration =
   | {
-    kind: "Fixed"
-    Fixed: FixedDominationRitualDuration
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
 
 export interface MagicalMelody {
@@ -18567,6 +18465,29 @@ export interface IndefiniteMagicalDanceCostTranslation {
   description: ResponsiveText
 }
 
+export interface CheckResultBasedModifier {
+  /**
+   * The arithmetic how to apply the `value` to the `base`.
+   */
+  arithmetic: CheckResultArithmetic
+
+  /**
+   * The value that is applied to the `base` using the defined `arithmetic`.
+   */
+  value: number
+}
+
+/**
+ * Defines how the the `value` is set off against the check result.
+ */
+export type CheckResultArithmetic =
+  | {
+    kind: "Multiply"
+  }
+  | {
+    kind: "Divide"
+  }
+
 /**
  * A reference to a music tradition with the music-tradition-specific name of the entry.
  */
@@ -18750,26 +18671,10 @@ export type JesterTrickDuration =
     kind: "Immediate"
   }
   | {
-    kind: "Fixed"
-    Fixed: FixedJesterTrickDuration
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
 
-export interface FixedJesterTrickDuration {
-  /**
-   * The (unitless) duration.
-   */
-  value: number
-
-  /**
-   * The duration unit.
-   */
-  unit: DurationUnit
-}
-
 export interface AnimistPower {
   /**
    * Lists the linked three attributes used to make a skill check.
@@ -18934,12 +18839,8 @@ export type OneTimeAnimistPowerDuration =
     kind: "Immediate"
   }
   | {
-    kind: "Fixed"
-    Fixed: DurationUnitValue
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
 
 export interface SustainedAnimistPowerPerformanceParameters {
@@ -19167,12 +19068,8 @@ export type GeodeRitualDuration =
     kind: "Immediate"
   }
   | {
-    kind: "Fixed"
-    Fixed: DurationUnitValue
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
 
 export type GeodeRitualPrerequisites = PlainPrerequisites<GeodeRitualPrerequisiteGroup>
@@ -19350,8 +19247,8 @@ export type GoblinRitualRangeValue =
     kind: "Touch"
   }
   | {
-    kind: "Fixed"
-    Fixed: FixedRange
+    kind: "Expression"
+    Expression: ExpressionBasedRange
   }
 
 export type GoblinRitualDuration =
@@ -19359,12 +19256,8 @@ export type GoblinRitualDuration =
     kind: "Immediate"
   }
   | {
-    kind: "Fixed"
-    Fixed: DurationUnitValue
-  }
-  | {
-    kind: "CheckResultBased"
-    CheckResultBased: CheckResultBasedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
 
 export interface GoblinRitualSustainedPerformanceParameters {
@@ -19731,12 +19624,12 @@ export interface MagicalRuneDuration {
   /**
    * The duration on slow rune application.
    */
-  slow: CheckResultBasedDuration
+  slow: ExpressionBasedDuration
 
   /**
    * The duration on fast rune application.
    */
-  fast: CheckResultBasedDuration
+  fast: ExpressionBasedDuration
 }
 
 export type MagicalRuneImprovementCost =
@@ -24758,8 +24651,8 @@ export type FamiliarsTrickOneTimeDuration =
     kind: "Immediate"
   }
   | {
-    kind: "Fixed"
-    Fixed: FixedDuration
+    kind: "Expression"
+    Expression: ExpressionBasedDuration
   }
   | {
     kind: "Indefinite"

package/lib/types/Ceremony.d.ts

@@ -180,29 +180,9 @@ export declare const Ceremony: DB.Entity<"Ceremony", {
                     Self: DB.EnumCase<null>;
                     Global: DB.EnumCase<null>;
                     Touch: DB.EnumCase<null>;
-                    Fixed: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"FixedRange", DB.Object<{
+                    Expression: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedRange", DB.Object<{
                         is_maximum: DB.MemberDecl<DB.Boolean, false>;
-                        value: DB.MemberDecl<DB.Integer, true>;
-                        unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"RangeUnit", {
-                            Steps: DB.EnumCase<null>;
-                            Miles: DB.EnumCase<null>;
-                        }, []>>, true>;
-                        is_radius: DB.MemberDecl<DB.Boolean, false>;
-                    }>, []>>>;
-                    CheckResultBased: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"CheckResultBasedRange", DB.Object<{
-                        is_maximum: DB.MemberDecl<DB.Boolean, false>;
-                        base: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"CheckResultValue", {
-                            QualityLevels: DB.EnumCase<null>;
-                            SkillPoints: DB.EnumCase<null>;
-                            SkillRating: DB.EnumCase<null>;
-                        }, []>>, true>;
-                        modifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"CheckResultBasedModifier", DB.Object<{
-                            arithmetic: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"CheckResultArithmetic", {
-                                Multiply: DB.EnumCase<null>;
-                                Divide: DB.EnumCase<null>;
-                            }, []>>, true>;
-                            value: DB.MemberDecl<DB.Integer, true>;
-                        }>, []>>, false>;
+                        value: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedParameterValue", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], import("./_MathExpression.ts").MathOperation>, []>>, true>;
                         unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"RangeUnit", {
                             Steps: DB.EnumCase<null>;
                             Miles: DB.EnumCase<null>;
@@ -253,42 +233,9 @@ export declare const Ceremony: DB.Entity<"Ceremony", {
                         }>, []>>, false>;
                     }>, false>;
                 }>, []>>>;
-                Fixed: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"FixedDuration", DB.Object<{
-                    is_maximum: DB.MemberDecl<DB.Boolean, false>;
-                    value: DB.MemberDecl<DB.Integer, true>;
-                    unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"DurationUnit", {
-                        Seconds: DB.EnumCase<null>;
-                        Minutes: DB.EnumCase<null>;
-                        Hours: DB.EnumCase<null>;
-                        Days: DB.EnumCase<null>;
-                        Weeks: DB.EnumCase<null>;
-                        Months: DB.EnumCase<null>;
-                        Years: DB.EnumCase<null>;
-                        Centuries: DB.EnumCase<null>;
-                        Actions: DB.EnumCase<null>;
-                        CombatRounds: DB.EnumCase<null>;
-                    }, []>>, true>;
-                    translations: DB.MemberDecl<DB.NestedEntityMap<"FixedDurationTranslation", {
-                        replacement: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ResponsiveTextReplace", DB.Object<{
-                            full: DB.MemberDecl<DB.String, true>;
-                            compressed: DB.MemberDecl<DB.String, true>;
-                        }>, []>>, false>;
-                    }>, false>;
-                }>, []>>>;
-                CheckResultBased: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"CheckResultBasedDuration", DB.Object<{
+                Expression: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedDuration", DB.Object<{
                     is_maximum: DB.MemberDecl<DB.Boolean, false>;
-                    base: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"CheckResultValue", {
-                        QualityLevels: DB.EnumCase<null>;
-                        SkillPoints: DB.EnumCase<null>;
-                        SkillRating: DB.EnumCase<null>;
-                    }, []>>, true>;
-                    modifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"CheckResultBasedModifier", DB.Object<{
-                        arithmetic: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"CheckResultArithmetic", {
-                            Multiply: DB.EnumCase<null>;
-                            Divide: DB.EnumCase<null>;
-                        }, []>>, true>;
-                        value: DB.MemberDecl<DB.Integer, true>;
-                    }>, []>>, false>;
+                    value: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedParameterValue", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], import("./_MathExpression.ts").MathOperation>, []>>, true>;
                     unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"DurationUnit", {
                         Seconds: DB.EnumCase<null>;
                         Minutes: DB.EnumCase<null>;
@@ -301,7 +248,7 @@ export declare const Ceremony: DB.Entity<"Ceremony", {
                         Actions: DB.EnumCase<null>;
                         CombatRounds: DB.EnumCase<null>;
                     }, []>>, true>;
-                    translations: DB.MemberDecl<DB.NestedEntityMap<"CheckResultBasedDurationTranslation", {
+                    translations: DB.MemberDecl<DB.NestedEntityMap<"ExpressionBasedDurationTranslation", {
                         replacement: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ResponsiveTextReplace", DB.Object<{
                             full: DB.MemberDecl<DB.String, true>;
                             compressed: DB.MemberDecl<DB.String, true>;
@@ -423,29 +370,9 @@ export declare const Ceremony: DB.Entity<"Ceremony", {
                     Self: DB.EnumCase<null>;
                     Global: DB.EnumCase<null>;
                     Touch: DB.EnumCase<null>;
-                    Fixed: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"FixedRange", DB.Object<{
+                    Expression: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedRange", DB.Object<{
                         is_maximum: DB.MemberDecl<DB.Boolean, false>;
-                        value: DB.MemberDecl<DB.Integer, true>;
-                        unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"RangeUnit", {
-                            Steps: DB.EnumCase<null>;
-                            Miles: DB.EnumCase<null>;
-                        }, []>>, true>;
-                        is_radius: DB.MemberDecl<DB.Boolean, false>;
-                    }>, []>>>;
-                    CheckResultBased: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"CheckResultBasedRange", DB.Object<{
-                        is_maximum: DB.MemberDecl<DB.Boolean, false>;
-                        base: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"CheckResultValue", {
-                            QualityLevels: DB.EnumCase<null>;
-                            SkillPoints: DB.EnumCase<null>;
-                            SkillRating: DB.EnumCase<null>;
-                        }, []>>, true>;
-                        modifier: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"CheckResultBasedModifier", DB.Object<{
-                            arithmetic: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"CheckResultArithmetic", {
-                                Multiply: DB.EnumCase<null>;
-                                Divide: DB.EnumCase<null>;
-                            }, []>>, true>;
-                            value: DB.MemberDecl<DB.Integer, true>;
-                        }>, []>>, false>;
+                        value: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedParameterValue", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], import("./_MathExpression.ts").MathOperation>, []>>, true>;
                         unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"RangeUnit", {
                             Steps: DB.EnumCase<null>;
                             Miles: DB.EnumCase<null>;

package/lib/types/FamiliarsTrick.d.ts

@@ -47,9 +47,9 @@ export declare const FamiliarsTrick: DB.Entity<"FamiliarsTrick", {
             }, []>>, true>;
             duration: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"FamiliarsTrickOneTimeDuration", {
                 Immediate: DB.EnumCase<null>;
-                Fixed: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"FixedDuration", DB.Object<{
+                Expression: DB.EnumCase<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedDuration", DB.Object<{
                     is_maximum: DB.MemberDecl<DB.Boolean, false>;
-                    value: DB.MemberDecl<DB.Integer, true>;
+                    value: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ExpressionBasedParameterValue", DB.IncludeIdentifier<DB.Param<string, DB.Type>[], import("./_MathExpression.ts").MathOperation>, []>>, true>;
                     unit: DB.MemberDecl<DB.IncludeIdentifier<[], DB.Enum<"DurationUnit", {
                         Seconds: DB.EnumCase<null>;
                         Minutes: DB.EnumCase<null>;
@@ -62,7 +62,7 @@ export declare const FamiliarsTrick: DB.Entity<"FamiliarsTrick", {
                         Actions: DB.EnumCase<null>;
                         CombatRounds: DB.EnumCase<null>;
                     }, []>>, true>;
-                    translations: DB.MemberDecl<DB.NestedEntityMap<"FixedDurationTranslation", {
+                    translations: DB.MemberDecl<DB.NestedEntityMap<"ExpressionBasedDurationTranslation", {
                         replacement: DB.MemberDecl<DB.IncludeIdentifier<[], DB.TypeAlias<"ResponsiveTextReplace", DB.Object<{
                             full: DB.MemberDecl<DB.String, true>;
                             compressed: DB.MemberDecl<DB.String, true>;

package/lib/types/FamiliarsTrick.js

@@ -1,7 +1,7 @@
 import * as DB from "tsondb/schema/dsl";
 import { OldParameter } from "./_ActivatableSkill.js";
 import { IndefiniteOneTimeCost, NonModifiableOneTimeCostPerCountable, } from "./_ActivatableSkillCost.js";
-import { DurationUnitValue, FixedDuration, IndefiniteDuration, } from "./_ActivatableSkillDuration.js";
+import { DurationUnitValue, ExpressionBasedDuration, IndefiniteDuration, } from "./_ActivatableSkillDuration.js";
 import { AnimalTypeIdentifier, MagicalTraditionIdentifier, PropertyIdentifier, } from "./_Identifier.js";
 import { ResponsiveText } from "./_ResponsiveText.js";
 import { NestedTranslationMap } from "./Locale.js";
@@ -154,7 +154,7 @@ const FamiliarsTrickOneTimeDuration = DB.Enum(import.meta.url, {
     name: "FamiliarsTrickOneTimeDuration",
     values: () => ({
         Immediate: DB.EnumCase({ type: null }),
-        Fixed: DB.EnumCase({ type: DB.IncludeIdentifier(FixedDuration) }),
+        Expression: DB.EnumCase({ type: DB.IncludeIdentifier(ExpressionBasedDuration) }),
         Indefinite: DB.EnumCase({ type: DB.IncludeIdentifier(IndefiniteDuration) }),
     }),
 });