Работа над импортом заклинаний

Pf2eModel/Model/Structure/Action.cs

@@ -12,22 +12,10 @@ public class Action : IEntity
     [Column(Order = 1)]
     public int Id { get; set; }
 
+    [Column(Order = 2)]
+    public ActionEnum Actions { get; set; } = ActionEnum.Unknown;
+
     [Column(Order = 3)]
-    public int? Actions { get; set; } = null;
-
-    [Column(Order = 4)]
-    public int? MaxActions { get; set; } = null;
-
-    [Column(Order = 5)]
-    public bool IsReaction { get; set; } = false;
-
-    [Column(Order = 6)]
-    public bool IsFreeAction { get; set; } = false;
-
-    [Column(Order = 6)]
-    public bool IsPassive { get; set; } = false;
-
-    [Column(Order = 6)]
     // ReSharper disable once EntityFramework.ModelValidation.UnlimitedStringLength
     public string? Extra { get; set; }
 

Pf2eModel/Model/Structure/ArchetypeRelation/ArchetypeFeats.cs

@@ -3,7 +3,7 @@
 namespace Pf2eModel.Model.Structure.ArchetypeRelation;
 
 [PrimaryKey(nameof(ArchetypeId), nameof(FeatId))]
-internal class ArchetypeFeats
+public class ArchetypeFeats
 {
     public int ArchetypeId { get; set; }
 

Pf2eModel/Model/Structure/ClassRelation/ClassTraining.cs

@@ -20,10 +20,6 @@ public class ClassTraining
     public int? TrainingId { get; set; }
 
     [Column(Order = 4)]
-    [MaxLength(Pf2eDbContext.NameLength)]
-    public string? Name { get; set; }
-
-    [Column(Order = 5)]
     public TrainingStage Stage { get; set; }
 
     [JsonIgnore]

Pf2eModel/Model/Structure/ClassRelation/SubclassProvidedEntities.cs

@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace Pf2eModel.Model.Structure.ClassRelation;
+
+[PrimaryKey(nameof(SubclassId), nameof(EntityId))]
+public class SubclassProvidedEntities
+{
+    public int SubclassId { get; set; }
+
+    public int EntityId { get; set; }
+}

Pf2eModel/Model/Structure/ClassRelation/SubclassTrainings.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Pf2eModel.Model.Common;
+using Pf2eModel.Model.Enum;
+
+namespace Pf2eModel.Model.Structure.ClassRelation;
+
+public class SubclassTrainings
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column(Order = 1)]
+    public int Id { get; set; }
+
+    [Column(Order = 2)]
+    public int SubclassId { get; set; }
+
+    [Column(Order = 3)]
+    public int TrainingId { get; set; }
+
+    [Column(Order = 4)]
+    public TrainingStage Stage { get; set; } = TrainingStage.Trained;
+
+    public Subclass Subclass { get; set; } = null!;
+
+    public Training Training { get; set; } = null!;
+}

Pf2eModel/Model/Structure/Spell.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Pf2eModel.Model.Base;
+using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure.SpellRelation;
 
@@ -20,7 +21,12 @@ public class Spell : IEntity
     public int Level { get; set; }
 
     [Column(Order = 3)]
-    public int Cost { get; set; }
+    public ActionEnum Actions { get; set; } = ActionEnum.Other;
+
+    [Column(Order = 4)]
+    public bool IsFocus { get; set; }
+
+    // ---
 
     [Column(Order = 4)]
     public bool Counteraction { get; set; }
@@ -51,7 +57,9 @@ public class Spell : IEntity
     [Column(Order = 11)]
     public bool CanHeightening { get; set; }
 
-    public virtual SpellArea? SpellArea { get; set; }
+    // ---
+
+    public virtual ICollection<SpellArea> SpellAreas { get; set; } = [];
 
     public virtual SpellRitual? SpellRitual { get; set; }
 

Pf2eModel/Model/Structure/SpellRelation/SpellArea.cs

@@ -9,16 +9,19 @@ public class SpellArea
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.None)]
     [Column(Order = 1)]
-    public int SpellId { get; set; }
+    public int Id { get; set; }
 
     [Column(Order = 2)]
+    public int SpellId { get; set; }
+
+    [Column(Order = 3)]
     [MaxLength(255)]
     public string? Details { get; set; }
 
-    [Column(Order = 3)]
+    [Column(Order = 4)]
     public SpellAreaType Type { get; set; }
 
-    [Column(Order = 4)]
+    [Column(Order = 5)]
     public int Value { get; set; }
 
     public virtual Spell Spell { get; set; } = null!;

Pf2eModel/Model/Structure/Subclass.cs

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
+using Pf2eModel.Model.Structure.ClassRelation;
 
 namespace Pf2eModel.Model.Structure;
 
@@ -26,4 +27,8 @@ public class Subclass : IEntity
     [Column(Order = 4)]
     // ReSharper disable once EntityFramework.ModelValidation.UnlimitedStringLength
     public string Extra { get; set; } = "{}";
+
+    public virtual ICollection<Entity> Entities { get; set; } = [];
+
+    public virtual ICollection<SubclassTrainings> Trainings { get; set; } = [];
 }