optolith-database-schema 0.2.4 → 0.4.1

package/schema/Patron.schema.json

@@ -1,8 +1,8 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "/Patron.schema.json",
-  "$ref": "#/definitions/Patron",
-  "definitions": {
+  "$ref": "#/$defs/Patron",
+  "$defs": {
     "Patron": {
       "title": "Patron",
       "type": "object",
@@ -12,23 +12,22 @@
           "type": "integer",
           "minimum": 1
         },
-        "category_id": {
-          "description": "The patron's category identifier.",
-          "type": "integer",
-          "minimum": 1
+        "category": {
+          "description": "The patron's category.",
+          "$ref": "./_SimpleReferences.schema.json#/$defs/PatronCategoryReference"
         },
         "skills": {
           "description": "The patron-specific skills.",
           "type": "array",
           "items": [
             {
-              "$ref": "#/definitions/SkillReference"
+              "$ref": "./_SimpleReferences.schema.json#/$defs/SkillReference"
             },
             {
-              "$ref": "#/definitions/SkillReference"
+              "$ref": "./_SimpleReferences.schema.json#/$defs/SkillReference"
             },
             {
-              "$ref": "#/definitions/SkillReference"
+              "$ref": "./_SimpleReferences.schema.json#/$defs/SkillReference"
             }
           ],
           "minItems": 3,
@@ -37,99 +36,14 @@
         },
         "culture": {
           "description": "The patron is only available to a certain set of cultures. It may be\navailable to all, it may be available to only specific ones (intersection)\nand it may be available to all except specific ones to the listed cultures\n(difference).",
-          "oneOf": [
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "All"
-                }
-              },
-              "required": [
-                "tag"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "Intersection"
-                },
-                "list": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "id": {
-                        "description": "The culture's identifier.",
-                        "type": "integer",
-                        "minimum": 1
-                      }
-                    },
-                    "required": [
-                      "id"
-                    ],
-                    "additionalProperties": false
-                  }
-                }
-              },
-              "required": [
-                "tag",
-                "list"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "Difference"
-                },
-                "list": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "id": {
-                        "description": "The culture's identifier.",
-                        "type": "integer",
-                        "minimum": 1
-                      }
-                    },
-                    "required": [
-                      "id"
-                    ],
-                    "additionalProperties": false
-                  }
-                }
-              },
-              "required": [
-                "tag",
-                "list"
-              ],
-              "additionalProperties": false
-            }
-          ]
+          "$ref": "#/$defs/PatronCulture"
         },
         "primary_patron_cultures": {
           "description": "The list of cultures where patrons from this category can be the primary\npatron of.",
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "id": {
-                "description": "The culture's identifier.",
-                "type": "integer",
-                "minimum": 1
-              }
-            },
-            "required": [
-              "id"
-            ],
-            "additionalProperties": false
+            "$ref": "./_SimpleReferences.schema.json#/$defs/CultureReference"
           },
-          "minItems": 1,
           "uniqueItems": true
         },
         "powers": {
@@ -137,13 +51,13 @@
           "type": "array",
           "items": [
             {
-              "$ref": "#/definitions/AnimalPowersLevel1"
+              "$ref": "#/$defs/AnimalPowersLevel1"
             },
             {
-              "$ref": "#/definitions/AnimalPowersLevel2"
+              "$ref": "#/$defs/AnimalPowersLevel2"
             },
             {
-              "$ref": "#/definitions/AnimalPowersLevel3"
+              "$ref": "#/$defs/AnimalPowersLevel3"
             }
           ],
           "minItems": 3,
@@ -158,25 +72,14 @@
         },
         "improvement_cost": {
           "description": "The patron-specific improvement cost. Used by several animist forces for\nanimal patrons.",
-          "$ref": "./_ImprovementCost.schema.json#/definitions/ImprovementCost"
+          "$ref": "./_ImprovementCost.schema.json#/$defs/ImprovementCost"
         },
         "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": {
-                "name": {
-                  "description": "The name of the patron.",
-                  "type": "string",
-                  "minLength": 1
-                }
-              },
-              "required": [
-                "name"
-              ],
-              "additionalProperties": false
+              "$ref": "#/$defs/PatronTranslation"
             }
           },
           "minProperties": 1,
@@ -185,18 +88,68 @@
       },
       "required": [
         "id",
-        "category_id",
+        "category",
         "skills",
         "culture",
         "translations"
       ],
       "additionalProperties": false
     },
-    "SkillReference": {
+    "PatronTranslation": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "The name of the patron.",
+          "$ref": "./_NonEmptyString.schema.json#/$defs/NonEmptyString"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
+    "PatronCulture": {
+      "description": "The patron cultures the patron is or is not part of. If the patron is part of\nall patron cultures, the set should be empty and the operation should be\ndifference.",
+      "type": "object",
+      "properties": {
+        "set": {
+          "type": "array",
+          "items": {
+            "$ref": "./_SimpleReferences.schema.json#/$defs/CultureReference"
+          }
+        },
+        "operation": {
+          "$ref": "#/$defs/PatronCultureOperation"
+        }
+      },
+      "required": [
+        "set",
+        "operation"
+      ],
+      "additionalProperties": false
+    },
+    "PatronCultureOperation": {
+      "description": "The set operation to combine the set of all patron cultures with the\nspecified set of patron cultures: If they should intersect, the patron is\nonly part of the given cultures. If they should differ, the patron is only\npart of the cultures that are not given.",
+      "enum": [
+        "Intersection",
+        "Difference"
+      ]
+    },
+    "AdvantageAnimalPower": {
       "type": "object",
       "properties": {
         "id": {
-          "description": "The skill's identifier.",
+          "description": "The advantage's identifier.",
+          "type": "integer",
+          "minimum": 1
+        },
+        "level": {
+          "description": "It grants a higher level of the advantage.",
+          "type": "integer",
+          "minimum": 2
+        },
+        "option": {
+          "description": "It grants a specific general option of the advantage.",
           "type": "integer",
           "minimum": 1
         }
@@ -206,6 +159,26 @@
       ],
       "additionalProperties": false
     },
+    "SkillAnimalPower": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "The skill's identifier.",
+          "type": "integer",
+          "minimum": 1
+        },
+        "points": {
+          "description": "The points that gets added to the skill's rating.",
+          "type": "integer",
+          "minimum": 1
+        }
+      },
+      "required": [
+        "id",
+        "points"
+      ],
+      "additionalProperties": false
+    },
     "AnimalPowerLevel1": {
       "oneOf": [
         {
@@ -214,25 +187,13 @@
             "tag": {
               "const": "Advantage"
             },
-            "id": {
-              "description": "The advantage's identifier.",
-              "type": "integer",
-              "minimum": 1
-            },
-            "level": {
-              "description": "It grants a higher level of the advantage.",
-              "type": "integer",
-              "minimum": 2
-            },
-            "option": {
-              "description": "It grants a specific general option of the advantage.",
-              "type": "integer",
-              "minimum": 1
+            "advantage": {
+              "$ref": "#/$defs/AdvantageAnimalPower"
             }
           },
           "required": [
             "tag",
-            "id"
+            "advantage"
           ],
           "additionalProperties": false
         },
@@ -242,21 +203,13 @@
             "tag": {
               "const": "Skill"
             },
-            "id": {
-              "description": "The skill's identifier.",
-              "type": "integer",
-              "minimum": 1
-            },
-            "points": {
-              "description": "The points that gets added to the skill's rating.",
-              "type": "integer",
-              "minimum": 1
+            "skill": {
+              "$ref": "#/$defs/SkillAnimalPower"
             }
           },
           "required": [
             "tag",
-            "id",
-            "points"
+            "skill"
           ],
           "additionalProperties": false
         }
@@ -265,92 +218,16 @@
     "AnimalPowersLevel1": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/AnimalPowerLevel1"
+        "$ref": "#/$defs/AnimalPowerLevel1"
       },
       "minItems": 1
     },
-    "AnimalPowerLevel2": {
+    "CombatAnimalPower": {
       "type": "object",
       "properties": {
-        "tag": {
-          "const": "Combat"
-        },
         "id": {
           "description": "The combat value.",
-          "oneOf": [
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "Attack"
-                }
-              },
-              "required": [
-                "tag"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "Parry"
-                }
-              },
-              "required": [
-                "tag"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "RangedCombat"
-                }
-              },
-              "required": [
-                "tag"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "Dodge"
-                }
-              },
-              "required": [
-                "tag"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "DamagePoints"
-                }
-              },
-              "required": [
-                "tag"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "tag": {
-                  "const": "Protection"
-                }
-              },
-              "required": [
-                "tag"
-              ],
-              "additionalProperties": false
-            }
-          ]
+          "$ref": "#/$defs/CombatAnimalPowerType"
         },
         "value": {
           "description": "The value that gets added to the combat value.",
@@ -359,25 +236,51 @@
         }
       },
       "required": [
-        "tag",
         "id",
         "value"
       ],
       "additionalProperties": false
     },
+    "CombatAnimalPowerType": {
+      "enum": [
+        "Attack",
+        "Parry",
+        "RangedCombat",
+        "Dodge",
+        "DamagePoints",
+        "Protection"
+      ]
+    },
+    "AnimalPowerLevel2": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "tag": {
+              "const": "Combat"
+            },
+            "combat": {
+              "$ref": "#/$defs/CombatAnimalPower"
+            }
+          },
+          "required": [
+            "tag",
+            "combat"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
     "AnimalPowersLevel2": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/AnimalPowerLevel2"
+        "$ref": "#/$defs/AnimalPowerLevel2"
       },
       "minItems": 1
     },
-    "AnimalPowerLevel3": {
+    "AttributeAnimalPower": {
       "type": "object",
       "properties": {
-        "tag": {
-          "const": "Attribute"
-        },
         "id": {
           "description": "The attribute's identifier.",
           "type": "integer",
@@ -390,16 +293,35 @@
         }
       },
       "required": [
-        "tag",
         "id",
         "value"
       ],
       "additionalProperties": false
     },
+    "AnimalPowerLevel3": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "tag": {
+              "const": "Attribute"
+            },
+            "attribute": {
+              "$ref": "#/$defs/AttributeAnimalPower"
+            }
+          },
+          "required": [
+            "tag",
+            "attribute"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
     "AnimalPowersLevel3": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/AnimalPowerLevel3"
+        "$ref": "#/$defs/AnimalPowerLevel3"
       },
       "minItems": 1
     }

package/schema/PatronCategory.schema.json

@@ -1,8 +1,8 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "/PatronCategory.schema.json",
-  "$ref": "#/definitions/PatronCategory",
-  "definitions": {
+  "$ref": "#/$defs/PatronCategory",
+  "$defs": {
     "PatronCategory": {
       "title": "Patron Category",
       "type": "object",
@@ -16,18 +16,7 @@
           "description": "The list of cultures where patrons from this category can be the primary\npatron of.",
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "id": {
-                "description": "The culture's identifier.",
-                "type": "integer",
-                "minimum": 1
-              }
-            },
-            "required": [
-              "id"
-            ],
-            "additionalProperties": false
+            "$ref": "./_SimpleReferences.schema.json#/$defs/CultureReference"
           },
           "minItems": 1,
           "uniqueItems": true
@@ -37,18 +26,7 @@
           "type": "object",
           "patternProperties": {
             "^[a-z]{2}-[A-Z]{2}$": {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "description": "The name of the patron category.",
-                  "type": "string",
-                  "minLength": 1
-                }
-              },
-              "required": [
-                "name"
-              ],
-              "additionalProperties": false
+              "$ref": "#/$defs/PatronCategoryTranslation"
             }
           },
           "minProperties": 1,
@@ -61,6 +39,19 @@
         "translations"
       ],
       "additionalProperties": false
+    },
+    "PatronCategoryTranslation": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "The name of the patron category.",
+          "$ref": "./_NonEmptyString.schema.json#/$defs/NonEmptyString"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
     }
   }
 }