optolith-database-schema 0.4.1 → 0.5.1

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

@@ -1,4 +1,4 @@
-import { ActivatableIdentifier, RequirableSelectOptionIdentifier } from "../../_Identifier.js";
+import { ActivatableIdentifier, RequirableSelectOptionIdentifier } from "../../_IdentifierGroup.js";
 import { Preconditions } from "../ConditionalPrerequisites.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
@@ -29,64 +29,3 @@ export declare type ActivatablePrerequisite = {
     display_option?: DisplayOption;
     when?: Preconditions;
 };
-/**
- * Requires a specific advantage, disadvantage or special ability from a given
- * set of entries.
- * @title Activatable Set Prerequisite
- */
-export declare type ActivatableSetPrerequisite = {
-    /**
-     * The possible activatable entries' identifiers.
-     * @minItems 2
-     */
-    id: ActivatableIdentifier[];
-    /**
-     * If the required entry should be required to be active or inactive.
-     */
-    active: boolean;
-    /**
-     * The required minimum level of the entry.
-     * @integer
-     * @minimum 1
-     */
-    level?: number;
-    /**
-     * Required select options. Order is important. Typically, you only need the
-     * first array index, though.
-     * @minItems 1
-     */
-    options?: RequirableSelectOptionIdentifier[];
-    display_option?: DisplayOption;
-};
-/**
- * Requires one option from a set of options from a specific advantage,
- * disadvantage or special ability.
- * @title Activatable Option Set Prerequisite
- */
-export declare type ActivatableOptionSetPrerequisite = {
-    /**
-     * The activatable entry's identifier.
-     */
-    id: ActivatableIdentifier;
-    /**
-     * If the required entry should be required to be active or inactive.
-     */
-    active: boolean;
-    /**
-     * The required minimum level of the entry.
-     * @integer
-     * @minimum 1
-     */
-    level?: number;
-    /**
-     * The possible set of first options.
-     * @minItems 2
-     */
-    first_option: RequirableSelectOptionIdentifier[];
-    /**
-     * Required other select options. Order is important.
-     * @minItems 1
-     */
-    other_options?: RequirableSelectOptionIdentifier[];
-    display_option?: DisplayOption;
-};

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

@@ -1,3 +1,4 @@
+import { AnimistPowerIdentifier } from "../../_Identifier.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * Requires a specific animist power to be on a minimum value.
@@ -6,10 +7,8 @@ import { DisplayOption } from "../DisplayOption.js";
 export declare type AnimistPowerPrerequisite = {
     /**
      * The animist power's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: AnimistPowerIdentifier;
     /**
      * The level to which the minimum value applies.
      * @integer

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

@@ -1,10 +1,13 @@
-import { OneOrManyNumericIdentifiers } from "../../_Identifier.js";
+import { CultureIdentifier } from "../../_Identifier.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * Requires a specific culture or one of a specific set of cultures.
  * @title Culture Prerequisite
  */
 export declare type CulturePrerequisite = {
-    id: OneOrManyNumericIdentifiers;
+    /**
+     * The culture's identifier.
+     */
+    id: CultureIdentifier;
     display_option?: DisplayOption;
 };

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

@@ -1,4 +1,4 @@
-import { SkillWithEnhancementsIdentifier } from "../../_Identifier.js";
+import { SkillWithEnhancementsIdentifier } from "../../_IdentifierGroup.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * Requires a specific enhancement from a skill. This should **not** be used

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

@@ -1,3 +1,4 @@
+import { InfluenceIdentifier } from "../../_Identifier.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * @title Influence Prerequisite
@@ -5,10 +6,8 @@ import { DisplayOption } from "../DisplayOption.js";
 export declare type InfluencePrerequisite = {
     /**
      * The influence's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: InfluenceIdentifier;
     /**
      * If the referenced influence must or must not be chosen.
      */

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

@@ -1,4 +1,4 @@
-import { OneOrManyNumericIdentifiers } from "../../_Identifier.js";
+import { RaceIdentifier } from "../../_Identifier.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * Requires a specific race or one of a specific set of races. You can also
@@ -7,7 +7,10 @@ import { DisplayOption } from "../DisplayOption.js";
  * @title Race Prerequisite
  */
 export declare type RacePrerequisite = {
-    id: OneOrManyNumericIdentifiers;
+    /**
+     * The race's identifier.
+     */
+    id: RaceIdentifier;
     active: boolean;
     display_option?: DisplayOption;
 };

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

@@ -1,4 +1,4 @@
-import { RatedIdentifier } from "../../_Identifier.js";
+import { RatedIdentifier } from "../../_IdentifierGroup.js";
 import { AspectReference, PropertyReference, SkillReference } from "../../_SimpleReferences.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
@@ -17,23 +17,6 @@ export declare type RatedPrerequisite = {
     value: number;
     display_option?: DisplayOption;
 };
-/**
- * @title Rated Set Prerequisite
- */
-export declare type RatedSetPrerequisite = {
-    /**
-     * The possible rated entries' identifiers.
-     * @minItems 2
-     */
-    id: RatedIdentifier[];
-    /**
-     * The required minimum value.
-     * @integer
-     * @minimum 0
-     */
-    value: number;
-    display_option?: DisplayOption;
-};
 /**
  * @title Rated Minimum Number Prerequisite
  */

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

@@ -1,4 +1,4 @@
-import { ExtensionRuleIdentifier } from "../../_Identifier.js";
+import { ExtensionRuleIdentifier } from "../../_IdentifierGroup.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * @title Rule Prerequisite

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

@@ -1,3 +1,4 @@
+import { SocialStatusIdentifier } from "../../_Identifier.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * Requires a minimum social status.
@@ -6,10 +7,7 @@ import { DisplayOption } from "../DisplayOption.js";
 export declare type SocialStatusPrerequisite = {
     /**
      * The minimum social status' identifier.
-     * @integer
-     * @minimum 2
-     * @maximum 5
      */
-    id: number;
+    id: SocialStatusIdentifier;
     display_option?: DisplayOption;
 };

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

@@ -1,10 +1,10 @@
-import { OneOrManyNumericIdentifiers } from "../../_Identifier.js";
+import { StateIdentifier } from "../../_Identifier.js";
 import { DisplayOption } from "../DisplayOption.js";
 /**
  * Requires a specific state or one of a specific set of states.
  * @title State Prerequisite
  */
 export declare type StatePrerequisite = {
-    id: OneOrManyNumericIdentifiers;
+    id: StateIdentifier;
     display_option?: DisplayOption;
 };

package/lib/types/rule/CoreRule.d.ts

@@ -3,7 +3,8 @@
  */
 import { Errata } from "../source/_Erratum.js";
 import { PublicationRefs } from "../source/_PublicationRef.js";
-import { CoreRuleDerivableContentIdentifier } from "../_Identifier.js";
+import { CoreRuleIdentifier } from "../_Identifier.js";
+import { CoreRuleDerivableContentIdentifier } from "../_IdentifierGroup.js";
 import { LocaleMap } from "../_LocaleMap.js";
 import { NonEmptyMarkdown, NonEmptyString } from "../_NonEmptyString.js";
 /**
@@ -12,10 +13,8 @@ import { NonEmptyMarkdown, NonEmptyString } from "../_NonEmptyString.js";
 export declare type CoreRule = {
     /**
      * The core rule's identifier. An unique, increasing integer.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: CoreRuleIdentifier;
     /**
      * @minItems 1
      */
@@ -56,10 +55,8 @@ export declare type ContentNode = {
 export declare type ChildNode = {
     /**
      * The nested core rule's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: CoreRuleIdentifier;
     /**
      * If the nested core rule's content should be integrated into this core rule
      * and a proper heading should be added. Otherwise create a link to a separate

package/lib/types/source/_PublicationRef.d.ts

@@ -1,6 +1,7 @@
 /**
  * @main PublicationRefs
  */
+import { PublicationIdentifier } from "../_Identifier.js";
 import { LocaleMap } from "../_LocaleMap.js";
 /**
  * The publications where you can find the entry.
@@ -17,10 +18,8 @@ export declare type PublicationRefs = PublicationRef[];
 export declare type PublicationRef = {
     /**
      * The publication's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: PublicationIdentifier;
     /**
      * All occurrences of the entry, identified by IETF language tag (BCP47).
      */

package/lib/types/specialAbility/BlessedTradition.d.ts

@@ -70,7 +70,7 @@ export declare type RestrictedBlessings = {
     three: ThreeRestrictedBlessings;
 } | {
     tag: "Six";
-    three: SixRestrictedBlessings;
+    six: SixRestrictedBlessings;
 };
 /**
  * @uniqueItems

package/lib/types/specialAbility/CombatStyleSpecialAbility.d.ts

@@ -4,6 +4,7 @@
 import { Errata } from "../source/_Erratum.js";
 import { PublicationRefs } from "../source/_PublicationRef.js";
 import * as Activatable from "../_Activatable.js";
+import { AdvancedCombatSpecialAbilityIdentifier } from "../_Identifier.js";
 import { LocaleMap } from "../_LocaleMap.js";
 import { GeneralPrerequisites } from "../_Prerequisite.js";
 /**
@@ -21,7 +22,7 @@ export declare type CombatStyleSpecialAbility = {
     skill_applications?: Activatable.SkillApplications;
     skill_uses?: Activatable.SkillUses;
     maximum?: Activatable.Maximum;
-    advanced: Activatable.AdvancedSpecialAbilities;
+    advanced: Activatable.AdvancedSpecialAbilities<AdvancedCombatSpecialAbilityIdentifier>;
     prerequisites?: GeneralPrerequisites;
     combat_techniques: Activatable.ApplicableCombatTechniques;
     ap_value: Activatable.AdventurePointsValue;

package/lib/types/specialAbility/LiturgicalStyleSpecialAbility.d.ts

@@ -4,6 +4,7 @@
 import { Errata } from "../source/_Erratum.js";
 import { PublicationRefs } from "../source/_PublicationRef.js";
 import * as Activatable from "../_Activatable.js";
+import { AdvancedKarmaSpecialAbilityIdentifier } from "../_Identifier.js";
 import { LocaleMap } from "../_LocaleMap.js";
 import { GeneralPrerequisites } from "../_Prerequisite.js";
 /**
@@ -16,7 +17,7 @@ export declare type LiturgicalStyleSpecialAbility = {
     skill_applications?: Activatable.SkillApplications;
     skill_uses?: Activatable.SkillUses;
     maximum?: Activatable.Maximum;
-    advanced: Activatable.AdvancedSpecialAbilities;
+    advanced: Activatable.AdvancedSpecialAbilities<AdvancedKarmaSpecialAbilityIdentifier>;
     prerequisites?: GeneralPrerequisites;
     ap_value: Activatable.AdventurePointsValue;
     src: PublicationRefs;

package/lib/types/specialAbility/MagicStyleSpecialAbility.d.ts

@@ -4,6 +4,7 @@
 import { Errata } from "../source/_Erratum.js";
 import { PublicationRefs } from "../source/_PublicationRef.js";
 import * as Activatable from "../_Activatable.js";
+import { AdvancedMagicalSpecialAbilityIdentifier } from "../_Identifier.js";
 import { LocaleMap } from "../_LocaleMap.js";
 import { GeneralPrerequisites } from "../_Prerequisite.js";
 /**
@@ -16,7 +17,7 @@ export declare type MagicStyleSpecialAbility = {
     skill_applications?: Activatable.SkillApplications;
     skill_uses?: Activatable.SkillUses;
     maximum?: Activatable.Maximum;
-    advanced: Activatable.AdvancedSpecialAbilities;
+    advanced: Activatable.AdvancedSpecialAbilities<AdvancedMagicalSpecialAbilityIdentifier>;
     prerequisites?: GeneralPrerequisites;
     ap_value: Activatable.AdventurePointsValue;
     src: PublicationRefs;

package/lib/types/specialAbility/MagicalTradition.d.ts

@@ -4,6 +4,7 @@
 import { Errata } from "../source/_Erratum.js";
 import { PublicationRefs } from "../source/_PublicationRef.js";
 import * as Activatable from "../_Activatable.js";
+import { AttributeIdentifier } from "../_Identifier.js";
 import { Influence } from "../_Influence.js";
 import { LocaleMap } from "../_LocaleMap.js";
 import { GeneralPrerequisites } from "../_Prerequisite.js";
@@ -83,10 +84,8 @@ export declare type MagicalTradition = {
 export declare type PrimaryAttribute = {
     /**
      * The attribute's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: AttributeIdentifier;
     /**
      * Typically, the value of the primary attribute (if one exists) is added
      * onto the base of 20 AE to get the actual AE. But sometimes, only half the

package/lib/types/specialAbility/PactGift.d.ts

@@ -4,7 +4,7 @@
 import { Errata } from "../source/_Erratum.js";
 import { PublicationRefs } from "../source/_PublicationRef.js";
 import * as Activatable from "../_Activatable.js";
-import { ActivatableIdentifier } from "../_Identifier.js";
+import { ActivatableIdentifier } from "../_IdentifierGroup.js";
 import { LocaleMap } from "../_LocaleMap.js";
 import { GeneralPrerequisites } from "../_Prerequisite.js";
 /**

package/lib/types/specialAbility/SkillStyleSpecialAbility.d.ts

@@ -4,6 +4,7 @@
 import { Errata } from "../source/_Erratum.js";
 import { PublicationRefs } from "../source/_PublicationRef.js";
 import * as Activatable from "../_Activatable.js";
+import { AdvancedSkillSpecialAbilityIdentifier } from "../_Identifier.js";
 import { LocaleMap } from "../_LocaleMap.js";
 import { GeneralPrerequisites } from "../_Prerequisite.js";
 /**
@@ -14,7 +15,7 @@ export declare type SkillStyleSpecialAbility = {
     levels?: Activatable.Levels;
     select_options?: Activatable.SelectOptions;
     maximum?: Activatable.Maximum;
-    advanced: Activatable.AdvancedSpecialAbilities;
+    advanced: Activatable.AdvancedSpecialAbilities<AdvancedSkillSpecialAbilityIdentifier>;
     prerequisites?: GeneralPrerequisites;
     ap_value: Activatable.AdventurePointsValue;
     src: PublicationRefs;

package/lib/types/specialAbility/sub/_LanguageScript.d.ts

@@ -1,11 +1,9 @@
+import { ContinentIdentifier } from "../../_Identifier.js";
 export declare type AssociatedContinent = {
     /**
      * The continent's identifier.
-     * @integer
-     * @minimum 1
-     * @maximum 3
      */
-    id: number;
+    id: ContinentIdentifier;
     /**
      * Is the language considered virtually extinct in this continent?
      */

package/lib/validation/schema.d.ts

@@ -4,13 +4,16 @@ export declare type FileNameError = {
     instancePath: string;
     message: string;
 };
-export declare type TypeValidationError = DefinedError | FileNameError;
 export declare type TypeValidationResult<T> = {
     tag: "Ok";
     value: T;
 } | {
     tag: "Error";
-    errors: TypeValidationError[];
+    errors: TypeValidationResultErrors;
+};
+export declare type TypeValidationResultErrors = {
+    fileNameError?: FileNameError;
+    schemaErrors: DefinedError[];
 };
 export declare type TypeValidator<T> = (validator: Ajv, data: unknown, filePath: string) => TypeValidationResult<T>;
 export declare type TypeValidatorOptions = {

package/lib/validation/schema.js

@@ -6,7 +6,7 @@ const fileNameError = (fileName) => ({
     instancePath: "",
     message: `the file name "${fileName}" does not match the pattern ^[1-9][0-9]*_[A-Z][a-z]*(?:-[a-zA-Z][a-z]*)\\.yml$`
 });
-const baseNamePattern = /^[1-9][0-9]*_[A-Z][a-z]*(?:-[a-zA-Z][a-z]*)\.yml$/;
+const baseNamePattern = /^[1-9][0-9]*_[A-Z][a-z]*(?:-[a-zA-Z][a-z]*)*\.yml$/;
 const changeFileExtension = (path, ext) => join(dirname(path), basename(path, extname(path)) + ext);
 const schemaIdFromSourcePath = (sourcePath) => {
     const relativePathOfType = relative(libDir, fileURLToPath(sourcePath));
@@ -22,11 +22,13 @@ export const validateSchemaCreator = (importMetaUrl, { ignoreFileNamePattern = f
             return { tag: "Ok", value: data };
         }
         else {
-            const errors = [
-                ...(validator.errors ?? []),
-                ...(!correctFileName ? [fileNameError(fileName)] : [])
-            ];
-            return { tag: "Error", errors };
+            return {
+                tag: "Error",
+                errors: {
+                    fileNameError: correctFileName ? undefined : fileNameError(fileName),
+                    schemaErrors: validator.errors ?? [],
+                }
+            };
         }
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optolith-database-schema",
-  "version": "0.4.1",
+  "version": "0.5.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",
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@types/node": "^18.0.0",
-    "optolith-tsjsonschemamd": "^0.5.16",
+    "optolith-tsjsonschemamd": "^0.5.19",
     "standard-version": "^9.5.0",
     "typescript": "^4.7.4"
   },

package/schema/Cantrip.schema.json

@@ -169,8 +169,7 @@
       "properties": {
         "id": {
           "description": "The magical tradition's identifier.",
-          "type": "integer",
-          "minimum": 1
+          "$ref": "./_Identifier.schema.json#/$defs/MagicalTraditionIdentifier"
         },
         "translations": {
           "description": "All translations for the entry, identified by IETF language tag (BCP47).",

package/schema/Culture.schema.json

@@ -48,7 +48,18 @@
           "description": "A list of common advantages.",
           "type": "array",
           "items": {
-            "$ref": "./_CommonnessRatedAdvantageDisadvantage.schema.json#/$defs/CommonnessRatedAdvantageDisadvantage"
+            "title": "Commonness-rated Advantage/Disadvantage",
+            "description": "Reference to a commonness-rated advantage or disadvantage. Commonness-rating terms used in the source books are strongly recommended, common, uncommon, suggested and unsuitable.",
+            "type": "object",
+            "properties": {
+              "id": {
+                "$ref": "./_Identifier.schema.json#/$defs/AdvantageIdentifier"
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
           },
           "minItems": 1
         },
@@ -56,7 +67,18 @@
           "description": "A list of common disadvantages.",
           "type": "array",
           "items": {
-            "$ref": "./_CommonnessRatedAdvantageDisadvantage.schema.json#/$defs/CommonnessRatedAdvantageDisadvantage"
+            "title": "Commonness-rated Advantage/Disadvantage",
+            "description": "Reference to a commonness-rated advantage or disadvantage. Commonness-rating terms used in the source books are strongly recommended, common, uncommon, suggested and unsuitable.",
+            "type": "object",
+            "properties": {
+              "id": {
+                "$ref": "./_Identifier.schema.json#/$defs/DisadvantageIdentifier"
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
           },
           "minItems": 1
         },
@@ -64,7 +86,18 @@
           "description": "A list of uncommon advantages.",
           "type": "array",
           "items": {
-            "$ref": "./_CommonnessRatedAdvantageDisadvantage.schema.json#/$defs/CommonnessRatedAdvantageDisadvantage"
+            "title": "Commonness-rated Advantage/Disadvantage",
+            "description": "Reference to a commonness-rated advantage or disadvantage. Commonness-rating terms used in the source books are strongly recommended, common, uncommon, suggested and unsuitable.",
+            "type": "object",
+            "properties": {
+              "id": {
+                "$ref": "./_Identifier.schema.json#/$defs/AdvantageIdentifier"
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
           },
           "minItems": 1
         },
@@ -72,7 +105,18 @@
           "description": "A list of uncommon disadvantages.",
           "type": "array",
           "items": {
-            "$ref": "./_CommonnessRatedAdvantageDisadvantage.schema.json#/$defs/CommonnessRatedAdvantageDisadvantage"
+            "title": "Commonness-rated Advantage/Disadvantage",
+            "description": "Reference to a commonness-rated advantage or disadvantage. Commonness-rating terms used in the source books are strongly recommended, common, uncommon, suggested and unsuitable.",
+            "type": "object",
+            "properties": {
+              "id": {
+                "$ref": "./_Identifier.schema.json#/$defs/DisadvantageIdentifier"
+              }
+            },
+            "required": [
+              "id"
+            ],
+            "additionalProperties": false
           },
           "minItems": 1
         },
@@ -168,8 +212,7 @@
       "properties": {
         "id": {
           "description": "The profession's identifier.",
-          "type": "integer",
-          "minimum": 1
+          "$ref": "./_Identifier.schema.json#/$defs/ProfessionIdentifier"
         },
         "weighted_variants": {
           "description": "Some professions or profession variants are more common than others. There\nmay be cultures where some professions or profession variants are not\nrepresented at all.",
@@ -217,8 +260,7 @@
       "properties": {
         "id": {
           "description": "The magical tradition's identifier.",
-          "type": "integer",
-          "minimum": 1
+          "$ref": "./_Identifier.schema.json#/$defs/MagicalTraditionIdentifier"
         },
         "weighted_professions": {
           "description": "Some professions or profession variants are more common than others. There\nmay be cultures where some professions or profession variants are not\nrepresented at all.",
@@ -510,8 +552,7 @@
       "properties": {
         "id": {
           "description": "The skill's identifier.",
-          "type": "integer",
-          "minimum": 1
+          "$ref": "./_Identifier.schema.json#/$defs/SkillIdentifier"
         },
         "points": {
           "description": "The skill points for the respective skill you get for buying the cultural\npackage.",

package/schema/Lessons_Curriculum.schema.json

@@ -129,7 +129,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "./_Identifier.schema.json#/$defs/SpellworkIdentifier"
+          "$ref": "./_IdentifierGroup.schema.json#/$defs/SpellworkIdentifier"
         },
         "restriction": {
           "description": "The elective spellwork may only take effect if a certain condition is met.\nThe condition may be related to professions or profession variants, but it\nis designed so that it can work without a specific profession, as multiple\nmay belong to an institute, but with referencing other entities instead.",
@@ -150,9 +150,7 @@
         },
         "id": {
           "description": "The element's identifier.",
-          "type": "integer",
-          "maximum": 6,
-          "minimum": 1
+          "$ref": "./_Identifier.schema.json#/$defs/ElementIdentifier"
         }
       },
       "required": [
@@ -195,7 +193,7 @@
               "const": "Spellwork"
             },
             "spellwork": {
-              "$ref": "./_Identifier.schema.json#/$defs/SpellworkIdentifier"
+              "$ref": "./_IdentifierGroup.schema.json#/$defs/SpellworkIdentifier"
             }
           },
           "required": [
@@ -268,14 +266,13 @@
       "properties": {
         "id": {
           "description": "The identifier of the property that spellworks are disallowed from.",
-          "type": "integer",
-          "minimum": 1
+          "$ref": "./_Identifier.schema.json#/$defs/PropertyIdentifier"
         },
         "exclude": {
           "description": "Exclude specific spellworks from the restriction.",
           "type": "array",
           "items": {
-            "$ref": "./_Identifier.schema.json#/$defs/SpellworkIdentifier"
+            "$ref": "./_IdentifierGroup.schema.json#/$defs/SpellworkIdentifier"
           },
           "minItems": 1
         },
@@ -435,7 +432,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "./_Identifier.schema.json#/$defs/CombatTechniqueIdentifier"
+          "$ref": "./_IdentifierGroup.schema.json#/$defs/CombatTechniqueIdentifier"
         },
         "points": {
           "description": "The combat technique points that will be added to the current combat\ntechnique rating.",
@@ -455,8 +452,7 @@
       "properties": {
         "id": {
           "description": "The skill's identifier.",
-          "type": "integer",
-          "minimum": 1
+          "$ref": "./_Identifier.schema.json#/$defs/SkillIdentifier"
         },
         "points": {
           "description": "The skill points that will be added to the current skill rating.",
@@ -475,7 +471,7 @@
       "type": "object",
       "properties": {
         "id": {
-          "$ref": "./_Identifier.schema.json#/$defs/SpellworkIdentifier"
+          "$ref": "./_IdentifierGroup.schema.json#/$defs/SpellworkIdentifier"
         },
         "points": {
           "description": "The skill points that will be added to the current skill rating. If a\nspell gets to a skill rating of 0 because of this, it will be removed\ncompletely.",