Немного отчистки кода и общий тип

This commit is contained in:
2025-04-15 09:28:53 +04:00
parent 578bb077da
commit a087807fe4
42 changed files with 67 additions and 175 deletions
+2 -4
View File
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Enum;
namespace Pf2eDataScrapper.Model;
public partial class Action
public partial class Action : IEntity
{
public int Id { get; set; }
+2 -4
View File
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Enum;
namespace Pf2eDataScrapper.Model;
public partial class Ancestry
public partial class Ancestry : IEntity
{
public int Id { get; set; }
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class AncestryBoost
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class AncestryItem
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class AncestryLanguage
{
+1 -3
View File
@@ -1,10 +1,8 @@
using Pf2eDataScrapper.Model.Enum;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
public partial class Background
public partial class Background : IEntity
{
public int Id { get; set; }
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class BackgroundBoost
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class BackgroundItem
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class BackgroundSkill
{
+1 -3
View File
@@ -1,10 +1,8 @@
using Pf2eDataScrapper.Model.Enum;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
public partial class CampaignFeature
public partial class CampaignFeature : IEntity
{
public int Id { get; set; }
+1 -3
View File
@@ -1,10 +1,8 @@
using Pf2eDataScrapper.Model.Enum;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
public partial class Class
public partial class Class : IEntity
{
public int Id { get; set; }
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class ClassKeyAbility
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class ClassProgression
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class ClassTraining
{
+1 -3
View File
@@ -1,10 +1,8 @@
using Pf2eDataScrapper.Model.Enum;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
public partial class Condition
public partial class Condition : IEntity
{
public int Id { get; set; } = -1;
+1 -3
View File
@@ -1,10 +1,8 @@
using Pf2eDataScrapper.Model.Enum;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
public partial class Deity
public partial class Deity : IEntity
{
public int Id { get; set; }
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class DeityAttribute
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class DeityDomain
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class DeitySpell
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class DeityWeapon
{
+2 -17
View File
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class Entity
public partial class Entity : IEntity
{
public int Id { get; set; } = -1;
@@ -21,17 +18,5 @@ public partial class Entity
public bool? IsChecked { get; set; }
public virtual ICollection<AncestryItem> AncestryItems { get; set; } = new List<AncestryItem>();
public virtual ICollection<BackgroundItem> BackgroundItems { get; set; } = new List<BackgroundItem>();
public virtual ICollection<ClassProgression> ClassProgressions { get; set; } = new List<ClassProgression>();
public virtual ICollection<EntityAlias> EntityAliases { get; set; } = new List<EntityAlias>();
public virtual ICollection<EntityExternal> EntityExternals { get; set; } = new List<EntityExternal>();
public virtual Frequency? Frequency { get; set; }
public virtual ICollection<Trait> Traits { get; set; } = new List<Trait>();
}
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class EntityAlias
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class EntityExternal
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class EntityKeyword
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class EntitySource
{
+1 -5
View File
@@ -1,8 +1,4 @@
using Pf2eDataScrapper.Model;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class ExternalTarget
{
+1 -3
View File
@@ -1,10 +1,8 @@
using Pf2eDataScrapper.Model.Enum;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
public partial class Feat
public partial class Feat : IEntity
{
public int Id { get; set; }
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class FeatPrerequisite
{
+1 -5
View File
@@ -1,8 +1,4 @@
using Pf2eDataScrapper.Model;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class Frequency
{
+2 -5
View File
@@ -1,11 +1,8 @@
using Pf2eDataScrapper.Model;
using System;
using System.Collections.Generic;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Enum;
namespace Pf2eDataScrapper.Model;
public partial class Heritage
public partial class Heritage : IEntity
{
public int Id { get; set; }
+21
View File
@@ -0,0 +1,21 @@
namespace Pf2eDataScrapper.Model
{
internal interface IEntity
{
public int Id { get; set; }
public string Name { get; set; }
public string Img { get; set; }
public string Description { get; set; }
public string? DescriptionGm { get; set; }
public string Slug { get; set; }
public bool? IsTranslated { get; set; }
public bool? IsChecked { get; set; }
}
}
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class Keyword
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class KeywordAlias
{
+1 -5
View File
@@ -1,8 +1,4 @@
using Pf2eDataScrapper.Model;
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class Language
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class Source
{
+2 -4
View File
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Enum;
namespace Pf2eDataScrapper.Model;
public partial class Spell
public partial class Spell : IEntity
{
public int Id { get; set; }
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class SpellArea
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class SpellDamage
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class SpellDefense
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class SpellRitual
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class Training
{
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace Pf2eDataScrapper.Model;
namespace Pf2eDataScrapper.Model;
public partial class Trait
{