Продолжение

Pf2eViewer/EntityConverter.cs

@@ -39,12 +39,12 @@ internal class EntityConverter : JsonConverter
     public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
     {
         Dictionary<string, object?> dictionary = DictionarySerialization(value!);
-
+        /*
         if (value.GetType() != typeof(Entity))
         {
             dictionary.Remove("Entity");
         }
-
+        */
         switch (value)
         {
             case Entity entity:
@@ -61,6 +61,7 @@ internal class EntityConverter : JsonConverter
         foreach (KeyValuePair<string, object> keyValuePair in dictionary)
         {
             writer.WritePropertyName(keyValuePair.Key, true);
+
             serializer.Serialize(writer, keyValuePair.Value);
         }
 

Pf2eViewer/MainViewForm.cs

@@ -175,7 +175,8 @@ public partial class MainViewForm : Form
             Converters = [
                 new EntityConverter(),
                 new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() },
-            ]
+            ],
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
         };
 
         string result = JsonConvert.SerializeObject(entity, settings);
@@ -195,6 +196,14 @@ public partial class MainViewForm : Form
                     .Include(a => a.AncestryBoosts)
                     .FirstOrDefault(e => e.Id == entity.Id);
 
+            case EntityType.Archetype:
+                return Context.Archetypes
+                    .Include(a => a.DedicationFeat)
+                    .ThenInclude(f => f.Entity)
+                    .Include(a => a.Feats)
+                    .ThenInclude(f => f.Entity)
+                    .FirstOrDefault(a => a.Id == entity.Id);
+
             case EntityType.Background:
                 return Context.Backgrounds
                     .Include(b => b.BackgroundBoosts)
@@ -211,6 +220,12 @@ public partial class MainViewForm : Form
                     .Include(c => c.ClassProgressions)
                     .FirstOrDefault(c => c.Id == entity.Id);
 
+            case EntityType.Feat:
+                return Context.Feats
+                    .Include(f => f.Archetypes)
+                    .ThenInclude(a => a.Entity)
+                    .FirstOrDefault(f => f.Id == entity.Id);
+
             default:
                 Type type = EntityOfTypeAttribute.Resolve(entity);
                 return (IEntity?) Context.Find(type, entity.Id);