optolith-database-schema 0.18.13 → 0.19.1

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 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.19.1](https://github.com/elyukai/optolith-database-schema/compare/v0.19.0...v0.19.1) (2025-10-27)
+
+
+### Bug Fixes
+
+* general special ability options and activatable instances in general should use child entity types instead of reference types ([5952ef2](https://github.com/elyukai/optolith-database-schema/commit/5952ef214d388e328b6a94364384eed712cefb13))
+
+## [0.19.0](https://github.com/elyukai/optolith-database-schema/compare/v0.18.13...v0.19.0) (2025-10-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* combineable binary math operators to specific adventure points value by active instances instead of fixed functions
+
+### Features
+
+* combineable binary math operators to specific adventure points value by active instances instead of fixed functions ([f11c1e1](https://github.com/elyukai/optolith-database-schema/commit/f11c1e1e07318ed5836d9964f3658335bf07d072))
+
 ## [0.18.13](https://github.com/elyukai/optolith-database-schema/compare/v0.18.12...v0.18.13) (2025-10-17)
 
 

package/lib/types/Advantage.d.ts

@@ -662,8 +662,6 @@ export declare const Advantage: Entity<"Advantage", {
             General: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
             Skill: import("tsondb/schema/def").EnumCaseDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"ExplicitSkillSelectOption", Object<{
                 id: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ReferenceIdentifierType, true>;
-                skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"NewSkillApplications", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
-                skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"SkillUses", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
                 prerequisites: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"GeneralPrerequisites", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisitesForLevels", import("tsondb/schema/def").ArrayType<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisiteForLevel", Object<{
                     level: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
                     prerequisite: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").EnumDecl<"PrerequisitesElement", {
@@ -823,8 +821,60 @@ export declare const Advantage: Entity<"Advantage", {
             }>, []>>>;
         }, []>>>, false>;
     }>, []>>, false>;
-    skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"NewSkillApplications", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
-    skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"SkillUses", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
+    skill_applications: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ChildEntitiesType<Entity<"NewSkillApplication", {
+        parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").EnumDecl<"NewSkillApplicationOrUseParentIdentifier", {
+            GeneralSelectOption: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Advantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Disadvantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedCombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedKarmaSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedMagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedSkillSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            BlessedTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CeremonialItemSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            FatePointSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            GeneralSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            LiturgicalStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            SexSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+        }, []>>, true>;
+        skills: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+        required_skill_rating: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, false>;
+        translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"NewSkillApplicationTranslation", {
+            name: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").StringType, true>;
+        }>, false>;
+    }, "parent">>, true>;
+    skill_uses: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ChildEntitiesType<Entity<"SkillUse", {
+        parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").EnumDecl<"NewSkillApplicationOrUseParentIdentifier", {
+            GeneralSelectOption: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Advantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Disadvantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedCombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedKarmaSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedMagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedSkillSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            BlessedTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CeremonialItemSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            FatePointSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            GeneralSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            LiturgicalStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            SexSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+        }, []>>, true>;
+        skills: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+        required_skill_rating: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, false>;
+        translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"SkillUseTranslation", {
+            name: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").StringType, true>;
+        }>, false>;
+    }, "parent">>, true>;
     maximum: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, false>;
     prerequisites: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"AdvantageDisadvantagePrerequisites", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisitesForLevels", import("tsondb/schema/def").ArrayType<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisiteForLevel", Object<{
         level: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
@@ -867,13 +917,7 @@ export declare const Advantage: Entity<"Advantage", {
                 threshold: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
                 alternative: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
             }>, []>>>;
-            Multiplier: import("tsondb/schema/def").EnumCaseDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"AdventurePointsDependingOnActiveInstancesMultiplier", Object<{
-                base: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
-                expression: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").EnumDecl<"AdventurePointsDependingOnActiveInstancesMultiplierExpression", {
-                    Linear: import("tsondb/schema/def").EnumCaseDecl<null>;
-                    Exponentiation: import("tsondb/schema/def").EnumCaseDecl<null>;
-                }, []>>, true>;
-            }>, []>>>;
+            Expression: import("tsondb/schema/def").EnumCaseDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"AdventurePointsDependingOnActiveInstancesExpression", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("./_MathExpression.js").MathOperation>, []>>>;
         }, []>>>;
         Indefinite: import("tsondb/schema/def").EnumCaseDecl<null>;
     }, []>>, true>;

package/lib/types/Disadvantage.d.ts

@@ -662,8 +662,6 @@ export declare const Disadvantage: Entity<"Disadvantage", {
             General: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
             Skill: import("tsondb/schema/def").EnumCaseDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"ExplicitSkillSelectOption", Object<{
                 id: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ReferenceIdentifierType, true>;
-                skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"NewSkillApplications", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
-                skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"SkillUses", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
                 prerequisites: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"GeneralPrerequisites", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisitesForLevels", import("tsondb/schema/def").ArrayType<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisiteForLevel", Object<{
                     level: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
                     prerequisite: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").EnumDecl<"PrerequisitesElement", {
@@ -823,8 +821,60 @@ export declare const Disadvantage: Entity<"Disadvantage", {
             }>, []>>>;
         }, []>>>, false>;
     }>, []>>, false>;
-    skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"NewSkillApplications", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
-    skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"SkillUses", import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
+    skill_applications: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ChildEntitiesType<Entity<"NewSkillApplication", {
+        parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").EnumDecl<"NewSkillApplicationOrUseParentIdentifier", {
+            GeneralSelectOption: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Advantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Disadvantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedCombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedKarmaSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedMagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedSkillSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            BlessedTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CeremonialItemSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            FatePointSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            GeneralSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            LiturgicalStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            SexSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+        }, []>>, true>;
+        skills: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+        required_skill_rating: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, false>;
+        translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"NewSkillApplicationTranslation", {
+            name: import("tsondb/schema/def").MemberDecl<String, true>;
+        }>, false>;
+    }, "parent">>, true>;
+    skill_uses: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ChildEntitiesType<Entity<"SkillUse", {
+        parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").EnumDecl<"NewSkillApplicationOrUseParentIdentifier", {
+            GeneralSelectOption: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Advantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Disadvantage: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedCombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedKarmaSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedMagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedSkillSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            BlessedTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CeremonialItemSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            FatePointSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            GeneralSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            LiturgicalStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalTradition: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicStyleSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+            SexSpecialAbility: import("tsondb/schema/def").EnumCaseDecl<import("tsondb/schema/def").ReferenceIdentifierType>;
+        }, []>>, true>;
+        skills: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ArrayType<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+        required_skill_rating: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, false>;
+        translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"SkillUseTranslation", {
+            name: import("tsondb/schema/def").MemberDecl<String, true>;
+        }>, false>;
+    }, "parent">>, true>;
     maximum: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, false>;
     prerequisites: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"AdvantageDisadvantagePrerequisites", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisitesForLevels", import("tsondb/schema/def").ArrayType<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("tsondb/schema/def").TypeAliasDecl<"PrerequisiteForLevel", Object<{
         level: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
@@ -867,13 +917,7 @@ export declare const Disadvantage: Entity<"Disadvantage", {
                 threshold: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
                 alternative: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
             }>, []>>>;
-            Multiplier: import("tsondb/schema/def").EnumCaseDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"AdventurePointsDependingOnActiveInstancesMultiplier", Object<{
-                base: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").IntegerType, true>;
-                expression: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], import("tsondb/schema/def").EnumDecl<"AdventurePointsDependingOnActiveInstancesMultiplierExpression", {
-                    Linear: import("tsondb/schema/def").EnumCaseDecl<null>;
-                    Exponentiation: import("tsondb/schema/def").EnumCaseDecl<null>;
-                }, []>>, true>;
-            }>, []>>>;
+            Expression: import("tsondb/schema/def").EnumCaseDecl<IncludeIdentifier<[], import("tsondb/schema/def").TypeAliasDecl<"AdventurePointsDependingOnActiveInstancesExpression", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, import("tsondb/schema/def").Type>[], import("./_MathExpression.js").MathOperation>, []>>>;
         }, []>>>;
         Indefinite: import("tsondb/schema/def").EnumCaseDecl<null>;
     }, []>>, true>;

package/lib/types/_Activatable.d.ts

@@ -1,7 +1,8 @@
 /**
  * General type specifications used by multiple activatable entries.
  */
-import { Array, Boolean, Entity, Enum, EnumCase, IncludeIdentifier, Integer, Object, String, Type, TypeAlias, TypeArgument } from "tsondb/schema/def";
+import { Array, Boolean, ChildEntities, Entity, Enum, EnumCase, IncludeIdentifier, Integer, Object, String, Type, TypeAlias, TypeArgument } from "tsondb/schema/def";
+import { MathOperation } from "./_MathExpression.js";
 export declare const name: import("tsondb/schema/def").MemberDecl<String, true>;
 export declare const name_in_library: import("tsondb/schema/def").MemberDecl<String, false>;
 export declare const levels: import("tsondb/schema/def").MemberDecl<Integer, false>;
@@ -667,8 +668,6 @@ export declare const select_options: import("tsondb/schema/def").MemberDecl<Incl
         General: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
         Skill: EnumCase<IncludeIdentifier<[], TypeAlias<"ExplicitSkillSelectOption", Object<{
             id: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ReferenceIdentifierType, true>;
-            skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"NewSkillApplications", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
-            skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"SkillUses", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
             prerequisites: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"GeneralPrerequisites", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], TypeAlias<"PrerequisitesForLevels", Array<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], TypeAlias<"PrerequisiteForLevel", Object<{
                 level: import("tsondb/schema/def").MemberDecl<Integer, true>;
                 prerequisite: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], Enum<"PrerequisitesElement", {
@@ -832,8 +831,6 @@ export declare const ExplicitSelectOption: Enum<"ExplicitSelectOption", {
     General: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
     Skill: EnumCase<IncludeIdentifier<[], TypeAlias<"ExplicitSkillSelectOption", Object<{
         id: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").ReferenceIdentifierType, true>;
-        skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"NewSkillApplications", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
-        skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"SkillUses", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
         prerequisites: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"GeneralPrerequisites", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], TypeAlias<"PrerequisitesForLevels", Array<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], TypeAlias<"PrerequisiteForLevel", Object<{
             level: import("tsondb/schema/def").MemberDecl<Integer, true>;
             prerequisite: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], Enum<"PrerequisitesElement", {
@@ -1047,8 +1044,60 @@ export declare const GeneralSelectOption: Entity<"GeneralSelectOption", {
         TradeSecret: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
     }, []>>, true>;
     profession_only: import("tsondb/schema/def").MemberDecl<Boolean, false>;
-    skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"NewSkillApplications", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
-    skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"SkillUses", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
+    skill_applications: import("tsondb/schema/def").MemberDecl<ChildEntities<Entity<"NewSkillApplication", {
+        parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"NewSkillApplicationOrUseParentIdentifier", {
+            GeneralSelectOption: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Advantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Disadvantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedCombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedKarmaSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedMagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedSkillSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            BlessedTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CeremonialItemSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            FatePointSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            GeneralSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            LiturgicalStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            SexSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        }, []>>, true>;
+        skills: import("tsondb/schema/def").MemberDecl<Array<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+        required_skill_rating: import("tsondb/schema/def").MemberDecl<Integer, false>;
+        translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"NewSkillApplicationTranslation", {
+            name: import("tsondb/schema/def").MemberDecl<String, true>;
+        }>, false>;
+    }, "parent">>, true>;
+    skill_uses: import("tsondb/schema/def").MemberDecl<ChildEntities<Entity<"SkillUse", {
+        parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"NewSkillApplicationOrUseParentIdentifier", {
+            GeneralSelectOption: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Advantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            Disadvantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedCombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedKarmaSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedMagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            AdvancedSkillSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            BlessedTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CeremonialItemSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            CombatStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            FatePointSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            GeneralSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            LiturgicalStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicalTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            MagicStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+            SexSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        }, []>>, true>;
+        skills: import("tsondb/schema/def").MemberDecl<Array<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+        required_skill_rating: import("tsondb/schema/def").MemberDecl<Integer, false>;
+        translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"SkillUseTranslation", {
+            name: import("tsondb/schema/def").MemberDecl<String, true>;
+        }>, false>;
+    }, "parent">>, true>;
     prerequisites: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"GeneralPrerequisites", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], TypeAlias<"PrerequisitesForLevels", Array<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], TypeAlias<"PrerequisiteForLevel", Object<{
         level: import("tsondb/schema/def").MemberDecl<Integer, true>;
         prerequisite: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], Enum<"PrerequisitesElement", {
@@ -1139,7 +1188,6 @@ export declare const type: import("tsondb/schema/def").MemberDecl<IncludeIdentif
     Armed: EnumCase<null>;
     Unarmed: EnumCase<null>;
 }, []>>, true>;
-export declare const skill_applications: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"NewSkillApplications", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
 export declare const NewSkillApplication: Entity<"NewSkillApplication", {
     parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"NewSkillApplicationOrUseParentIdentifier", {
         GeneralSelectOption: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
@@ -1167,6 +1215,33 @@ export declare const NewSkillApplication: Entity<"NewSkillApplication", {
         name: import("tsondb/schema/def").MemberDecl<String, true>;
     }>, false>;
 }, "parent">;
+export declare const skill_applications: import("tsondb/schema/def").MemberDecl<ChildEntities<Entity<"NewSkillApplication", {
+    parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"NewSkillApplicationOrUseParentIdentifier", {
+        GeneralSelectOption: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        Advantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        Disadvantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedCombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedKarmaSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedMagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedSkillSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        BlessedTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        CeremonialItemSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        CombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        CombatStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        FatePointSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        GeneralSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        LiturgicalStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        MagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        MagicalTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        MagicStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        SexSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+    }, []>>, true>;
+    skills: import("tsondb/schema/def").MemberDecl<Array<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+    required_skill_rating: import("tsondb/schema/def").MemberDecl<Integer, false>;
+    translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"NewSkillApplicationTranslation", {
+        name: import("tsondb/schema/def").MemberDecl<String, true>;
+    }>, false>;
+}, "parent">>, true>;
 export declare const SkillUse: Entity<"SkillUse", {
     parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"NewSkillApplicationOrUseParentIdentifier", {
         GeneralSelectOption: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
@@ -1194,7 +1269,33 @@ export declare const SkillUse: Entity<"SkillUse", {
         name: import("tsondb/schema/def").MemberDecl<String, true>;
     }>, false>;
 }, "parent">;
-export declare const skill_uses: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], TypeAlias<"SkillUses", Array<import("tsondb/schema/def").ReferenceIdentifierType>, []>>, false>;
+export declare const skill_uses: import("tsondb/schema/def").MemberDecl<ChildEntities<Entity<"SkillUse", {
+    parent: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"NewSkillApplicationOrUseParentIdentifier", {
+        GeneralSelectOption: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        Advantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        Disadvantage: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedCombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedKarmaSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedMagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        AdvancedSkillSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        BlessedTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        CeremonialItemSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        CombatSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        CombatStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        FatePointSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        GeneralSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        LiturgicalStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        MagicalSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        MagicalTradition: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        MagicStyleSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+        SexSpecialAbility: EnumCase<import("tsondb/schema/def").ReferenceIdentifierType>;
+    }, []>>, true>;
+    skills: import("tsondb/schema/def").MemberDecl<Array<import("tsondb/schema/def").ReferenceIdentifierType>, true>;
+    required_skill_rating: import("tsondb/schema/def").MemberDecl<Integer, false>;
+    translations: import("tsondb/schema/def").MemberDecl<import("tsondb/schema/def").NestedEntityMapType<"SkillUseTranslation", {
+        name: import("tsondb/schema/def").MemberDecl<String, true>;
+    }>, false>;
+}, "parent">>, true>;
 export declare const range_l10n: import("tsondb/schema/def").MemberDecl<String, false>;
 export declare const penalty: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"Penalty", {
     Single: EnumCase<IncludeIdentifier<[], TypeAlias<"SinglePenalty", Object<{
@@ -1766,13 +1867,7 @@ export declare const ap_value: import("tsondb/schema/def").MemberDecl<IncludeIde
             threshold: import("tsondb/schema/def").MemberDecl<Integer, true>;
             alternative: import("tsondb/schema/def").MemberDecl<Integer, true>;
         }>, []>>>;
-        Multiplier: EnumCase<IncludeIdentifier<[], TypeAlias<"AdventurePointsDependingOnActiveInstancesMultiplier", Object<{
-            base: import("tsondb/schema/def").MemberDecl<Integer, true>;
-            expression: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"AdventurePointsDependingOnActiveInstancesMultiplierExpression", {
-                Linear: EnumCase<null>;
-                Exponentiation: EnumCase<null>;
-            }, []>>, true>;
-        }>, []>>>;
+        Expression: EnumCase<IncludeIdentifier<[], TypeAlias<"AdventurePointsDependingOnActiveInstancesExpression", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], MathOperation>, []>>>;
     }, []>>>;
     Indefinite: EnumCase<null>;
 }, []>>, true>;
@@ -1785,12 +1880,6 @@ export declare const AdventurePointsDependingOnActiveInstances: Enum<"AdventureP
         threshold: import("tsondb/schema/def").MemberDecl<Integer, true>;
         alternative: import("tsondb/schema/def").MemberDecl<Integer, true>;
     }>, []>>>;
-    Multiplier: EnumCase<IncludeIdentifier<[], TypeAlias<"AdventurePointsDependingOnActiveInstancesMultiplier", Object<{
-        base: import("tsondb/schema/def").MemberDecl<Integer, true>;
-        expression: import("tsondb/schema/def").MemberDecl<IncludeIdentifier<[], Enum<"AdventurePointsDependingOnActiveInstancesMultiplierExpression", {
-            Linear: EnumCase<null>;
-            Exponentiation: EnumCase<null>;
-        }, []>>, true>;
-    }>, []>>>;
+    Expression: EnumCase<IncludeIdentifier<[], TypeAlias<"AdventurePointsDependingOnActiveInstancesExpression", IncludeIdentifier<import("tsondb/schema/def").TypeParameter<string, Type>[], MathOperation>, []>>>;
 }, []>;
 export declare const input: import("tsondb/schema/def").MemberDecl<String, false>;

package/lib/types/_Activatable.js

@@ -1,12 +1,13 @@
 /**
  * General type specifications used by multiple activatable entries.
  */
-import { Array, Boolean, Entity, Enum, EnumCase, GenEnum, GenIncludeIdentifier, GenTypeAlias, IncludeIdentifier, Integer, Object, Optional, Param, Required, String, TypeAlias, TypeArgument, } from "tsondb/schema/def";
+import { Array, Boolean, ChildEntities, Entity, Enum, EnumCase, GenEnum, GenIncludeIdentifier, GenTypeAlias, IncludeIdentifier, Integer, Object, Optional, Param, Required, String, TypeAlias, TypeArgument, } from "tsondb/schema/def";
 import { NestedTranslationMap } from "./Locale.js";
 import { SelectOptionCategory } from "./_ActivatableSelectOptionCategory.js";
 import { DurationUnitValue } from "./_ActivatableSkillDuration.js";
-import { AspectIdentifier, CloseCombatTechniqueIdentifier, GeneralIdentifier, MagicalTraditionIdentifier, NewSkillApplicationIdentifier, PatronIdentifier, PropertyIdentifier, RaceIdentifier, RangedCombatTechniqueIdentifier, SkillIdentifier, SkillUseIdentifier, WeaponIdentifier, } from "./_Identifier.js";
+import { AspectIdentifier, CloseCombatTechniqueIdentifier, GeneralIdentifier, MagicalTraditionIdentifier, PatronIdentifier, PropertyIdentifier, RaceIdentifier, RangedCombatTechniqueIdentifier, SkillIdentifier, WeaponIdentifier, } from "./_Identifier.js";
 import { AdvancedSpecialAbilityRestrictedOptionIdentifier, CombatRelatedSpecialAbilityIdentifier, CombatTechniqueIdentifier, NewSkillApplicationOrUseParentIdentifier, SelectOptionParentIdentifier, VolumePointsOptionReferenceIdentifier, } from "./_IdentifierGroup.js";
+import { MathOperation } from "./_MathExpression.js";
 import { GeneralPrerequisites } from "./_Prerequisite.js";
 import { ResponsiveText, ResponsiveTextOptional } from "./_ResponsiveText.js";
 import { DisplayOption } from "./prerequisites/DisplayOption.js";
@@ -76,13 +77,13 @@ export const GeneralSelectOption = Entity(import.meta.url, {
             comment: "Sometimes, professions use specific text selections that are not contained in described lists. This ensures you can use them for professions only. They are not going to be displayed as options to the user.",
             type: Boolean(),
         }),
-        skill_applications: Optional({
+        skill_applications: Required({
             comment: "Registers new applications, which get enabled once this entry is activated with its respective select option. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin select option.",
-            type: IncludeIdentifier(NewSkillApplications),
+            type: ChildEntities(NewSkillApplication),
         }),
-        skill_uses: Optional({
+        skill_uses: Required({
             comment: "Registers uses, which get enabled once this entry is activated with its respective select option. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin select option.",
-            type: IncludeIdentifier(SkillUses),
+            type: ChildEntities(SkillUse),
         }),
         prerequisites: Optional({
             comment: "Prerequisites for the select option.",
@@ -129,14 +130,6 @@ const ExplicitSkillSelectOption = TypeAlias(import.meta.url, {
             comment: "The skill’s identifier.",
             type: SkillIdentifier(),
         }),
-        skill_applications: Optional({
-            comment: "Registers new applications, which get enabled once this entry is activated with its respective select option. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin select option.",
-            type: IncludeIdentifier(NewSkillApplications),
-        }),
-        skill_uses: Optional({
-            comment: "Registers uses, which get enabled once this entry is activated with its respective select option. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin select option.",
-            type: IncludeIdentifier(SkillUses),
-        }),
         prerequisites: Optional({
             comment: "Prerequisites for the select option.",
             type: IncludeIdentifier(GeneralPrerequisites),
@@ -334,15 +327,6 @@ export const type = Required({
     comment: "The definition of if the combat special ability can be used when armed or when unarmed.",
     type: IncludeIdentifier(CombatSpecialAbilityType),
 });
-const NewSkillApplications = TypeAlias(import.meta.url, {
-    name: "NewSkillApplications",
-    comment: "Registers new skill applications, which get enabled once this entry is activated. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin activatable entry.",
-    type: () => Array(NewSkillApplicationIdentifier(), { minItems: 1 }),
-});
-export const skill_applications = Optional({
-    comment: "Registers new skill applications, which get enabled once this entry is activated. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin activatable entry.",
-    type: IncludeIdentifier(NewSkillApplications),
-});
 export const NewSkillApplication = Entity(import.meta.url, {
     name: "NewSkillApplication",
     namePlural: "NewSkillApplications",
@@ -375,6 +359,10 @@ export const NewSkillApplication = Entity(import.meta.url, {
         localeId: instanceDisplayNameLocaleId,
     }),
 });
+export const skill_applications = Required({
+    comment: "Registers new skill applications, which get enabled once this entry is activated. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin activatable entry.",
+    type: ChildEntities(NewSkillApplication),
+});
 export const SkillUse = Entity(import.meta.url, {
     name: "SkillUse",
     namePlural: "SkillUses",
@@ -407,14 +395,9 @@ export const SkillUse = Entity(import.meta.url, {
         localeId: instanceDisplayNameLocaleId,
     }),
 });
-const SkillUses = TypeAlias(import.meta.url, {
-    name: "SkillUses",
+export const skill_uses = Required({
     comment: "Registers uses, which get enabled once this entry is activated. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin activatable entry.",
-    type: () => Array(SkillUseIdentifier(), { minItems: 1 }),
-});
-export const skill_uses = Optional({
-    comment: "Registers uses, which get enabled once this entry is activated. It specifies an entry-unique identifier and the skill it belongs to. A translation can be left out if its name equals the name of the origin activatable entry.",
-    type: IncludeIdentifier(SkillUses),
+    type: ChildEntities(SkillUse),
 });
 const Penalty = Enum(import.meta.url, {
     name: "Penalty",
@@ -1399,8 +1382,8 @@ export const AdventurePointsDependingOnActiveInstances = Enum(import.meta.url, {
         Threshold: EnumCase({
             type: IncludeIdentifier(AdventurePointsDependingOnActiveInstancesThreshold),
         }),
-        Multiplier: EnumCase({
-            type: IncludeIdentifier(AdventurePointsDependingOnActiveInstancesMultiplier),
+        Expression: EnumCase({
+            type: IncludeIdentifier(AdventurePointsDependingOnActiveInstancesExpression),
         }),
     }),
 });
@@ -1422,32 +1405,23 @@ const AdventurePointsDependingOnActiveInstancesThreshold = TypeAlias(import.meta
         }),
     }),
 });
-const AdventurePointsDependingOnActiveInstancesMultiplier = TypeAlias(import.meta.url, {
-    name: "AdventurePointsDependingOnActiveInstancesMultiplier",
+const AdventurePointsDependingOnActiveInstancesExpression = TypeAlias(import.meta.url, {
+    name: "AdventurePointsDependingOnActiveInstancesExpression",
     comment: "The adventure points cost depends on how many instances of the entry are already active.",
-    type: () => Object({
-        base: Required({
-            comment: "The base adventure points value that is multiplied by the result of the selected expression.",
-            type: Integer({ minimum: 0 }),
-        }),
-        expression: Required({
-            comment: "The type of expression to use for calculating the multiplier.",
-            type: IncludeIdentifier(AdventurePointsDependingOnActiveInstancesMultiplierExpression),
-        }),
-    }),
+    type: () => GenIncludeIdentifier(MathOperation, [
+        IncludeIdentifier(AdventurePointsDependingOnActiveInstancesExpressionValue),
+    ]),
 });
-const AdventurePointsDependingOnActiveInstancesMultiplierExpression = Enum(import.meta.url, {
-    name: "AdventurePointsDependingOnActiveInstancesMultiplierExpression",
-    comment: `The type of expression to use for calculating the multiplier that is multiplied with the base value to get the final AP value.
-
-To keep the comments for each case easier to compare, the variable \`active\` is used for the number of active instances.`,
+const AdventurePointsDependingOnActiveInstancesExpressionValue = Enum(import.meta.url, {
+    name: "AdventurePointsDependingOnActiveInstancesExpressionValue",
+    comment: `The type of value allowed in the expression to calculate the AP value.`,
     values: () => ({
-        Linear: EnumCase({
-            comment: "active − 1",
-            type: null,
+        Constant: EnumCase({
+            comment: "A constant integer value.",
+            type: Integer(),
         }),
-        Exponentiation: EnumCase({
-            comment: "2^active^",
+        Active: EnumCase({
+            comment: "The number of active instances.",
             type: null,
         }),
     }),

package/lib/types/_MathExpression.d.ts

@@ -0,0 +1,12 @@
+import { Array, EnumCase, TypeArgument, type Enum, type IncludeIdentifier, type TypeParameter } from "tsondb/schema/def";
+type BinaryMathOperationName = "Addition" | "Subtraction" | "Multiplication" | "Division" | "Exponentiation";
+type BinaryMathOperation = {
+    [K in BinaryMathOperationName]: EnumCase<Array<IncludeIdentifier<[Value: TypeParameter], MathOperation>>>;
+};
+export type MathOperation = Enum<"MathOperation", {
+    Value: EnumCase<TypeArgument<TypeParameter>>;
+} & BinaryMathOperation, [
+    Value: TypeParameter
+]>;
+export declare const MathOperation: MathOperation;
+export {};