Процессор божеств

Pf2eModel/Model/Structure/Deity.cs

@@ -30,56 +30,70 @@ public class Deity : IEntity
     /// </summary>
     [Column(Order = 2)]
     [Comment("Тип божества")]
-    public DeityCategory Category { get; set; }
+    public DeityType Type { get; set; }
+
+    /// <summary>
+    /// Категория божества.
+    /// </summary>
+    [Column(Order = 3)]
+    [Comment("Категория божества")]
+    public string Category { get; set; } = null!;
 
     /// <summary>
     /// Тип божественный силы.
     /// </summary>
-    [Column(Order = 3)]
+    [Column(Order = 4)]
     [Comment("Тип божественной силы")]
     public DeityFonts Fonts { get; set; }
 
     /// <summary>
     /// Тип освящения.
     /// </summary>
-    [Column(Order = 4)]
+    [Column(Order = 5)]
     [Comment("Тип освящения")]
     public DeitySanctification Sanctification { get; set; }
 
     /// <summary>
     /// Обязательное освящение.
     /// </summary>
-    [Column(Order = 5)]
+    [Column(Order = 6)]
     [Comment("Обязательное освящение")]
     public bool SanctificationMust { get; set; }
 
     /// <summary>
     /// Заветы божества.
     /// </summary>
-    [Column(Order = 6)]
+    [Column(Order = 7)]
     [Comment("Заветы божества")]
-    public LocaleString Edicts { get; set; } = null!;
+    public LocaleString Edicts { get; set; } = [];
 
     /// <summary>
     /// Анафемы божества.
     /// </summary>
-    [Column(Order = 7)]
+    [Column(Order = 8)]
     [Comment("Анафемы божества")]
-    public LocaleString Anathema { get; set; } = null!;
+    public LocaleString Anathema { get; set; } = [];
 
     /// <summary>
     /// Религиозный символ божества.
     /// </summary>
-    [Column(Order = 8)]
+    [Column(Order = 9)]
     [Comment("Религиозный символ божества")]
-    public LocaleString ReligiousSymbol { get; set; } = null!;
+    public LocaleString ReligiousSymbol { get; set; } = [];
 
     /// <summary>
     /// Священное животное божества.
     /// </summary>
-    [Column(Order = 9)]
+    [Column(Order = 10)]
     [Comment("Священное животное божества")]
-    public LocaleString SacredAnimal { get; set; } = null!;
+    public LocaleString SacredAnimal { get; set; } = [];
+
+    /// <summary>
+    /// Область покровительства божества.
+    /// </summary>
+    [Column(Order = 11)]
+    [Comment("Область покровительства божества")]
+    public LocaleString AreaOfConcern { get; set; } = [];
 
     /// <summary>
     /// Атрибуты божества.

Pf2eModel/Model/Structure/DeityRelation/DeityAttribute.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Pf2eModel.Model.Enum;
 
@@ -7,20 +8,28 @@ namespace Pf2eModel.Model.Structure.DeityRelation;
 /// <summary>
 /// Элемент отношения божества и атрибута.
 /// </summary>
-[PrimaryKey(nameof(DeityId), nameof(Attribute))]
 public class DeityAttribute
 {
+    /// <summary>
+    /// Идентификатор.
+    /// </summary>
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column(Order = 1)]
+    [Comment("Идентификатор")]
+    public int Id { get; set; }
+
     /// <summary>
     /// Идентификатор божества.
     /// </summary>
-    [Column(Order = 1)]
+    [Column(Order = 2)]
     [Comment("Идентификатор божества")]
     public int DeityId { get; set; }
 
     /// <summary>
     /// Атрибут божества.
     /// </summary>
-    [Column(Order = 2)]
+    [Column(Order = 3)]
     [Comment("Атрибут божества")]
     public AttributeValues Attribute { get; set; }