diff --git a/Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/Compendium/CompendiumSchemaTypeResolver.cs b/Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/Compendium/CompendiumSchemaTypeResolver.cs index f3d8f93..ced8c1e 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/Compendium/CompendiumSchemaTypeResolver.cs +++ b/Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/Compendium/CompendiumSchemaTypeResolver.cs @@ -21,14 +21,25 @@ namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.Compendium protected readonly List DictionaryPaths = [ "Actor.character.items.[].system.items", + "Actor.character.items.[].system.overlays", + "Item.ancestry.system.items", "Item.ancestry.system.boosts", "Item.background.system.boosts", "Item.background.system.items", "Item.class.system.items", + "Item.consumable.system.spell.system.damage", + "Item.consumable.system.spell.system.overlays", + "Item.deity.system.spells", "Item.feat.system.subfeatures.proficiencies", "Item.kit.system.items", + "Item.kit.system.items.[value].items", "Item.spell.system.damage", - "Item.spell.system.heightening.damage" + "Item.spell.system.heightening.damage", + "Item.spell.system.heightening.levels", + "Item.spell.system.heightening.levels.[value].damage", + "Item.spell.system.overlays", + "Item.spell.system.overlays.[value].system.damage", + "Item.spell.system.overlays.[value].system.heightening" ]; public override AbstractSchemaType Resolve(SchemaNode node, JToken? value) diff --git a/Pf2eDataScrapper/SchemaBuilder/SchemaNode.cs b/Pf2eDataScrapper/SchemaBuilder/SchemaNode.cs index cffa64b..ba41f25 100644 --- a/Pf2eDataScrapper/SchemaBuilder/SchemaNode.cs +++ b/Pf2eDataScrapper/SchemaBuilder/SchemaNode.cs @@ -134,6 +134,11 @@ namespace Pf2eDataScrapper.SchemaBuilder return Types[0].ToString(); } + if (Types.Count == 0) + { + return "empty"; + } + List result = ["mixed"]; foreach (var type in Types) diff --git a/Pf2eDataScrapper/SchemaBuilder/Types/AbstractSchemaType.cs b/Pf2eDataScrapper/SchemaBuilder/Types/AbstractSchemaType.cs index e5b6ea1..4bd4612 100644 --- a/Pf2eDataScrapper/SchemaBuilder/Types/AbstractSchemaType.cs +++ b/Pf2eDataScrapper/SchemaBuilder/Types/AbstractSchemaType.cs @@ -53,7 +53,7 @@ namespace Pf2eDataScrapper.SchemaBuilder.Types /// Строковое представление элемента. public override string ToString() { - return $"{GetTypeName()} {Parent.Path}"; + return $"{GetTypeName()} {{{Parent.Path}}}"; } /// diff --git a/Pf2eDataScrapper/SchemaBuilder/Types/ObjectSchemaType.cs b/Pf2eDataScrapper/SchemaBuilder/Types/ObjectSchemaType.cs index b5324d2..dd71bd9 100644 --- a/Pf2eDataScrapper/SchemaBuilder/Types/ObjectSchemaType.cs +++ b/Pf2eDataScrapper/SchemaBuilder/Types/ObjectSchemaType.cs @@ -62,7 +62,7 @@ namespace Pf2eDataScrapper.SchemaBuilder.Types { if (a.IsNullable && !b.IsNullable) { - return 1; + return 0; } return string.Compare(a.Name, b.Name, StringComparison.Ordinal);