optolith-database-schema 0.2.1 → 0.2.4

package/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 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.4](https://github.com/elyukai/optolith-database-schema/compare/v0.2.3...v0.2.4) (2022-03-30)
+
+
+### Features
+
+* add actions as duration unit ([5e64e38](https://github.com/elyukai/optolith-database-schema/commit/5e64e38dbbcda2980bb70a2b1c1b8d01b3a31324))
+* add cantrips as target category ([ac4cf38](https://github.com/elyukai/optolith-database-schema/commit/ac4cf380bc96ea20c214938fd96eca1af28b3952))
+* add notes to tradition notes of cantrips ([7b37327](https://github.com/elyukai/optolith-database-schema/commit/7b373271312324064b0bac824511248d07f4ffbe))
+* guild mages tradition can be noted as common for in general ([df175d1](https://github.com/elyukai/optolith-database-schema/commit/df175d1f523fb9f09c0e672b4bc71437763f34b1))
+* remove compressed paramater description option ([7897b72](https://github.com/elyukai/optolith-database-schema/commit/7897b723258d97c1c71dcfef422821657c8efea2))
+
+
+### Bug Fixes
+
+* compressed name should be optional ([7281f6a](https://github.com/elyukai/optolith-database-schema/commit/7281f6ae055588511dfdb4ebc186f5e492e823c8))
+* cost needs to be required ([05fd208](https://github.com/elyukai/optolith-database-schema/commit/05fd2086642ee8781f1a33021f98333685234b50))
+
+### [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)
 
 

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/Blessing.d.ts

@@ -103,20 +103,9 @@ declare type PerformanceParameters = {
             [localeId: string]: {
                 /**
                  * A description of the duration.
+                 * @minLength 1
                  */
-                description: {
-                    /**
-                     * The full description of the duration.
-                     * @minLength 1
-                     */
-                    default: string;
-                    /**
-                     * A compressed description of the duration for use in small areas
-                     * (e.g. on character sheet).
-                     * @minLength 1
-                     */
-                    compressed: string;
-                };
+                description: string;
             };
         };
     };

package/lib/types/Cantrip.d.ts

@@ -188,9 +188,25 @@ export declare type CommonNote = {
     /**
      * The magical tradition's identifier.
      * @integer
-     * @minimum 2
+     * @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]: {
+            /**
+             * A note, appended to the generated string in parenthesis.
+             * @minLength 1
+             */
+            note: string;
+        };
+    };
 };
 export declare const validateSchema: import("../validation/schema.js").TypeValidator<Cantrip>;
 export {};

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

@@ -357,53 +357,53 @@ declare type CategoryOption = {
     /**
      * Generate AP values for each entry.
      */
-    ap_value?: OptionSkillDeriveAdventurePointsValue<SkillIdentifier> | {
-        tag: "CombatTechniques";
+    ap_value?: OptionSkillDeriveAdventurePointsValue<SkillIdentifier>;
+} | {
+    tag: "CombatTechniques";
+    /**
+     * A list of combat technique categories.
+     * @minItems 1
+     */
+    categories: {
+        tag: CombatTechniqueCategory;
         /**
-         * A list of combat technique categories.
-         * @minItems 1
+         * Only include (`Intersection`) or exclude (`Difference`) specific
+         * entries.
          */
-        categories: {
-            tag: CombatTechniqueCategory;
-            /**
-             * Only include (`Intersection`) or exclude (`Difference`) specific
-             * entries.
-             */
-            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;
-                }[];
+        specific?: {
+            operation: {
+                tag: "Intersection";
+            } | {
+                tag: "Difference";
             };
             /**
-             * Generate prerequisites for each entry of the category.
+             * The list of specific entries.
              * @minItems 1
+             * @uniqueItems
              */
-            prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
-        }[];
+            list: {
+                /**
+                 * The entry's identifier.
+                 * @integer
+                 * @minimum 1
+                 * @maximum 59
+                 */
+                id: number;
+            }[];
+        };
         /**
-         * Generate AP values for each entry.
+         * Generate prerequisites for each entry of the category.
+         * @minItems 1
          */
-        ap_value?: OptionSkillDeriveAdventurePointsValue<CombatTechniqueIdentifier>;
-    };
+        prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
+    }[];
+    /**
+     * Generate AP values for each entry.
+     */
+    ap_value?: OptionSkillDeriveAdventurePointsValue<CombatTechniqueIdentifier>;
 };
 declare enum SkillWithEnhancementsCategory {
-    spells = "spells",
+    Spells = "Spells",
     Rituals = "Rituals",
     LiturgicalChants = "LiturgicalChants",
     Ceremonies = "Ceremonies"
@@ -445,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";
     /**
@@ -1801,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

@@ -4,7 +4,7 @@
  */
 var SkillWithEnhancementsCategory;
 (function (SkillWithEnhancementsCategory) {
-    SkillWithEnhancementsCategory["spells"] = "spells";
+    SkillWithEnhancementsCategory["Spells"] = "Spells";
     SkillWithEnhancementsCategory["Rituals"] = "Rituals";
     SkillWithEnhancementsCategory["LiturgicalChants"] = "LiturgicalChants";
     SkillWithEnhancementsCategory["Ceremonies"] = "Ceremonies";

package/lib/types/_ActivatableSkill.d.ts

@@ -963,6 +963,7 @@ export declare namespace Duration {
         Months = "Months",
         Years = "Years",
         Centuries = "Centuries",
+        Actions = "Actions",
         CombatRounds = "CombatRounds"
     }
     type UnitValue = {
@@ -1012,6 +1013,8 @@ export declare namespace TargetCategory {
         tag: "Zone";
     } | {
         tag: "LiturgicalChantsAndCeremonies";
+    } | {
+        tag: "Cantrips";
     } | {
         tag: "Predefined";
         /**

package/lib/types/_ActivatableSkill.js

@@ -29,6 +29,7 @@ export var Duration;
         Unit["Months"] = "Months";
         Unit["Years"] = "Years";
         Unit["Centuries"] = "Centuries";
+        Unit["Actions"] = "Actions";
         Unit["CombatRounds"] = "CombatRounds";
     })(Unit = Duration.Unit || (Duration.Unit = {}));
 })(Duration || (Duration = {}));

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/lib/types/specialAbility/BlessedTradition.d.ts

@@ -147,7 +147,7 @@ export declare type BlessedTradition = {
              * descriptions.
              * @minLength 1
              */
-            name_compressed: string;
+            name_compressed?: string;
             name_in_library?: Activatable.NameInLibrary;
             /**
              * The special rules of the tradition. They should be sorted like they are

package/lib/types/traditionArtifacts/AttireEnchantment.d.ts

@@ -15,7 +15,7 @@ export declare type AttireEnchantment = {
     maximum?: Activatable.Maximum;
     prerequisites?: GeneralPrerequisites;
     volume: Activatable.Volume;
-    cost?: Activatable.EnchantmentCost;
+    cost: Activatable.EnchantmentCost;
     property: Activatable.Property;
     ap_value: Activatable.AdventurePointsValue;
     src: PublicationRefs;

package/package.json

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

@@ -178,24 +178,8 @@
                       "properties": {
                         "description": {
                           "description": "A description of the duration.",
-                          "type": "object",
-                          "properties": {
-                            "default": {
-                              "description": "The full description of the duration.",
-                              "type": "string",
-                              "minLength": 1
-                            },
-                            "compressed": {
-                              "description": "A compressed description of the duration for use in small areas\n(e.g. on character sheet).",
-                              "type": "string",
-                              "minLength": 1
-                            }
-                          },
-                          "required": [
-                            "default",
-                            "compressed"
-                          ],
-                          "additionalProperties": false
+                          "type": "string",
+                          "minLength": 1
                         }
                       },
                       "required": [

package/schema/Cantrip.schema.json

@@ -347,7 +347,29 @@
             "id": {
               "description": "The magical tradition's identifier.",
               "type": "integer",
-              "minimum": 2
+              "minimum": 1
+            },
+            "translations": {
+              "description": "All translations for the entry, identified by IETF language tag (BCP47).",
+              "type": "object",
+              "patternProperties": {
+                "^[a-z]{2}-[A-Z]{2}$": {
+                  "type": "object",
+                  "properties": {
+                    "note": {
+                      "description": "A note, appended to the generated string in parenthesis.",
+                      "type": "string",
+                      "minLength": 1
+                    }
+                  },
+                  "required": [
+                    "note"
+                  ],
+                  "additionalProperties": false
+                }
+              },
+              "minProperties": 1,
+              "additionalProperties": false
             }
           },
           "required": [

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

@@ -644,233 +644,238 @@
               "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": "#/definitions/CombatTechniqueCategory"
+                          "id": {
+                            "$ref": "./_Identifier.schema.json#/definitions/SkillIdentifier"
                           },
-                          "specific": {
-                            "description": "Only include (`Intersection`) or exclude (`Difference`) specific\nentries.",
+                          "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
+                }
+              ]
+            }
+          },
+          "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": [
+                          {
                             "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
+                              "tag": {
+                                "const": "Intersection"
                               }
                             },
                             "required": [
-                              "operation",
-                              "list"
+                              "tag"
                             ],
                             "additionalProperties": false
                           },
-                          "prerequisites": {
-                            "description": "Generate prerequisites for each entry of the category.",
-                            "type": "array",
-                            "items": {
-                              "oneOf": [
-                                {
-                                  "$ref": "#/definitions/OptionSkillSelfPrerequisite"
-                                },
-                                {
-                                  "$ref": "#/definitions/OptionOptionPrerequisite"
-                                }
-                              ]
+                          {
+                            "type": "object",
+                            "properties": {
+                              "tag": {
+                                "const": "Difference"
+                              }
                             },
-                            "minItems": 1
+                            "required": [
+                              "tag"
+                            ],
+                            "additionalProperties": false
                           }
-                        },
-                        "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": [
+                        {
+                          "$ref": "#/definitions/OptionSkillSelfPrerequisite"
+                        },
                         {
-                          "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/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
                 }
@@ -887,7 +892,7 @@
     },
     "SkillWithEnhancementsCategory": {
       "enum": [
-        "spells",
+        "Spells",
         "Rituals",
         "LiturgicalChants",
         "Ceremonies"
@@ -3323,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": [
@@ -3362,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/_ActivatableSkill.schema.json

@@ -1600,6 +1600,7 @@
           "Months",
           "Years",
           "Centuries",
+          "Actions",
           "CombatRounds"
         ]
       },
@@ -1729,6 +1730,18 @@
             ],
             "additionalProperties": false
           },
+          {
+            "type": "object",
+            "properties": {
+              "tag": {
+                "const": "Cantrips"
+              }
+            },
+            "required": [
+              "tag"
+            ],
+            "additionalProperties": false
+          },
           {
             "type": "object",
             "properties": {

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": {

package/schema/specialAbility/BlessedTradition.schema.json

@@ -282,7 +282,6 @@
               },
               "required": [
                 "name",
-                "name_compressed",
                 "special_rules"
               ],
               "additionalProperties": false

package/schema/traditionArtifacts/AttireEnchantment.schema.json

@@ -81,6 +81,7 @@
       "required": [
         "id",
         "volume",
+        "cost",
         "property",
         "ap_value",
         "src",