Продолжение

Pf2eModel/Model/Enum/ActionCategory.cs

@@ -6,6 +6,19 @@ public enum ActionCategory
 {
     Unknown,
 
+    [PgName("archetype")]
+    Archetype,
+
+    [PgName("class-feature")]
+    ClassFeature,
+
+    [PgName("class-feat")]
+    ClassFeat,
+
+
+
+
+
     [PgName("offensive")]
     Offensive,
 

Pf2eModel/Model/Enum/FeatCategory.cs

@@ -4,11 +4,14 @@ namespace Pf2eModel.Model.Enum;
 
 public enum FeatCategory
 {
-    [PgName("ancestryfeature")]
-    Ancestryfeature,
+    [PgName("uncategorized")]
+    Uncategorized,
 
-    [PgName("classfeature")]
-    Classfeature,
+    [PgName("ancestry-feature")]
+    AncestryFeature,
+
+    [PgName("class-feature")]
+    ClassFeature,
 
     [PgName("calling")]
     Calling,
@@ -37,6 +40,6 @@ public enum FeatCategory
     [PgName("pfsboon")]
     Pfsboon,
 
-    [PgName("campaign_feature")]
+    [PgName("campaign-feature")]
     CampaignFeature,
 }

Pf2eModel/Model/Enum/TraitType.cs

@@ -7,6 +7,9 @@ public enum TraitType
     [PgName("regular")]
     Regular,
 
+    [PgName("class")]
+    Class,
+
     [PgName("tradition")]
     Tradition
 }

Pf2eModel/Model/Structure/Archetype.cs

@@ -1,4 +1,5 @@
 using Pf2eModel.Model.Base;
+using Pf2eModel.Model.Enum;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -9,6 +10,7 @@ using System.Threading.Tasks;
 
 namespace Pf2eModel.Model.Structure;
 
+[EntityOfType(EntityType.Archetype)]
 public class Archetype : IEntity
 {
     [Key]
@@ -21,7 +23,7 @@ public class Archetype : IEntity
     public int Level { get; set; }
 
     [Column(Order = 3)]
-    public int DedicationFeatId { get; set; }
+    public int? DedicationFeatId { get; set; } = null;
 
     [Column(Order = 4)]
     public string? Extra { get; set; }

Pf2eModel/Model/Structure/ArchetypeRelation/ArchetypeFeats.cs

@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Pf2eModel.Model.Structure.ArchetypeRelation;
+
+[PrimaryKey(nameof(ArchetypeId), nameof(FeatId))]
+internal class ArchetypeFeats
+{
+    public int ArchetypeId { get; set; }
+    
+    public int FeatId { get; set; }
+}

Pf2eModel/Model/Structure/Feat.cs

@@ -37,13 +37,11 @@ public partial class Feat : IEntity
     [Column(Order = 9)]
     public bool IsPassive { get; set; } = false;
 
-    [Column(Order = 10)]
-    public int ArchetypeId { get; set; }
 
-    [Column(Order = 11)]
+    [Column(Order = 10)]
     public string? Extra { get; set; }
 
-    public Archetype Archetype { get; set; } = null!;
+    public virtual ICollection<Archetype> Archetypes { get; set; } = [];
 
     public virtual ICollection<FeatPrerequisite> FeatPrerequisites { get; set; } = [];
 }