optolith-database-schema 0.2.0 → 0.2.3

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 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.3](https://github.com/elyukai/optolith-database-schema/compare/v0.2.2...v0.2.3) (2022-03-29)
+
+
+### Features
+
+* allow dis-/advantages to not contribute to maximum AP value ([9e401d0](https://github.com/elyukai/optolith-database-schema/commit/9e401d0be40797a5758220233af6c162d1ce76fb))
+
+
+### Bug Fixes
+
+* state prerequisite should have unique tag ([7710fd5](https://github.com/elyukai/optolith-database-schema/commit/7710fd538582b85cd67cb81b2f791774102d17db))
+
+### [0.2.2](https://github.com/elyukai/optolith-database-schema/compare/v0.2.1...v0.2.2) (2022-03-29)
+
+
+### Features
+
+* add offset option for deriving AP value from improvement cost ([f556207](https://github.com/elyukai/optolith-database-schema/commit/f55620751b7a68383c74ba8c4256d11802ab99c7))
+
+### [0.2.1](https://github.com/elyukai/optolith-database-schema/compare/v0.2.0...v0.2.1) (2022-03-29)
+
+
+### Bug Fixes
+
+* category names and prerequisites should be defined separately ([eb312fe](https://github.com/elyukai/optolith-database-schema/commit/eb312fe2fc9973ef6be36937ebd8af8c8bf30e60))
+
 ## [0.2.0](https://github.com/elyukai/optolith-database-schema/compare/v0.1.28...v0.2.0) (2022-03-29)
 
 

package/lib/types/Advantage.d.ts

@@ -16,7 +16,7 @@ export declare type Advantage = {
     skill_uses?: Activatable.SkillUses;
     maximum?: Activatable.Maximum;
     prerequisites?: AdvantageDisadvantagePrerequisites;
-    ap_value: Activatable.AdventurePointsValue;
+    ap_value: Activatable.AdventurePointsValueAdvantagesDisadvantages;
     /**
      * Does this advantage not count towards the maximum of AP to be spent
      * on advantages?

package/lib/types/Disadvantage.d.ts

@@ -14,7 +14,7 @@ export declare type Disadvantage = {
     select_options?: Activatable.SelectOptions;
     maximum?: Activatable.Maximum;
     prerequisites?: AdvantageDisadvantagePrerequisites;
-    ap_value: Activatable.AdventurePointsValue;
+    ap_value: Activatable.AdventurePointsValueAdvantagesDisadvantages;
     /**
      * Does this disadvantage not count towards the maximum of AP to be granted by
      * disadvantages?

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, CombatTechniqueTag, MagicalTraditionIdentifier, PatronIdentifier, SkillIdentifier, SkillWithEnhancementsTag, VolumePointsOptionReferenceIdentifier } from "./_Identifier.js";
+import { ActivatableIdentifier, AdvancedSpecialAbilityRestrictedOptionIdentifier, CombatRelatedSpecialAbilityIdentifier, CombatTechniqueIdentifier, MagicalTraditionIdentifier, PatronIdentifier, SkillIdentifier, VolumePointsOptionReferenceIdentifier } from "./_Identifier.js";
 import { GeneralPrerequisites } from "./_Prerequisite.js";
 /**
  * The activatable entry's identifier. An unique, increasing integer.
@@ -316,8 +316,13 @@ declare type CategoryOption = {
                 };
             };
         }[];
+        /**
+         * Generate prerequisites for each entry of the category.
+         * @minItems 1
+         */
+        prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
     } | {
-        tag: SkillWithEnhancementsTag;
+        tag: SkillWithEnhancementsCategory;
         /**
          * Only include (`Intersection`) or exclude (`Difference`) specific
          * entries.
@@ -343,60 +348,70 @@ declare type CategoryOption = {
                 id: number;
             }[];
         };
+        /**
+         * Generate prerequisites for each entry of the category.
+         * @minItems 1
+         */
+        prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
     })[];
     /**
-     * Generate prerequisites for each entry of the category.
-     * @minItems 1
+     * Generate AP values for each entry.
      */
-    prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
+    ap_value?: OptionSkillDeriveAdventurePointsValue<SkillIdentifier>;
+} | {
+    tag: "CombatTechniques";
     /**
-     * Generate AP values for each entry.
+     * A list of combat technique categories.
+     * @minItems 1
      */
-    ap_value?: OptionSkillDeriveAdventurePointsValue<SkillIdentifier> | {
-        tag: "CombatTechniques";
+    categories: {
+        tag: CombatTechniqueCategory;
         /**
-         * A list of combat technique categories.
-         * @minItems 1
+         * Only include (`Intersection`) or exclude (`Difference`) specific
+         * entries.
          */
-        categories: {
-            tag: CombatTechniqueTag;
+        specific?: {
+            operation: {
+                tag: "Intersection";
+            } | {
+                tag: "Difference";
+            };
             /**
-             * Only include (`Intersection`) or exclude (`Difference`) specific
-             * entries.
+             * The list of specific entries.
+             * @minItems 1
+             * @uniqueItems
              */
-            specific?: {
-                operation: {
-                    tag: "Intersection";
-                } | {
-                    tag: "Difference";
-                };
+            list: {
                 /**
-                 * The list of specific entries.
-                 * @minItems 1
-                 * @uniqueItems
+                 * The entry's identifier.
+                 * @integer
+                 * @minimum 1
+                 * @maximum 59
                  */
-                list: {
-                    /**
-                     * The entry's identifier.
-                     * @integer
-                     * @minimum 1
-                     * @maximum 59
-                     */
-                    id: number;
-                }[];
-            };
-        }[];
+                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 AP values for each entry.
+     */
+    ap_value?: OptionSkillDeriveAdventurePointsValue<CombatTechniqueIdentifier>;
 };
+declare enum SkillWithEnhancementsCategory {
+    Spells = "Spells",
+    Rituals = "Rituals",
+    LiturgicalChants = "LiturgicalChants",
+    Ceremonies = "Ceremonies"
+}
+declare enum CombatTechniqueCategory {
+    CloseCombatTechniques = "CloseCombatTechniques",
+    RangedCombatTechniques = "RangedCombatTechniques"
+}
 declare type OptionSkillSelfPrerequisite = {
     tag: "Self";
     /**
@@ -430,14 +445,27 @@ declare type OptionOptionPrerequisite = {
  * Generate AP values for each entry.
  */
 declare type OptionSkillDeriveAdventurePointsValue<Identifier> = {
+    /**
+     * Derive the cost from the improvement cost of each entry.
+     *
+     * AP Value = Improvement Cost × `multiplier` + `offset`
+     */
     tag: "DerivedFromImprovementCost";
     /**
      * This number is multiplied with the improvement cost of the entry
      * (A = 1 to D = 4).
      * @integer
      * @minimum 2
+     * @default 1
      */
     multiplier?: number;
+    /**
+     * This number is added to the maybe multiplied improvement cost of the
+     * entry.
+     * @integer
+     * @default 0
+     */
+    offset?: number;
 } | {
     tag: "Fixed";
     /**
@@ -1786,25 +1814,49 @@ export declare type AdventurePointsValue = {
      */
     values: AdventurePointsSingleValue[];
 } | {
-    tag: "ByImprovementCost";
     /**
-     * An entry with a selection of skills may have different costs for
-     * different improvement costs of the selected skill.
-     *
-     * If the select options will not have entries with improvement cost A
-     * (combat techniques only), you may leave out A.
-     */
-    values: {
-        A?: AdventurePointsSingleValue;
-        B: AdventurePointsSingleValue;
-        C: AdventurePointsSingleValue;
-        D: AdventurePointsSingleValue;
-    };
+     * Used if AP value is defined by the selected option(s) or special rules.
+     */
+    tag: "Indefinite";
+};
+export declare type AdventurePointsValueAdvantagesDisadvantages = {
+    tag: "Fixed";
+    /**
+     * A fixed adventure points value. If the entry has levels, this is the cost
+     * for each level as well.
+     */
+    value: AdventurePointsSingleValue;
+    /**
+     * The AP Value of the entry does not contribute to the AP maximum for
+     * advantages or disadvantages, so it may also be bought if the maximum has
+     * already been reached.
+     */
+    does_not_contribute_to_maximum?: true;
+} | {
+    tag: "ByLevel";
+    /**
+     * An entry with levels may have different costs for each level. The length
+     * of the list must match the amount of levels the special ability has.
+     * @minItems 2
+     */
+    values: AdventurePointsSingleValue[];
+    /**
+     * The AP Value of the entry does not contribute to the AP maximum for
+     * advantages or disadvantages, so it may also be bought if the maximum has
+     * already been reached.
+     */
+    does_not_contribute_to_maximum?: true;
 } | {
     /**
      * Used if AP value is defined by the selected option(s) or special rules.
      */
     tag: "Indefinite";
+    /**
+     * The AP Value of the entry does not contribute to the AP maximum for
+     * advantages or disadvantages, so it may also be bought if the maximum has
+     * already been reached.
+     */
+    does_not_contribute_to_maximum?: true;
 };
 /**
  * A single adventure points value.

package/lib/types/_Activatable.js

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

package/lib/types/_Identifier.d.ts

@@ -124,7 +124,7 @@ declare enum VolumePointsOptionReferenceTag {
     General = "General",
     AnimalShapeSize = "AnimalShapeSize"
 }
-export declare enum CombatTechniqueTag {
+declare enum CombatTechniqueTag {
     CloseCombatTechnique = "CloseCombatTechnique",
     RangedCombatTechnique = "RangedCombatTechnique"
 }
@@ -138,7 +138,7 @@ declare enum ExtensionRuleTag {
     FocusRule = "FocusRule",
     OptionalRule = "OptionalRule"
 }
-export declare enum SkillWithEnhancementsTag {
+declare enum SkillWithEnhancementsTag {
     Spell = "Spell",
     Ritual = "Ritual",
     LiturgicalChant = "LiturgicalChant",

package/lib/types/_Identifier.js

@@ -131,7 +131,7 @@ var VolumePointsOptionReferenceTag;
     VolumePointsOptionReferenceTag["General"] = "General";
     VolumePointsOptionReferenceTag["AnimalShapeSize"] = "AnimalShapeSize";
 })(VolumePointsOptionReferenceTag || (VolumePointsOptionReferenceTag = {}));
-export var CombatTechniqueTag;
+var CombatTechniqueTag;
 (function (CombatTechniqueTag) {
     CombatTechniqueTag["CloseCombatTechnique"] = "CloseCombatTechnique";
     CombatTechniqueTag["RangedCombatTechnique"] = "RangedCombatTechnique";
@@ -149,7 +149,7 @@ var ExtensionRuleTag;
     ExtensionRuleTag["FocusRule"] = "FocusRule";
     ExtensionRuleTag["OptionalRule"] = "OptionalRule";
 })(ExtensionRuleTag || (ExtensionRuleTag = {}));
-export var SkillWithEnhancementsTag;
+var SkillWithEnhancementsTag;
 (function (SkillWithEnhancementsTag) {
     SkillWithEnhancementsTag["Spell"] = "Spell";
     SkillWithEnhancementsTag["Ritual"] = "Ritual";
@@ -194,3 +194,4 @@ var CoreRuleDerivableContentTag;
     CoreRuleDerivableContentTag["MagicalSpecialAbility"] = "MagicalSpecialAbility";
     CoreRuleDerivableContentTag["BlessedTradition"] = "BlessedTradition";
 })(CoreRuleDerivableContentTag || (CoreRuleDerivableContentTag = {}));
+export {};

package/lib/types/prerequisites/single/StatePrerequisite.d.ts

@@ -5,7 +5,7 @@ import { DisplayOption } from "../DisplayOption.js";
  * @title State Prerequisite
  */
 export declare type StatePrerequisite = {
-    tag: "Culture";
+    tag: "State";
     id: OneOrManyNumericIdentifiers;
     display_option?: DisplayOption;
 };

package/lib/types/prerequisites/single/TextPrerequisite.d.ts

@@ -3,7 +3,7 @@
  * background information – or the referenced entities were not made available
  * for use yet – e.g. races –, but which should be displayed, because it is part
  * of the prerequisite string from the sources.
- * @title Impossible Prerequisite
+ * @title Text Prerequisite
  */
 export declare type TextPrerequisite = {
     tag: "Text";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optolith-database-schema",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "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/Advantage.schema.json

@@ -29,7 +29,7 @@
           "$ref": "./_Prerequisite.schema.json#/definitions/AdvantageDisadvantagePrerequisites"
         },
         "ap_value": {
-          "$ref": "./_Activatable.schema.json#/definitions/AdventurePointsValue"
+          "$ref": "./_Activatable.schema.json#/definitions/AdventurePointsValueAdvantagesDisadvantages"
         },
         "has_no_maximum_spent_influence": {
           "description": "Does this advantage not count towards the maximum of AP to be spent\non advantages?",

package/schema/Disadvantage.schema.json

@@ -23,7 +23,7 @@
           "$ref": "./_Prerequisite.schema.json#/definitions/AdvantageDisadvantagePrerequisites"
         },
         "ap_value": {
-          "$ref": "./_Activatable.schema.json#/definitions/AdventurePointsValue"
+          "$ref": "./_Activatable.schema.json#/definitions/AdventurePointsValueAdvantagesDisadvantages"
         },
         "has_no_maximum_spent_influence": {
           "description": "Does this disadvantage not count towards the maximum of AP to be granted by\ndisadvantages?",

package/schema/_Activatable.schema.json

@@ -527,6 +527,21 @@
                           "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
                       }
                     },
                     "required": [
@@ -538,7 +553,7 @@
                     "type": "object",
                     "properties": {
                       "tag": {
-                        "$ref": "./_Identifier.schema.json#/definitions/SkillWithEnhancementsTag"
+                        "$ref": "#/definitions/SkillWithEnhancementsCategory"
                       },
                       "specific": {
                         "description": "Only include (`Intersection`) or exclude (`Difference`) specific\nentries.",
@@ -599,6 +614,21 @@
                           "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
                       }
                     },
                     "required": [
@@ -610,252 +640,242 @@
               },
               "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": [
                 {
-                  "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": {
+                      "description": "Derive the cost from the improvement cost of each entry.\n\nAP Value = Improvement Cost × `multiplier` + `offset`",
+                      "const": "DerivedFromImprovementCost"
                     },
-                    {
-                      "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/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",
-                        "map",
-                        "default"
-                      ],
-                      "additionalProperties": false
+                    "multiplier": {
+                      "description": "This number is multiplied with the improvement cost of the entry\n(A = 1 to D = 4).",
+                      "type": "integer",
+                      "minimum": 2
+                    },
+                    "offset": {
+                      "description": "This number is added to the maybe multiplied improvement cost of the\nentry.",
+                      "type": "integer"
                     }
-                  ]
+                  },
+                  "required": [
+                    "tag"
+                  ],
+                  "additionalProperties": false
                 },
                 {
                   "type": "object",
                   "properties": {
                     "tag": {
-                      "const": "CombatTechniques"
+                      "const": "Fixed"
                     },
-                    "categories": {
-                      "description": "A list of combat technique categories.",
+                    "map": {
+                      "description": "A mapping of skill identifiers to their specific AP values.",
                       "type": "array",
                       "items": {
                         "type": "object",
                         "properties": {
-                          "tag": {
-                            "$ref": "./_Identifier.schema.json#/definitions/CombatTechniqueTag"
+                          "id": {
+                            "$ref": "./_Identifier.schema.json#/definitions/SkillIdentifier"
                           },
-                          "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
+                          "ap_value": {
+                            "description": "The AP value for the specified entry.",
+                            "type": "integer",
+                            "minimum": 1
                           }
                         },
                         "required": [
-                          "tag"
+                          "id",
+                          "ap_value"
                         ],
                         "additionalProperties": false
-                      },
-                      "minItems": 1
+                      }
                     },
-                    "prerequisites": {
-                      "description": "Generate prerequisites for each entry of the category.",
-                      "type": "array",
-                      "items": {
+                    "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
+                }
+              ]
+            }
+          },
+          "required": [
+            "tag",
+            "categories"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "tag": {
+              "const": "CombatTechniques"
+            },
+            "categories": {
+              "description": "A list of combat technique categories.",
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "tag": {
+                    "$ref": "#/definitions/CombatTechniqueCategory"
+                  },
+                  "specific": {
+                    "description": "Only include (`Intersection`) or exclude (`Difference`) specific\nentries.",
+                    "type": "object",
+                    "properties": {
+                      "operation": {
                         "oneOf": [
                           {
-                            "$ref": "#/definitions/OptionSkillSelfPrerequisite"
+                            "type": "object",
+                            "properties": {
+                              "tag": {
+                                "const": "Intersection"
+                              }
+                            },
+                            "required": [
+                              "tag"
+                            ],
+                            "additionalProperties": false
                           },
                           {
-                            "$ref": "#/definitions/OptionOptionPrerequisite"
+                            "type": "object",
+                            "properties": {
+                              "tag": {
+                                "const": "Difference"
+                              }
+                            },
+                            "required": [
+                              "tag"
+                            ],
+                            "additionalProperties": false
                           }
                         ]
                       },
-                      "minItems": 1
-                    },
-                    "ap_value": {
-                      "description": "Generate AP values for each entry.",
-                      "oneOf": [
-                        {
+                      "list": {
+                        "description": "The list of specific entries.",
+                        "type": "array",
+                        "items": {
                           "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).",
+                            "id": {
+                              "description": "The entry's identifier.",
                               "type": "integer",
-                              "minimum": 2
+                              "maximum": 59,
+                              "minimum": 1
                             }
                           },
                           "required": [
-                            "tag"
+                            "id"
                           ],
                           "additionalProperties": false
                         },
+                        "minItems": 1,
+                        "uniqueItems": true
+                      }
+                    },
+                    "required": [
+                      "operation",
+                      "list"
+                    ],
+                    "additionalProperties": false
+                  },
+                  "prerequisites": {
+                    "description": "Generate prerequisites for each entry of the category.",
+                    "type": "array",
+                    "items": {
+                      "oneOf": [
                         {
-                          "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
+                          "$ref": "#/definitions/OptionSkillSelfPrerequisite"
+                        },
+                        {
+                          "$ref": "#/definitions/OptionOptionPrerequisite"
                         }
                       ]
+                    },
+                    "minItems": 1
+                  }
+                },
+                "required": [
+                  "tag"
+                ],
+                "additionalProperties": false
+              },
+              "minItems": 1
+            },
+            "ap_value": {
+              "description": "Generate AP values for each entry.",
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "tag": {
+                      "description": "Derive the cost from the improvement cost of each entry.\n\nAP Value = Improvement Cost × `multiplier` + `offset`",
+                      "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
+                    },
+                    "offset": {
+                      "description": "This number is added to the maybe multiplied improvement cost of the\nentry.",
+                      "type": "integer"
+                    }
+                  },
+                  "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",
-                    "categories"
+                    "map",
+                    "default"
                   ],
                   "additionalProperties": false
                 }
@@ -870,6 +890,20 @@
         }
       ]
     },
+    "SkillWithEnhancementsCategory": {
+      "enum": [
+        "Spells",
+        "Rituals",
+        "LiturgicalChants",
+        "Ceremonies"
+      ]
+    },
+    "CombatTechniqueCategory": {
+      "enum": [
+        "CloseCombatTechniques",
+        "RangedCombatTechniques"
+      ]
+    },
     "OptionSkillSelfPrerequisite": {
       "type": "object",
       "properties": {
@@ -3294,31 +3328,57 @@
           "type": "object",
           "properties": {
             "tag": {
-              "const": "ByImprovementCost"
+              "description": "Used if AP value is defined by the selected option(s) or special rules.",
+              "const": "Indefinite"
+            }
+          },
+          "required": [
+            "tag"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "AdventurePointsValueAdvantagesDisadvantages": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "tag": {
+              "const": "Fixed"
+            },
+            "value": {
+              "description": "A fixed adventure points value. If the entry has levels, this is the cost\nfor each level as well.",
+              "$ref": "#/definitions/AdventurePointsSingleValue"
+            },
+            "does_not_contribute_to_maximum": {
+              "description": "The AP Value of the entry does not contribute to the AP maximum for\nadvantages or disadvantages, so it may also be bought if the maximum has\nalready been reached.",
+              "const": true
+            }
+          },
+          "required": [
+            "tag",
+            "value"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "tag": {
+              "const": "ByLevel"
             },
             "values": {
-              "description": "An entry with a selection of skills may have different costs for\ndifferent improvement costs of the selected skill.\n\nIf the select options will not have entries with improvement cost A\n(combat techniques only), you may leave out A.",
-              "type": "object",
-              "properties": {
-                "A": {
-                  "$ref": "#/definitions/AdventurePointsSingleValue"
-                },
-                "B": {
-                  "$ref": "#/definitions/AdventurePointsSingleValue"
-                },
-                "C": {
-                  "$ref": "#/definitions/AdventurePointsSingleValue"
-                },
-                "D": {
-                  "$ref": "#/definitions/AdventurePointsSingleValue"
-                }
+              "description": "An entry with levels may have different costs for each level. The length\nof the list must match the amount of levels the special ability has.",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/AdventurePointsSingleValue"
               },
-              "required": [
-                "B",
-                "C",
-                "D"
-              ],
-              "additionalProperties": false
+              "minItems": 2
+            },
+            "does_not_contribute_to_maximum": {
+              "description": "The AP Value of the entry does not contribute to the AP maximum for\nadvantages or disadvantages, so it may also be bought if the maximum has\nalready been reached.",
+              "const": true
             }
           },
           "required": [
@@ -3333,6 +3393,10 @@
             "tag": {
               "description": "Used if AP value is defined by the selected option(s) or special rules.",
               "const": "Indefinite"
+            },
+            "does_not_contribute_to_maximum": {
+              "description": "The AP Value of the entry does not contribute to the AP maximum for\nadvantages or disadvantages, so it may also be bought if the maximum has\nalready been reached.",
+              "const": true
             }
           },
           "required": [

package/schema/prerequisites/single/StatePrerequisite.schema.json

@@ -8,7 +8,7 @@
       "type": "object",
       "properties": {
         "tag": {
-          "const": "Culture"
+          "const": "State"
         },
         "id": {
           "$ref": "../../_Identifier.schema.json#/definitions/OneOrManyNumericIdentifiers"

package/schema/prerequisites/single/TextPrerequisite.schema.json

@@ -3,7 +3,7 @@
   "$id": "/prerequisites/single/TextPrerequisite.schema.json",
   "definitions": {
     "TextPrerequisite": {
-      "title": "Impossible Prerequisite",
+      "title": "Text Prerequisite",
       "description": "A prerequisite that is either not verifyable in general – e.g. roleplay or\nbackground information – or the referenced entities were not made available\nfor use yet – e.g. races –, but which should be displayed, because it is part\nof the prerequisite string from the sources.",
       "type": "object",
       "properties": {