optolith-database-schema 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.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/_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,12 +348,12 @@ 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
-     */
-    prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
     /**
      * Generate AP values for each entry.
      */
@@ -359,7 +364,7 @@ declare type CategoryOption = {
          * @minItems 1
          */
         categories: {
-            tag: CombatTechniqueTag;
+            tag: CombatTechniqueCategory;
             /**
              * Only include (`Intersection`) or exclude (`Difference`) specific
              * entries.
@@ -385,18 +390,28 @@ 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
-         */
-        prerequisites?: (OptionSkillSelfPrerequisite | OptionOptionPrerequisite)[];
         /**
          * 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";
     /**

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optolith-database-schema",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "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

@@ -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,21 +640,6 @@
               },
               "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": [
@@ -704,7 +719,7 @@
                         "type": "object",
                         "properties": {
                           "tag": {
-                            "$ref": "./_Identifier.schema.json#/definitions/CombatTechniqueTag"
+                            "$ref": "#/definitions/CombatTechniqueCategory"
                           },
                           "specific": {
                             "description": "Only include (`Intersection`) or exclude (`Difference`) specific\nentries.",
@@ -765,6 +780,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": [
@@ -774,21 +804,6 @@
                       },
                       "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": [
@@ -870,6 +885,20 @@
         }
       ]
     },
+    "SkillWithEnhancementsCategory": {
+      "enum": [
+        "spells",
+        "Rituals",
+        "LiturgicalChants",
+        "Ceremonies"
+      ]
+    },
+    "CombatTechniqueCategory": {
+      "enum": [
+        "CloseCombatTechniques",
+        "RangedCombatTechniques"
+      ]
+    },
     "OptionSkillSelfPrerequisite": {
       "type": "object",
       "properties": {