Reorganizing Dota 2 models

src/Steam.Models/DOTA2/HeroAbilityDetailModel.cs → src/Steam.Models/DOTA2/Cleaned/HeroAbilityDetail.cs

@@ -4,13 +4,13 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class HeroAbilityDetailModel
+    public class HeroAbilityDetail
     {
         public uint Id { get; set; }
         public string Name { get; set; }
         public string AvatarImagePath { get; set; }
         public string Description { get; set; }
-        public IReadOnlyCollection<HeroAbilitySpecialDetailModel> Attributes { get; set; }
+        public IReadOnlyCollection<HeroAbilitySpecialDetail> AbilitySpecials { get; set; }
         public string Behaviors { get; set; }
         public string TeamTargets { get; set; }
         public string TargetTypes { get; set; }
@@ -35,7 +35,7 @@ public bool HasLinkedSpecialBonus
         {
             get
             {
-                return Attributes.Any(x => !String.IsNullOrWhiteSpace(x.LinkedSpecialBonus));
+                return AbilitySpecials.Any(x => !String.IsNullOrWhiteSpace(x.LinkedSpecialBonus));
             }
         }
     }

src/Steam.Models/DOTA2/HeroAbilitySpecialDetailModel.cs → src/Steam.Models/DOTA2/Cleaned/HeroAbilitySpecialDetail.cs

@@ -1,10 +1,13 @@
 namespace Steam.Models.DOTA2
 {
-    public class HeroAbilitySpecialDetailModel
+    public class HeroAbilitySpecialDetail
     {
         public string Name { get; set; }
+
         public string Value { get; set; }
+
         public string RawName { get; set; }
+
         public string LinkedSpecialBonus { get; set; }
     }
 }

src/Steam.Models/DOTA2/HeroDetailModel.cs → src/Steam.Models/DOTA2/Cleaned/HeroDetail.cs

@@ -3,7 +3,7 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class HeroDetailModel
+    public class HeroDetail
     {
         private const int baseHealth = 150;
         private const int healthPerStrength = 19;
@@ -38,7 +38,7 @@ public class HeroDetailModel
         public bool IsEnabled { get; set; }
 
         public IReadOnlyCollection<HeroRoleModel> Roles { get; set; }
-        public IReadOnlyCollection<HeroAbilityDetailModel> Abilities { get; set; }
+        public IReadOnlyCollection<HeroAbilityDetail> Abilities { get; set; }
 
         public double GetBaseHealth()
         {

src/Steam.Models/DOTA2/RarityModel.cs → src/Steam.Models/DOTA2/Cleaned/Rarity.cs

@@ -1,11 +1,15 @@
 namespace Steam.Models.DOTA2
 {
-    public class RarityModel
+    public class Rarity
     {
         public string Name { get; set; }
+
         public uint Id { get; set; }
+
         public uint Order { get; set; }
+
         public string Color { get; set; }
+
         public string LocalizedName { get; set; }
     }
 }

src/Steam.Models/DOTA2/DotaHeroAbilityBehaviorType.cs → src/Steam.Models/DOTA2/Enums/DotaHeroAbilityBehaviorType.cs

@@ -30,6 +30,7 @@ public sealed class DotaHeroAbilityBehaviorType : DotaEnumType
         public static readonly DotaHeroAbilityBehaviorType DONT_CANCEL_MOVEMENT = new DotaHeroAbilityBehaviorType("DOTA_ABILITY_BEHAVIOR_DONT_CANCEL_MOVEMENT", "Does Not Cancel Movement", "This ability does not stop hero movement.");
         public static readonly DotaHeroAbilityBehaviorType OPTIONAL_UNIT_TARGET = new DotaHeroAbilityBehaviorType("DOTA_ABILITY_BEHAVIOR_OPTIONAL_UNIT_TARGET", "Optional Unit Target", "Unknown.");
         public static readonly DotaHeroAbilityBehaviorType SUPPRESS_ASSOCIATED_CONSUMABLE = new DotaHeroAbilityBehaviorType("DOTA_ABILITY_BEHAVIOR_SUPPRESS_ASSOCIATED_CONSUMABLE", "Suppress Associated Consumable", "Unknown.");
+        public static readonly DotaHeroAbilityBehaviorType SHOW_IN_GUIDES = new DotaHeroAbilityBehaviorType("DOTA_ABILITY_BEHAVIOR_SHOW_IN_GUIDES", "Show in Guides", "Unknown.");
 
         public DotaHeroAbilityBehaviorType(string key, string displayName, string description)
             : base(key, displayName, description)

src/Steam.Models/DOTA2/DotaBlogFeedItem.cs → src/Steam.Models/DOTA2/External/DotaBlogFeedItem.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Steam.Models.DOTA2
 {

src/Steam.Models/DOTA2/HeroModel.cs → src/Steam.Models/DOTA2/External/Hero.cs

@@ -1,9 +1,11 @@
 namespace Steam.Models.DOTA2
 {
-    public class HeroModel
+    public class Hero
     {
         public uint Id { get; set; }
+
         public string Name { get; set; }
+
         public string LocalizedName { get; set; }
     }
 }

src/Steam.Models/DOTA2/AbilitySchemaItemModel.cs → src/Steam.Models/DOTA2/External/HeroAbility.cs

@@ -2,7 +2,7 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class AbilitySchemaItemModel
+    public class HeroAbility
     {
         public uint Id { get; set; }
 
@@ -50,6 +50,6 @@ public class AbilitySchemaItemModel
 
         public string AbilityUnitTargetType { get; set; }
 
-        public IList<AbilitySpecialSchemaItemModel> AbilitySpecials { get; set; }
+        public IList<HeroAbilitySpecial> AbilitySpecials { get; set; }
     }
 }

src/Steam.Models/DOTA2/AbilitySpecialSchemaItemModel.cs → src/Steam.Models/DOTA2/External/HeroAbilitySpecial.cs

@@ -1,10 +1,13 @@
 namespace Steam.Models.DOTA2
 {
-    public class AbilitySpecialSchemaItemModel
+    public class HeroAbilitySpecial
     {
         public string Name { get; set; }
+
         public string Value { get; set; }
+
         public string VarType { get; set; }
+
         public string LinkedSpecialBonus { get; set; }
     }
 }

src/Steam.Models/DOTA2/HeroRoleModel.cs → src/Steam.Models/DOTA2/External/HeroRoleModel.cs

@@ -3,6 +3,7 @@
     public class HeroRoleModel
     {
         public string Name { get; set; }
+
         public string Level { get; set; }
     }
 }

src/Steam.Models/DOTA2/ItemAbilitySchemaItemModel.cs → src/Steam.Models/DOTA2/External/ItemAbility.cs

@@ -2,7 +2,7 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class ItemAbilitySchemaItemModel
+    public class ItemAbility
     {
         public uint Id { get; set; }
 
@@ -42,7 +42,7 @@ public class ItemAbilitySchemaItemModel
 
         public string AbilityUnitTargetType { get; set; }
 
-        public IList<AbilitySpecialSchemaItemModel> AbilitySpecials { get; set; }
+        public IList<HeroAbilitySpecial> AbilitySpecials { get; set; }
 
         public uint ItemCost { get; set; }
 

src/Steam.Models/DOTA2/ItemBuildSchemaItemModel.cs → src/Steam.Models/DOTA2/External/ItemBuild.cs

@@ -2,12 +2,14 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class ItemBuildSchemaItemModel
+    public class ItemBuild
     {
         public string Author { get; set; }
+
         public string Hero { get; set; }
+
         public string Title { get; set; }
 
-        public IList<ItemBuildGroupSchemaItemModel> Items { get; set; }
+        public IList<ItemBuildGroup> Items { get; set; }
     }
 }

src/Steam.Models/DOTA2/ItemBuildGroupSchemaItemModel.cs → src/Steam.Models/DOTA2/External/ItemBuildGroup.cs

@@ -2,9 +2,10 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class ItemBuildGroupSchemaItemModel
+    public class ItemBuildGroup
     {
         public string Name { get; set; }
+
         public IList<string> Items { get; set; }
     }
 }

src/Steam.Models/DOTA2/External/Schema.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Steam.Models.DOTA2
+{
+    public class Schema
+    {
+        public SchemaGameInfo GameInfo { get; set; }
+
+        public IList<SchemaRarity> Rarities { get; set; }
+
+        public IList<SchemaQuality> Qualities { get; set; }
+
+        public IList<SchemaColor> Colors { get; set; }
+
+        public IList<SchemaPrefab> Prefabs { get; set; }
+
+        public IList<SchemaItem> Items { get; set; }
+
+        public IList<SchemaItemSet> ItemSets { get; set; }
+
+        public IList<SchemaItemAutograph> ItemAutographs { get; set; }
+    }
+}

src/Steam.Models/DOTA2/SchemaColorModel.cs → src/Steam.Models/DOTA2/External/SchemaColor.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaColorModel
+    public class SchemaColor
     {
         public string Name { get; set; }
 

src/Steam.Models/DOTA2/SchemaGameInfoModel.cs → src/Steam.Models/DOTA2/External/SchemaGameInfo.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaGameInfoModel
+    public class SchemaGameInfo
     {
         public string FirstValidClass { get; set; }
 

src/Steam.Models/DOTA2/SchemaItemModel.cs → src/Steam.Models/DOTA2/External/SchemaItem.cs

@@ -3,7 +3,7 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class SchemaItemModel
+    public class SchemaItem
     {
         public string DefIndex { get; set; }
 
@@ -23,7 +23,7 @@ public class SchemaItemModel
 
         public DateTime? ExpirationDate { get; set; }
 
-        public SchemaItemToolModel Tool { get; set; }
+        public SchemaItemTool Tool { get; set; }
 
         public string TournamentUrl { get; set; }
 
@@ -35,12 +35,12 @@ public class SchemaItemModel
 
         public string ItemSlot { get; set; }
 
-        public SchemaItemPriceInfoModel PriceInfo { get; set; }
+        public SchemaItemPriceInfo PriceInfo { get; set; }
 
         public IList<string> UsedByHeroes { get; set; }
 
         public IList<string> BundledItems { get; set; }
 
-        public IList<SchemaItemStaticAttributeModel> StaticAttributes { get; set; }
+        public IList<SchemaItemStaticAttribute> StaticAttributes { get; set; }
     }
 }

src/Steam.Models/DOTA2/SchemaItemAutographModel.cs → src/Steam.Models/DOTA2/External/SchemaItemAutograph.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaItemAutographModel
+    public class SchemaItemAutograph
     {
         public string DefIndex { get; set; }
 

src/Steam.Models/DOTA2/SchemaItemPriceInfoModel.cs → src/Steam.Models/DOTA2/External/SchemaItemPriceInfo.cs

@@ -2,7 +2,7 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class SchemaItemPriceInfoModel
+    public class SchemaItemPriceInfo
     {
         public string Bucket { get; set; }
 

src/Steam.Models/DOTA2/SchemaItemSetModel.cs → src/Steam.Models/DOTA2/External/SchemaItemSet.cs

@@ -2,7 +2,7 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class SchemaItemSetModel
+    public class SchemaItemSet
     {
         public string RawName { get; set; }
 

src/Steam.Models/DOTA2/SchemaItemStaticAttributeModel.cs → src/Steam.Models/DOTA2/External/SchemaItemStaticAttribute.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaItemStaticAttributeModel
+    public class SchemaItemStaticAttribute
     {
         public string Class { get; set; }
         public string Value { get; set; }

src/Steam.Models/DOTA2/External/SchemaItemTool.cs

@@ -0,0 +1,7 @@
+namespace Steam.Models.DOTA2
+{
+    public class SchemaItemTool
+    {
+        public SchemaItemToolUsage Usage { get; set; }
+    }
+}

src/Steam.Models/DOTA2/SchemaItemToolUsageModel.cs → src/Steam.Models/DOTA2/External/SchemaItemToolUsage.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaItemToolUsageModel
+    public class SchemaItemToolUsage
     {
         public uint LeagueId { get; set; }
 

src/Steam.Models/DOTA2/SchemaPrefabModel.cs → src/Steam.Models/DOTA2/External/SchemaPrefab.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaPrefabModel
+    public class SchemaPrefab
     {
         public string Type { get; set; }
 
@@ -24,6 +24,6 @@ public class SchemaPrefabModel
 
         public string ImageInventorySizeHeight { get; set; }
 
-        public SchemaPrefabCapabilityModel Capabilities { get; set; }
+        public SchemaPrefabCapability Capabilities { get; set; }
     }
 }

src/Steam.Models/DOTA2/SchemaPrefabCapabilityModel.cs → src/Steam.Models/DOTA2/External/SchemaPrefabCapability.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaPrefabCapabilityModel
+    public class SchemaPrefabCapability
     {
         public bool Nameable { get; set; }
 

src/Steam.Models/DOTA2/SchemaQualityModel.cs → src/Steam.Models/DOTA2/External/SchemaQuality.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaQualityModel
+    public class SchemaQuality
     {
         public string Name { get; set; }
 

src/Steam.Models/DOTA2/SchemaRarityModel.cs → src/Steam.Models/DOTA2/External/SchemaRarity.cs

@@ -1,6 +1,6 @@
 namespace Steam.Models.DOTA2
 {
-    public class SchemaRarityModel
+    public class SchemaRarity
     {
         public string Name { get; set; }
 

src/Steam.Models/DOTA2/TeamInfoModel.cs → src/Steam.Models/DOTA2/External/TeamInfo.cs

@@ -2,7 +2,7 @@
 
 namespace Steam.Models.DOTA2
 {
-    public class TeamInfoModel
+    public class TeamInfo
     {
         public uint TeamId { get; set; }
         public string Name { get; set; }

src/Steam.Models/DOTA2/MatchPickBanModel.cs

@@ -7,6 +7,7 @@ public class MatchPickBanModel
         public uint HeroId { get; set; }
 
         public uint Team { get; set; }
+
         public uint Order { get; set; }
     }
 }

src/Steam.Models/DOTA2/MatchPlayerAbilityUpgradeModel.cs

@@ -3,7 +3,9 @@
     public class MatchPlayerAbilityUpgradeModel
     {
         public uint Ability { get; set; }
+
         public uint Time { get; set; }
+
         public uint Level { get; set; }
     }
 }