optolith-database-schema 0.1.28 → 0.2.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.2.0](https://github.com/elyukai/optolith-database-schema/compare/v0.1.28...v0.2.0) (2022-03-29)
+
+
+### ⚠ BREAKING CHANGES
+
+* derived select options are not a list anymore
+
+* derived select options are not a list anymore ([fa64a60](https://github.com/elyukai/optolith-database-schema/commit/fa64a60670f0cdf5567a168f3a4eccd7ea71d367))
+
 ### [0.1.28](https://github.com/elyukai/optolith-database-schema/compare/v0.1.27...v0.1.28) (2022-03-25)
 
 

package/lib/types/_Activatable.d.ts

@@ -6,7 +6,7 @@ import { DisplayOption } from "./prerequisites/DisplayOption.js";
 import { Errata } from "./source/_Erratum.js";
 import { PublicationRefs } from "./source/_PublicationRef.js";
 import { Duration } from "./_ActivatableSkill.js";
-import { ActivatableIdentifier, AdvancedSpecialAbilityRestrictedOptionIdentifier, CombatRelatedSpecialAbilityIdentifier, CombatTechniqueIdentifier, MagicalTraditionIdentifier, PatronIdentifier, VolumePointsOptionReferenceIdentifier } from "./_Identifier.js";
+import { ActivatableIdentifier, AdvancedSpecialAbilityRestrictedOptionIdentifier, CombatRelatedSpecialAbilityIdentifier, CombatTechniqueIdentifier, CombatTechniqueTag, MagicalTraditionIdentifier, PatronIdentifier, SkillIdentifier, SkillWithEnhancementsTag, VolumePointsOptionReferenceIdentifier } from "./_Identifier.js";
 import { GeneralPrerequisites } from "./_Prerequisite.js";
 /**
  * The activatable entry's identifier. An unique, increasing integer.
@@ -62,13 +62,13 @@ export declare type Maximum = number;
  */
 export declare type SelectOptions = {
     /**
-     * A list of categories with optional further configuration. All available
+     * An entry category with optional further configuration. All available
      * entries from the specified categories will be included as separate select
      * options. You can also specify a set of groups that should only be
      * included. Groups not mentioned will be excluded then.
      * @minItems 1
      */
-    derived?: CategoryOption[];
+    derived?: CategoryOption;
     /**
      * A list of explicit select options. If the identifier has a specific type,
      * its entry is the base of this select option, where values defined here
@@ -204,107 +204,146 @@ declare type CategoryOption = {
 } | {
     tag: "Skills";
     /**
-     * Only include entries of the specified groups.
+     * A list of skill categories.
      * @minItems 1
      */
-    groups?: {
+    categories: ({
+        tag: "Skills";
         /**
-         * The skill group's identifier.
-         * @integer
-         * @minimum 1
-         * @maximum 5
-         */
-        id: number;
-    }[];
-    /**
-     * Only include (`Intersection`) or exclude (`Difference`) specific skills.
-     */
-    specific?: {
-        operation: {
-            tag: "Intersection";
-        } | {
-            tag: "Difference";
-        };
-        /**
-         * The list of specific skills.
+         * Only include entries of the specified groups.
          * @minItems 1
-         * @uniqueItems
          */
-        list: {
+        groups?: {
             /**
-             * The skill's identifier.
+             * The skill group's identifier.
              * @integer
              * @minimum 1
-             * @maximum 59
+             * @maximum 5
              */
             id: number;
         }[];
-    };
-    /**
-     * Registers new applications, which get enabled once this entry is
-     * activated with its respective select option. It specifies an entry-unique
-     * identifier, the skill it belongs to is derived from the select option
-     * automatically. A translation can be left out if its name equals the name
-     * of the origin entry.
-     * @minItems 1
-     */
-    skill_applications?: {
         /**
-         * The application's identifier. An entry-unique, increasing integer.
-         * @integer
-         * @minimum 1
+         * Only include (`Intersection`) or exclude (`Difference`) specific
+         * skills.
          */
-        id: number;
+        specific?: {
+            operation: {
+                tag: "Intersection";
+            } | {
+                tag: "Difference";
+            };
+            /**
+             * The list of specific skills.
+             * @minItems 1
+             * @uniqueItems
+             */
+            list: {
+                /**
+                 * The skill's identifier.
+                 * @integer
+                 * @minimum 1
+                 * @maximum 59
+                 */
+                id: number;
+            }[];
+        };
         /**
-         * All translations for the entry, identified by IETF language tag (BCP47).
-         * @minProperties 1
+         * Registers new applications, which get enabled once this entry is
+         * activated with its respective select option. It specifies an
+         * entry-unique identifier, the skill it belongs to is derived from the
+         * select option automatically. A translation can be left out if its
+         * name equals the name of the origin entry.
+         * @minItems 1
          */
-        translations?: {
+        skill_applications?: {
             /**
-             * @patternProperties ^[a-z]{2}-[A-Z]{2}$
+             * The application's identifier. An entry-unique, increasing integer.
+             * @integer
+             * @minimum 1
              */
-            [localeId: string]: {
+            id: number;
+            /**
+             * All translations for the entry, identified by IETF language tag
+             * (BCP47).
+             * @minProperties 1
+             */
+            translations?: {
                 /**
-                 * The name of the application if different from the activatable entry's
-                 * name.
-                 * @minLength 1
+                 * @patternProperties ^[a-z]{2}-[A-Z]{2}$
                  */
-                name: string;
+                [localeId: string]: {
+                    /**
+                     * The name of the application if different from the activatable
+                     * entry's
+                     * name.
+                     * @minLength 1
+                     */
+                    name: string;
+                };
             };
-        };
-    }[];
-    /**
-     * Registers uses, which get enabled once this entry is activated with its
-     * respective select option. It specifies an entry-unique identifier, the
-     * skill it belongs to is derived from the select option automatically. A
-     * translation can be left out if its name equals the name of the origin
-     * entry.
-     * @minItems 1
-     */
-    skill_uses?: {
+        }[];
         /**
-         * The use's identifier. An entry-unique, increasing integer.
-         * @integer
-         * @minimum 1
+         * Registers uses, which get enabled once this entry is activated with
+         * its respective select option. It specifies an entry-unique
+         * identifier, the skill it belongs to is derived from the select option
+         * automatically. A translation can be left out if its name equals the
+         * name of the origin entry.
+         * @minItems 1
          */
-        id: number;
+        skill_uses?: {
+            /**
+             * The use's identifier. An entry-unique, increasing integer.
+             * @integer
+             * @minimum 1
+             */
+            id: number;
+            /**
+             * All translations for the entry, identified by IETF language tag
+             * (BCP47).
+             * @minProperties 1
+             */
+            translations?: {
+                /**
+                 * @patternProperties ^[a-z]{2}-[A-Z]{2}$
+                 */
+                [localeId: string]: {
+                    /**
+                     * The name of the use if different from the activatable entry's
+                     * name.
+                     * @minLength 1
+                     */
+                    name: string;
+                };
+            };
+        }[];
+    } | {
+        tag: SkillWithEnhancementsTag;
         /**
-         * All translations for the entry, identified by IETF language tag (BCP47).
-         * @minProperties 1
+         * Only include (`Intersection`) or exclude (`Difference`) specific
+         * entries.
          */
-        translations?: {
+        specific?: {
+            operation: {
+                tag: "Intersection";
+            } | {
+                tag: "Difference";
+            };
             /**
-             * @patternProperties ^[a-z]{2}-[A-Z]{2}$
+             * The list of specific entries.
+             * @minItems 1
+             * @uniqueItems
              */
-            [localeId: string]: {
+            list: {
                 /**
-                 * The name of the use if different from the activatable entry's name.
-                 * @minLength 1
+                 * The entry's identifier.
+                 * @integer
+                 * @minimum 1
+                 * @maximum 59
                  */
-                name: string;
-            };
+                id: number;
+            }[];
         };
-    }[];
+    })[];
     /**
      * Generate prerequisites for each entry of the category.
      * @minItems 1
@@ -313,51 +352,51 @@ declare type CategoryOption = {
     /**
      * Generate AP values for each entry.
      */
-    ap_value?: OptionSkillDeriveAdventurePointsValue;
-} | {
-    tag: NonSkillSkillCategory;
-    /**
-     * Only include (`Intersection`) or exclude (`Difference`) specific entries.
-     */
-    specific?: {
-        operation: {
-            tag: "Intersection";
-        } | {
-            tag: "Difference";
-        };
+    ap_value?: OptionSkillDeriveAdventurePointsValue<SkillIdentifier> | {
+        tag: "CombatTechniques";
         /**
-         * The list of specific entries.
+         * A list of combat technique categories.
          * @minItems 1
-         * @uniqueItems
          */
-        list: {
+        categories: {
+            tag: CombatTechniqueTag;
             /**
-             * The entry's identifier.
-             * @integer
-             * @minimum 1
-             * @maximum 59
+             * Only include (`Intersection`) or exclude (`Difference`) specific
+             * entries.
              */
-            id: number;
+            specific?: {
+                operation: {
+                    tag: "Intersection";
+                } | {
+                    tag: "Difference";
+                };
+                /**
+                 * The list of specific entries.
+                 * @minItems 1
+                 * @uniqueItems
+                 */
+                list: {
+                    /**
+                     * The entry's identifier.
+                     * @integer
+                     * @minimum 1
+                     * @maximum 59
+                     */
+                    id: number;
+                }[];
+            };
         }[];
+        /**
+         * Generate prerequisites for each entry of the category.
+         * @minItems 1
+         */
+        prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
+        /**
+         * Generate AP values for each entry.
+         */
+        ap_value?: OptionSkillDeriveAdventurePointsValue<CombatTechniqueIdentifier>;
     };
-    /**
-     * Generate prerequisites for each entry of the category.
-     * @minItems 1
-     */
-    prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
-    /**
-     * Generate AP values for each entry.
-     */
-    ap_value?: OptionSkillDeriveAdventurePointsValue;
 };
-declare enum NonSkillSkillCategory {
-    CloseCombatTechniques = "CloseCombatTechniques",
-    RangedCombatTechniques = "RangedCombatTechniques",
-    LiturgicalChants = "LiturgicalChants",
-    Ceremonies = "Ceremonies",
-    Spells = "Spells",
-    Rituals = "Rituals"
-}
 declare type OptionSkillSelfPrerequisite = {
     tag: "Self";
     /**
@@ -390,7 +429,7 @@ declare type OptionOptionPrerequisite = {
 /**
  * Generate AP values for each entry.
  */
-declare type OptionSkillDeriveAdventurePointsValue = {
+declare type OptionSkillDeriveAdventurePointsValue<Identifier> = {
     tag: "DerivedFromImprovementCost";
     /**
      * This number is multiplied with the improvement cost of the entry
@@ -410,7 +449,7 @@ declare type OptionSkillDeriveAdventurePointsValue = {
          * @integer
          * @minimum 1
          */
-        id: number;
+        id: Identifier;
         /**
          * The AP value for the specified entry.
          * @integer

package/lib/types/_Activatable.js

@@ -2,15 +2,6 @@
  * General type specifications used by multiple activatable entries.
  * @title Activatable
  */
-var NonSkillSkillCategory;
-(function (NonSkillSkillCategory) {
-    NonSkillSkillCategory["CloseCombatTechniques"] = "CloseCombatTechniques";
-    NonSkillSkillCategory["RangedCombatTechniques"] = "RangedCombatTechniques";
-    NonSkillSkillCategory["LiturgicalChants"] = "LiturgicalChants";
-    NonSkillSkillCategory["Ceremonies"] = "Ceremonies";
-    NonSkillSkillCategory["Spells"] = "Spells";
-    NonSkillSkillCategory["Rituals"] = "Rituals";
-})(NonSkillSkillCategory || (NonSkillSkillCategory = {}));
 export {};
 // "Input": {
 //   "description": "A string that is used as a placeholder text for an input field.",

package/lib/types/_Identifier.d.ts

@@ -108,6 +108,13 @@ declare enum RatedTag {
     LiturgicalChant = "LiturgicalChant",
     Ceremony = "Ceremony"
 }
+declare enum SkillTag {
+    Skill = "Skill",
+    Spell = "Spell",
+    Ritual = "Ritual",
+    LiturgicalChant = "LiturgicalChant",
+    Ceremony = "Ceremony"
+}
 declare enum AdvancedSpecialAbilityRestrictedOptionTag {
     General = "General",
     Skill = "Skill",
@@ -117,7 +124,7 @@ declare enum VolumePointsOptionReferenceTag {
     General = "General",
     AnimalShapeSize = "AnimalShapeSize"
 }
-declare enum CombatTechniqueTag {
+export declare enum CombatTechniqueTag {
     CloseCombatTechnique = "CloseCombatTechnique",
     RangedCombatTechnique = "RangedCombatTechnique"
 }
@@ -131,7 +138,7 @@ declare enum ExtensionRuleTag {
     FocusRule = "FocusRule",
     OptionalRule = "OptionalRule"
 }
-declare enum SkillWithEnhancementsTag {
+export declare enum SkillWithEnhancementsTag {
     Spell = "Spell",
     Ritual = "Ritual",
     LiturgicalChant = "LiturgicalChant",
@@ -183,6 +190,7 @@ export declare type ActivatableIdentifier = TaggedIdentifier<ActivatableTag>;
 export declare type SpecialAbilityIdentifier = TaggedIdentifier<SpecialAbilityTag>;
 export declare type CombatRelatedSpecialAbilityIdentifier = TaggedIdentifier<CombatRelatedSpecialAbilityTag>;
 export declare type RatedIdentifier = TaggedIdentifier<RatedTag>;
+export declare type SkillIdentifier = TaggedIdentifier<SkillTag>;
 export declare type AdvancedSpecialAbilityRestrictedOptionIdentifier = TaggedIdentifier<AdvancedSpecialAbilityRestrictedOptionTag>;
 export declare type VolumePointsOptionReferenceIdentifier = TaggedIdentifier<VolumePointsOptionReferenceTag>;
 export declare type CombatTechniqueIdentifier = TaggedIdentifier<CombatTechniqueTag>;

package/lib/types/_Identifier.js

@@ -112,6 +112,14 @@ var RatedTag;
     RatedTag["LiturgicalChant"] = "LiturgicalChant";
     RatedTag["Ceremony"] = "Ceremony";
 })(RatedTag || (RatedTag = {}));
+var SkillTag;
+(function (SkillTag) {
+    SkillTag["Skill"] = "Skill";
+    SkillTag["Spell"] = "Spell";
+    SkillTag["Ritual"] = "Ritual";
+    SkillTag["LiturgicalChant"] = "LiturgicalChant";
+    SkillTag["Ceremony"] = "Ceremony";
+})(SkillTag || (SkillTag = {}));
 var AdvancedSpecialAbilityRestrictedOptionTag;
 (function (AdvancedSpecialAbilityRestrictedOptionTag) {
     AdvancedSpecialAbilityRestrictedOptionTag["General"] = "General";
@@ -123,7 +131,7 @@ var VolumePointsOptionReferenceTag;
     VolumePointsOptionReferenceTag["General"] = "General";
     VolumePointsOptionReferenceTag["AnimalShapeSize"] = "AnimalShapeSize";
 })(VolumePointsOptionReferenceTag || (VolumePointsOptionReferenceTag = {}));
-var CombatTechniqueTag;
+export var CombatTechniqueTag;
 (function (CombatTechniqueTag) {
     CombatTechniqueTag["CloseCombatTechnique"] = "CloseCombatTechnique";
     CombatTechniqueTag["RangedCombatTechnique"] = "RangedCombatTechnique";
@@ -141,7 +149,7 @@ var ExtensionRuleTag;
     ExtensionRuleTag["FocusRule"] = "FocusRule";
     ExtensionRuleTag["OptionalRule"] = "OptionalRule";
 })(ExtensionRuleTag || (ExtensionRuleTag = {}));
-var SkillWithEnhancementsTag;
+export var SkillWithEnhancementsTag;
 (function (SkillWithEnhancementsTag) {
     SkillWithEnhancementsTag["Spell"] = "Spell";
     SkillWithEnhancementsTag["Ritual"] = "Ritual";
@@ -186,4 +194,3 @@ var CoreRuleDerivableContentTag;
     CoreRuleDerivableContentTag["MagicalSpecialAbility"] = "MagicalSpecialAbility";
     CoreRuleDerivableContentTag["BlessedTradition"] = "BlessedTradition";
 })(CoreRuleDerivableContentTag || (CoreRuleDerivableContentTag = {}));
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optolith-database-schema",
-  "version": "0.1.28",
+  "version": "0.2.0",
   "description": "Definitions and utilities for the flat-file database of Optolith, a character creation tool for the Pen and Paper RPG “The Dark Eye 5”, and its external integrations into other software.",
   "keywords": [
     "tde",

package/schema/_Activatable.schema.json

@@ -32,12 +32,8 @@
       "type": "object",
       "properties": {
         "derived": {
-          "description": "A list of categories with optional further configuration. All available\nentries from the specified categories will be included as separate select\noptions. You can also specify a set of groups that should only be\nincluded. Groups not mentioned will be excluded then.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/CategoryOption"
-          },
-          "minItems": 1
+          "description": "An entry category with optional further configuration. All available\nentries from the specified categories will be included as separate select\noptions. You can also specify a set of groups that should only be\nincluded. Groups not mentioned will be excluded then.",
+          "$ref": "#/definitions/CategoryOption"
         },
         "explicit": {
           "description": "A list of explicit select options. If the identifier has a specific type,\nits entry is the base of this select option, where values defined here\noverride values from the base. Define the `src` property if the options\nare not derived from the rules text of the advantage/disadvantage/special\nability but instead are listed in a separate block and/or on a separate\npage.",
@@ -359,165 +355,258 @@
             "tag": {
               "const": "Skills"
             },
-            "groups": {
-              "description": "Only include entries of the specified groups.",
+            "categories": {
+              "description": "A list of skill categories.",
               "type": "array",
               "items": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "The skill group's identifier.",
-                    "type": "integer",
-                    "maximum": 5,
-                    "minimum": 1
-                  }
-                },
-                "required": [
-                  "id"
-                ],
-                "additionalProperties": false
-              },
-              "minItems": 1
-            },
-            "specific": {
-              "description": "Only include (`Intersection`) or exclude (`Difference`) specific skills.",
-              "type": "object",
-              "properties": {
-                "operation": {
-                  "oneOf": [
-                    {
-                      "type": "object",
-                      "properties": {
-                        "tag": {
-                          "const": "Intersection"
-                        }
-                      },
-                      "required": [
-                        "tag"
-                      ],
-                      "additionalProperties": false
-                    },
-                    {
-                      "type": "object",
-                      "properties": {
-                        "tag": {
-                          "const": "Difference"
-                        }
-                      },
-                      "required": [
-                        "tag"
-                      ],
-                      "additionalProperties": false
-                    }
-                  ]
-                },
-                "list": {
-                  "description": "The list of specific skills.",
-                  "type": "array",
-                  "items": {
+                "oneOf": [
+                  {
                     "type": "object",
                     "properties": {
-                      "id": {
-                        "description": "The skill's identifier.",
-                        "type": "integer",
-                        "maximum": 59,
-                        "minimum": 1
-                      }
-                    },
-                    "required": [
-                      "id"
-                    ],
-                    "additionalProperties": false
-                  },
-                  "minItems": 1,
-                  "uniqueItems": true
-                }
-              },
-              "required": [
-                "operation",
-                "list"
-              ],
-              "additionalProperties": false
-            },
-            "skill_applications": {
-              "description": "Registers new applications, which get enabled once this entry is\nactivated with its respective select option. It specifies an entry-unique\nidentifier, the skill it belongs to is derived from the select option\nautomatically. A translation can be left out if its name equals the name\nof the origin entry.",
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "The application's identifier. An entry-unique, increasing integer.",
-                    "type": "integer",
-                    "minimum": 1
-                  },
-                  "translations": {
-                    "description": "All translations for the entry, identified by IETF language tag (BCP47).",
-                    "type": "object",
-                    "patternProperties": {
-                      "^[a-z]{2}-[A-Z]{2}$": {
+                      "tag": {
+                        "const": "Skills"
+                      },
+                      "groups": {
+                        "description": "Only include entries of the specified groups.",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "id": {
+                              "description": "The skill group's identifier.",
+                              "type": "integer",
+                              "maximum": 5,
+                              "minimum": 1
+                            }
+                          },
+                          "required": [
+                            "id"
+                          ],
+                          "additionalProperties": false
+                        },
+                        "minItems": 1
+                      },
+                      "specific": {
+                        "description": "Only include (`Intersection`) or exclude (`Difference`) specific\nskills.",
                         "type": "object",
                         "properties": {
-                          "name": {
-                            "description": "The name of the application if different from the activatable entry's\nname.",
-                            "type": "string",
-                            "minLength": 1
+                          "operation": {
+                            "oneOf": [
+                              {
+                                "type": "object",
+                                "properties": {
+                                  "tag": {
+                                    "const": "Intersection"
+                                  }
+                                },
+                                "required": [
+                                  "tag"
+                                ],
+                                "additionalProperties": false
+                              },
+                              {
+                                "type": "object",
+                                "properties": {
+                                  "tag": {
+                                    "const": "Difference"
+                                  }
+                                },
+                                "required": [
+                                  "tag"
+                                ],
+                                "additionalProperties": false
+                              }
+                            ]
+                          },
+                          "list": {
+                            "description": "The list of specific skills.",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "id": {
+                                  "description": "The skill's identifier.",
+                                  "type": "integer",
+                                  "maximum": 59,
+                                  "minimum": 1
+                                }
+                              },
+                              "required": [
+                                "id"
+                              ],
+                              "additionalProperties": false
+                            },
+                            "minItems": 1,
+                            "uniqueItems": true
                           }
                         },
                         "required": [
-                          "name"
+                          "operation",
+                          "list"
                         ],
                         "additionalProperties": false
+                      },
+                      "skill_applications": {
+                        "description": "Registers new applications, which get enabled once this entry is\nactivated with its respective select option. It specifies an\nentry-unique identifier, the skill it belongs to is derived from the\nselect option automatically. A translation can be left out if its\nname equals the name of the origin entry.",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "id": {
+                              "description": "The application's identifier. An entry-unique, increasing integer.",
+                              "type": "integer",
+                              "minimum": 1
+                            },
+                            "translations": {
+                              "description": "All translations for the entry, identified by IETF language tag\n(BCP47).",
+                              "type": "object",
+                              "patternProperties": {
+                                "^[a-z]{2}-[A-Z]{2}$": {
+                                  "type": "object",
+                                  "properties": {
+                                    "name": {
+                                      "description": "The name of the application if different from the activatable\nentry's\nname.",
+                                      "type": "string",
+                                      "minLength": 1
+                                    }
+                                  },
+                                  "required": [
+                                    "name"
+                                  ],
+                                  "additionalProperties": false
+                                }
+                              },
+                              "minProperties": 1,
+                              "additionalProperties": false
+                            }
+                          },
+                          "required": [
+                            "id"
+                          ],
+                          "additionalProperties": false
+                        },
+                        "minItems": 1
+                      },
+                      "skill_uses": {
+                        "description": "Registers uses, which get enabled once this entry is activated with\nits respective select option. It specifies an entry-unique\nidentifier, the skill it belongs to is derived from the select option\nautomatically. A translation can be left out if its name equals the\nname of the origin entry.",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "id": {
+                              "description": "The use's identifier. An entry-unique, increasing integer.",
+                              "type": "integer",
+                              "minimum": 1
+                            },
+                            "translations": {
+                              "description": "All translations for the entry, identified by IETF language tag\n(BCP47).",
+                              "type": "object",
+                              "patternProperties": {
+                                "^[a-z]{2}-[A-Z]{2}$": {
+                                  "type": "object",
+                                  "properties": {
+                                    "name": {
+                                      "description": "The name of the use if different from the activatable entry's\nname.",
+                                      "type": "string",
+                                      "minLength": 1
+                                    }
+                                  },
+                                  "required": [
+                                    "name"
+                                  ],
+                                  "additionalProperties": false
+                                }
+                              },
+                              "minProperties": 1,
+                              "additionalProperties": false
+                            }
+                          },
+                          "required": [
+                            "id"
+                          ],
+                          "additionalProperties": false
+                        },
+                        "minItems": 1
                       }
                     },
-                    "minProperties": 1,
+                    "required": [
+                      "tag"
+                    ],
                     "additionalProperties": false
-                  }
-                },
-                "required": [
-                  "id"
-                ],
-                "additionalProperties": false
-              },
-              "minItems": 1
-            },
-            "skill_uses": {
-              "description": "Registers uses, which get enabled once this entry is activated with its\nrespective select option. It specifies an entry-unique identifier, the\nskill it belongs to is derived from the select option automatically. A\ntranslation can be left out if its name equals the name of the origin\nentry.",
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "The use's identifier. An entry-unique, increasing integer.",
-                    "type": "integer",
-                    "minimum": 1
                   },
-                  "translations": {
-                    "description": "All translations for the entry, identified by IETF language tag (BCP47).",
+                  {
                     "type": "object",
-                    "patternProperties": {
-                      "^[a-z]{2}-[A-Z]{2}$": {
+                    "properties": {
+                      "tag": {
+                        "$ref": "./_Identifier.schema.json#/definitions/SkillWithEnhancementsTag"
+                      },
+                      "specific": {
+                        "description": "Only include (`Intersection`) or exclude (`Difference`) specific\nentries.",
                         "type": "object",
                         "properties": {
-                          "name": {
-                            "description": "The name of the use if different from the activatable entry's name.",
-                            "type": "string",
-                            "minLength": 1
+                          "operation": {
+                            "oneOf": [
+                              {
+                                "type": "object",
+                                "properties": {
+                                  "tag": {
+                                    "const": "Intersection"
+                                  }
+                                },
+                                "required": [
+                                  "tag"
+                                ],
+                                "additionalProperties": false
+                              },
+                              {
+                                "type": "object",
+                                "properties": {
+                                  "tag": {
+                                    "const": "Difference"
+                                  }
+                                },
+                                "required": [
+                                  "tag"
+                                ],
+                                "additionalProperties": false
+                              }
+                            ]
+                          },
+                          "list": {
+                            "description": "The list of specific entries.",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "id": {
+                                  "description": "The entry's identifier.",
+                                  "type": "integer",
+                                  "maximum": 59,
+                                  "minimum": 1
+                                }
+                              },
+                              "required": [
+                                "id"
+                              ],
+                              "additionalProperties": false
+                            },
+                            "minItems": 1,
+                            "uniqueItems": true
                           }
                         },
                         "required": [
-                          "name"
+                          "operation",
+                          "list"
                         ],
                         "additionalProperties": false
                       }
                     },
-                    "minProperties": 1,
+                    "required": [
+                      "tag"
+                    ],
                     "additionalProperties": false
                   }
-                },
-                "required": [
-                  "id"
-                ],
-                "additionalProperties": false
+                ]
               },
               "minItems": 1
             },
@@ -538,31 +627,20 @@
             },
             "ap_value": {
               "description": "Generate AP values for each entry.",
-              "$ref": "#/definitions/OptionSkillDeriveAdventurePointsValue"
-            }
-          },
-          "required": [
-            "tag"
-          ],
-          "additionalProperties": false
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tag": {
-              "$ref": "#/definitions/NonSkillSkillCategory"
-            },
-            "specific": {
-              "description": "Only include (`Intersection`) or exclude (`Difference`) specific entries.",
-              "type": "object",
-              "properties": {
-                "operation": {
+              "oneOf": [
+                {
+                  "description": "Generate AP values for each entry.",
                   "oneOf": [
                     {
                       "type": "object",
                       "properties": {
                         "tag": {
-                          "const": "Intersection"
+                          "const": "DerivedFromImprovementCost"
+                        },
+                        "multiplier": {
+                          "description": "This number is multiplied with the improvement cost of the entry\n(A = 1 to D = 4).",
+                          "type": "integer",
+                          "minimum": 2
                         }
                       },
                       "required": [
@@ -574,81 +652,224 @@
                       "type": "object",
                       "properties": {
                         "tag": {
-                          "const": "Difference"
+                          "const": "Fixed"
+                        },
+                        "map": {
+                          "description": "A mapping of skill identifiers to their specific AP values.",
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "id": {
+                                "$ref": "./_Identifier.schema.json#/definitions/SkillIdentifier"
+                              },
+                              "ap_value": {
+                                "description": "The AP value for the specified entry.",
+                                "type": "integer",
+                                "minimum": 1
+                              }
+                            },
+                            "required": [
+                              "id",
+                              "ap_value"
+                            ],
+                            "additionalProperties": false
+                          }
+                        },
+                        "default": {
+                          "description": "The default value of an entry. Used as a fallback if no value is\nfound in `list`.",
+                          "type": "integer",
+                          "minimum": 1
                         }
                       },
                       "required": [
-                        "tag"
+                        "tag",
+                        "map",
+                        "default"
                       ],
                       "additionalProperties": false
                     }
                   ]
                 },
-                "list": {
-                  "description": "The list of specific entries.",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "id": {
-                        "description": "The entry's identifier.",
-                        "type": "integer",
-                        "maximum": 59,
-                        "minimum": 1
-                      }
+                {
+                  "type": "object",
+                  "properties": {
+                    "tag": {
+                      "const": "CombatTechniques"
                     },
-                    "required": [
-                      "id"
-                    ],
-                    "additionalProperties": false
+                    "categories": {
+                      "description": "A list of combat technique categories.",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "tag": {
+                            "$ref": "./_Identifier.schema.json#/definitions/CombatTechniqueTag"
+                          },
+                          "specific": {
+                            "description": "Only include (`Intersection`) or exclude (`Difference`) specific\nentries.",
+                            "type": "object",
+                            "properties": {
+                              "operation": {
+                                "oneOf": [
+                                  {
+                                    "type": "object",
+                                    "properties": {
+                                      "tag": {
+                                        "const": "Intersection"
+                                      }
+                                    },
+                                    "required": [
+                                      "tag"
+                                    ],
+                                    "additionalProperties": false
+                                  },
+                                  {
+                                    "type": "object",
+                                    "properties": {
+                                      "tag": {
+                                        "const": "Difference"
+                                      }
+                                    },
+                                    "required": [
+                                      "tag"
+                                    ],
+                                    "additionalProperties": false
+                                  }
+                                ]
+                              },
+                              "list": {
+                                "description": "The list of specific entries.",
+                                "type": "array",
+                                "items": {
+                                  "type": "object",
+                                  "properties": {
+                                    "id": {
+                                      "description": "The entry's identifier.",
+                                      "type": "integer",
+                                      "maximum": 59,
+                                      "minimum": 1
+                                    }
+                                  },
+                                  "required": [
+                                    "id"
+                                  ],
+                                  "additionalProperties": false
+                                },
+                                "minItems": 1,
+                                "uniqueItems": true
+                              }
+                            },
+                            "required": [
+                              "operation",
+                              "list"
+                            ],
+                            "additionalProperties": false
+                          }
+                        },
+                        "required": [
+                          "tag"
+                        ],
+                        "additionalProperties": false
+                      },
+                      "minItems": 1
+                    },
+                    "prerequisites": {
+                      "description": "Generate prerequisites for each entry of the category.",
+                      "type": "array",
+                      "items": {
+                        "oneOf": [
+                          {
+                            "$ref": "#/definitions/OptionSkillSelfPrerequisite"
+                          },
+                          {
+                            "$ref": "#/definitions/OptionOptionPrerequisite"
+                          }
+                        ]
+                      },
+                      "minItems": 1
+                    },
+                    "ap_value": {
+                      "description": "Generate AP values for each entry.",
+                      "oneOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "tag": {
+                              "const": "DerivedFromImprovementCost"
+                            },
+                            "multiplier": {
+                              "description": "This number is multiplied with the improvement cost of the entry\n(A = 1 to D = 4).",
+                              "type": "integer",
+                              "minimum": 2
+                            }
+                          },
+                          "required": [
+                            "tag"
+                          ],
+                          "additionalProperties": false
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "tag": {
+                              "const": "Fixed"
+                            },
+                            "map": {
+                              "description": "A mapping of skill identifiers to their specific AP values.",
+                              "type": "array",
+                              "items": {
+                                "type": "object",
+                                "properties": {
+                                  "id": {
+                                    "$ref": "./_Identifier.schema.json#/definitions/CombatTechniqueIdentifier"
+                                  },
+                                  "ap_value": {
+                                    "description": "The AP value for the specified entry.",
+                                    "type": "integer",
+                                    "minimum": 1
+                                  }
+                                },
+                                "required": [
+                                  "id",
+                                  "ap_value"
+                                ],
+                                "additionalProperties": false
+                              }
+                            },
+                            "default": {
+                              "description": "The default value of an entry. Used as a fallback if no value is\nfound in `list`.",
+                              "type": "integer",
+                              "minimum": 1
+                            }
+                          },
+                          "required": [
+                            "tag",
+                            "map",
+                            "default"
+                          ],
+                          "additionalProperties": false
+                        }
+                      ]
+                    }
                   },
-                  "minItems": 1,
-                  "uniqueItems": true
+                  "required": [
+                    "tag",
+                    "categories"
+                  ],
+                  "additionalProperties": false
                 }
-              },
-              "required": [
-                "operation",
-                "list"
-              ],
-              "additionalProperties": false
-            },
-            "prerequisites": {
-              "description": "Generate prerequisites for each entry of the category.",
-              "type": "array",
-              "items": {
-                "oneOf": [
-                  {
-                    "$ref": "#/definitions/OptionSkillSelfPrerequisite"
-                  },
-                  {
-                    "$ref": "#/definitions/OptionOptionPrerequisite"
-                  }
-                ]
-              },
-              "minItems": 1
-            },
-            "ap_value": {
-              "description": "Generate AP values for each entry.",
-              "$ref": "#/definitions/OptionSkillDeriveAdventurePointsValue"
+              ]
             }
           },
           "required": [
-            "tag"
+            "tag",
+            "categories"
           ],
           "additionalProperties": false
         }
       ]
     },
-    "NonSkillSkillCategory": {
-      "enum": [
-        "CloseCombatTechniques",
-        "RangedCombatTechniques",
-        "LiturgicalChants",
-        "Ceremonies",
-        "Spells",
-        "Rituals"
-      ]
-    },
     "OptionSkillSelfPrerequisite": {
       "type": "object",
       "properties": {
@@ -695,71 +916,6 @@
       ],
       "additionalProperties": false
     },
-    "OptionSkillDeriveAdventurePointsValue": {
-      "description": "Generate AP values for each entry.",
-      "oneOf": [
-        {
-          "type": "object",
-          "properties": {
-            "tag": {
-              "const": "DerivedFromImprovementCost"
-            },
-            "multiplier": {
-              "description": "This number is multiplied with the improvement cost of the entry\n(A = 1 to D = 4).",
-              "type": "integer",
-              "minimum": 2
-            }
-          },
-          "required": [
-            "tag"
-          ],
-          "additionalProperties": false
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tag": {
-              "const": "Fixed"
-            },
-            "map": {
-              "description": "A mapping of skill identifiers to their specific AP values.",
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "description": "The skill's identifier.",
-                    "type": "integer",
-                    "minimum": 1
-                  },
-                  "ap_value": {
-                    "description": "The AP value for the specified entry.",
-                    "type": "integer",
-                    "minimum": 1
-                  }
-                },
-                "required": [
-                  "id",
-                  "ap_value"
-                ],
-                "additionalProperties": false
-              }
-            },
-            "default": {
-              "description": "The default value of an entry. Used as a fallback if no value is\nfound in `list`.",
-              "type": "integer",
-              "minimum": 1
-            }
-          },
-          "required": [
-            "tag",
-            "map",
-            "default"
-          ],
-          "additionalProperties": false
-        }
-      ]
-    },
     "ExplicitOption": {
       "oneOf": [
         {

package/schema/_Identifier.schema.json

@@ -120,6 +120,15 @@
         "Ceremony"
       ]
     },
+    "SkillTag": {
+      "enum": [
+        "Skill",
+        "Spell",
+        "Ritual",
+        "LiturgicalChant",
+        "Ceremony"
+      ]
+    },
     "AdvancedSpecialAbilityRestrictedOptionTag": {
       "enum": [
         "General",
@@ -278,6 +287,24 @@
       ],
       "additionalProperties": false
     },
+    "SkillIdentifier": {
+      "type": "object",
+      "properties": {
+        "tag": {
+          "$ref": "#/definitions/SkillTag"
+        },
+        "value": {
+          "description": "The referenced entry's numeric identifier.",
+          "type": "integer",
+          "minimum": 1
+        }
+      },
+      "required": [
+        "tag",
+        "value"
+      ],
+      "additionalProperties": false
+    },
     "AdvancedSpecialAbilityRestrictedOptionIdentifier": {
       "type": "object",
       "properties": {