Merge pull request #1 from babelshift/v2

babelshift · web-flow · commit da72cf46fac6 · 2016-12-14T21:15:39.000-05:00
V2
diff --git a/SourceSchemaParser/AutoMapperConfiguration.cs b/SourceSchemaParser/AutoMapperConfiguration.cs
@@ -1,5 +1,5 @@
 ﻿using AutoMapper;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using Steam.Models.DOTA2;
 using Steam.Models.GameEconomy;
 using System;
diff --git a/SourceSchemaParser/Dota2/DotaAbilitySchemaItem.cs b/SourceSchemaParser/Dota2/DotaAbilitySchemaItem.cs
@@ -3,7 +3,7 @@
 using SourceSchemaParser.JsonConverters;
 using System.Collections.Generic;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaAbilitySchemaItem
     {
diff --git a/SourceSchemaParser/Dota2/DotaAbilitySpecialSchemaItem.cs b/SourceSchemaParser/Dota2/DotaAbilitySpecialSchemaItem.cs
@@ -1,9 +1,10 @@
-﻿namespace SourceSchemaParser.Dota2
+﻿namespace SourceSchemaParser.DOTA2
 {
     internal class DotaAbilitySpecialSchemaItem
     {
         public string Name { get; set; }
         public string Value { get; set; }
         public string VarType { get; set; }
+        public string LinkedSpecialBonus { get; set; }
     }
 }
diff --git a/SourceSchemaParser/Dota2/DotaHeroSchemaItem.cs b/SourceSchemaParser/Dota2/DotaHeroSchemaItem.cs
@@ -1,7 +1,7 @@
 ﻿using Newtonsoft.Json;
 using SourceSchemaParser.JsonConverters;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaHeroSchemaItem
     {
@@ -99,6 +99,30 @@ internal class DotaHeroSchemaItem
         [JsonProperty("Ability16")]
         public string Ability16 { get; set; }
 
+        [JsonProperty("Ability17")]
+        public string Ability17 { get; set; }
+
+        [JsonProperty("Ability18")]
+        public string Ability18 { get; set; }
+        
+        [JsonProperty("Ability19")]
+        public string Ability19 { get; set; }
+        
+        [JsonProperty("Ability20")]
+        public string Ability20 { get; set; }
+
+        [JsonProperty("Ability21")]
+        public string Ability21 { get; set; }
+
+        [JsonProperty("Ability22")]
+        public string Ability22 { get; set; }
+
+        [JsonProperty("Ability23")]
+        public string Ability23 { get; set; }
+
+        [JsonProperty("Ability24")]
+        public string Ability24 { get; set; }
+
         [JsonProperty("ArmorPhysical")]
         public double ArmorPhysical { get; set; }
 
diff --git a/SourceSchemaParser/Dota2/DotaItemAbilitySchemaItem.cs b/SourceSchemaParser/Dota2/DotaItemAbilitySchemaItem.cs
@@ -3,7 +3,7 @@
 using SourceSchemaParser.JsonConverters;
 using System.Collections.Generic;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaItemAbilitySchemaItem
     {
diff --git a/SourceSchemaParser/Dota2/DotaItemBuildGroupSchemaItem.cs b/SourceSchemaParser/Dota2/DotaItemBuildGroupSchemaItem.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaItemBuildGroupSchemaItem
     {
diff --git a/SourceSchemaParser/Dota2/DotaItemBuildSchemaItem.cs b/SourceSchemaParser/Dota2/DotaItemBuildSchemaItem.cs
@@ -2,7 +2,7 @@
 using SourceSchemaParser.JsonConverters;
 using System.Collections.Generic;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaItemBuildSchemaItem
     {
diff --git a/SourceSchemaParser/Dota2/DotaLeague.cs b/SourceSchemaParser/Dota2/DotaLeague.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaLeague
     {
diff --git a/SourceSchemaParser/Dota2/DotaSchema.cs b/SourceSchemaParser/Dota2/DotaSchema.cs
@@ -2,7 +2,7 @@
 using SourceSchemaParser.JsonConverters;
 using System.Collections.Generic;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaSchema
     {
diff --git a/SourceSchemaParser/Dota2/DotaSchemaContainer.cs b/SourceSchemaParser/Dota2/DotaSchemaContainer.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaSchemaContainer
     {
diff --git a/SourceSchemaParser/Dota2/DotaSchemaItem.cs b/SourceSchemaParser/Dota2/DotaSchemaItem.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaSchemaItem : SchemaItem
     {
diff --git a/SourceSchemaParser/Dota2/DotaSchemaItemAutograph.cs b/SourceSchemaParser/Dota2/DotaSchemaItemAutograph.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaSchemaItemAutograph
     {
diff --git a/SourceSchemaParser/Dota2/DotaSchemaItemSet.cs b/SourceSchemaParser/Dota2/DotaSchemaItemSet.cs
@@ -2,7 +2,7 @@
 using SourceSchemaParser.JsonConverters;
 using System.Collections.Generic;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaSchemaItemSet
     {
diff --git a/SourceSchemaParser/Dota2/DotaSchemaItemTool.cs b/SourceSchemaParser/Dota2/DotaSchemaItemTool.cs
@@ -1,4 +1,4 @@
-﻿namespace SourceSchemaParser.Dota2
+﻿namespace SourceSchemaParser.DOTA2
 {
     internal class DotaSchemaItemTool
     {
diff --git a/SourceSchemaParser/Dota2/DotaSchemaItemToolUsage.cs b/SourceSchemaParser/Dota2/DotaSchemaItemToolUsage.cs
@@ -1,7 +1,7 @@
 ﻿using Newtonsoft.Json;
 using SourceSchemaParser.JsonConverters;
 
-namespace SourceSchemaParser.Dota2
+namespace SourceSchemaParser.DOTA2
 {
     internal class DotaSchemaItemToolUsage
     {
diff --git a/SourceSchemaParser/JsonConverters/DotaAbilitySpecialSchemaItemJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaAbilitySpecialSchemaItemJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
@@ -36,6 +36,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 }
 
                 string currentVarType = String.Empty;
+                string currentLinkedSpecialBonus = String.Empty;
 
                 // we need to go through all the actual values of the special properties
                 var abilitySpecialIndividualProperties = abilitySpecialProperty.Value.Children<JProperty>();
@@ -49,6 +50,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                         continue;
                     }
 
+                    if (abilitySpecialIndividualProperty.Name == "LinkedSpecialBonus")
+                    {
+                        currentLinkedSpecialBonus = abilitySpecialIndividualProperty.Value.ToString();
+                        continue;
+                    }
+
                     // construct the special attribute
                     DotaAbilitySpecialSchemaItem abilitySpecial = new DotaAbilitySpecialSchemaItem()
                     {
diff --git a/SourceSchemaParser/JsonConverters/DotaItemBuildGroupSchemaItemJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaItemBuildGroupSchemaItemJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/DotaSchemaColorJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaSchemaColorJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/DotaSchemaItemAutographsJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaSchemaItemAutographsJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/DotaSchemaItemSetJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaSchemaItemSetJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/DotaSchemaItemsJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaSchemaItemsJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/DotaSchemaPrefabJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaSchemaPrefabJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/DotaSchemaQualityJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaSchemaQualityJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/DotaSchemaRarityJsonConverter.cs b/SourceSchemaParser/JsonConverters/DotaSchemaRarityJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/SchemaItemToDotaAbilityJsonConverter.cs b/SourceSchemaParser/JsonConverters/SchemaItemToDotaAbilityJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/SchemaItemToDotaHeroJsonConverter.cs b/SourceSchemaParser/JsonConverters/SchemaItemToDotaHeroJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/SchemaItemToDotaItemAbilityJsonConverter.cs b/SourceSchemaParser/JsonConverters/SchemaItemToDotaItemAbilityJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/JsonConverters/SchemaItemsToDotaLeaguesJsonConverter.cs b/SourceSchemaParser/JsonConverters/SchemaItemsToDotaLeaguesJsonConverter.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using SourceSchemaParser.Dota2;
+using SourceSchemaParser.DOTA2;
 using System;
 using System.Collections.Generic;
 
diff --git a/SourceSchemaParser/SchemaFactory.cs b/SourceSchemaParser/SchemaFactory.cs
diff --git a/SourceSchemaParser/SourceSchemaParser.csproj b/SourceSchemaParser/SourceSchemaParser.csproj
diff --git a/SourceSchemaParser/SourceSchemaParser.nuspec b/SourceSchemaParser/SourceSchemaParser.nuspec
diff --git a/SourceSchemaParser/Utilities/VDFConvert.cs b/SourceSchemaParser/Utilities/VDFConvert.cs
diff --git a/SourceSchemaParser/Utilities/VKeyValueCollection.cs b/SourceSchemaParser/Utilities/VKeyValueCollection.cs
diff --git a/SourceSchemaParser/Utilities/VKeyValuePair.cs b/SourceSchemaParser/Utilities/VKeyValuePair.cs
diff --git a/SourceSchemaParser/Utilities/VRootToken.cs b/SourceSchemaParser/Utilities/VRootToken.cs
diff --git a/SourceSchemaParser/Utilities/VRootTokenJsonConverter.cs b/SourceSchemaParser/Utilities/VRootTokenJsonConverter.cs
diff --git a/SourceSchemaParser/Utilities/VToken.cs b/SourceSchemaParser/Utilities/VToken.cs
diff --git a/SourceSchemaParser/packages.config b/SourceSchemaParser/packages.config
diff --git a/appveyor.yml b/appveyor.yml

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using SourceSchemaParser.JsonConverters;`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`
`6`		`-namespace SourceSchemaParser.Dota2`
	`6`	`+namespace SourceSchemaParser.DOTA2`
`7`	`7`	`{`
`8`	`8`	`internal class DotaAbilitySchemaItem`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`		`-namespace SourceSchemaParser.Dota2`
	`1`	`+namespace SourceSchemaParser.DOTA2`
`2`	`2`	`{`
`3`	`3`	`internal class DotaAbilitySpecialSchemaItem`
`4`	`4`	`{`
`5`	`5`	`public string Name { get; set; }`
`6`	`6`	`public string Value { get; set; }`
`7`	`7`	`public string VarType { get; set; }`
	`8`	`+ public string LinkedSpecialBonus { get; set; }`
`8`	`9`	`}`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`
`3`		`-namespace SourceSchemaParser.Dota2`
	`3`	`+namespace SourceSchemaParser.DOTA2`
`4`	`4`	`{`
`5`	`5`	`internal class DotaItemBuildGroupSchemaItem`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using SourceSchemaParser.JsonConverters;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`
`5`		`-namespace SourceSchemaParser.Dota2`
	`5`	`+namespace SourceSchemaParser.DOTA2`
`6`	`6`	`{`
`7`	`7`	`internal class DotaItemBuildSchemaItem`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace SourceSchemaParser.Dota2`
	`3`	`+namespace SourceSchemaParser.DOTA2`
`4`	`4`	`{`
`5`	`5`	`internal class DotaLeague`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`	`2`
`3`		`-namespace SourceSchemaParser.Dota2`
	`3`	`+namespace SourceSchemaParser.DOTA2`
`4`	`4`	`{`
`5`	`5`	`internal class DotaSchemaContainer`
`6`	`6`	`{`