Merge pull request #25 from gitFurious/dev

v1.5.3.0

Author: Damon Pollard

README.md

@@ -56,6 +56,11 @@ A Nuget package is available at [www.nuget.org/packages/HaloSharp](https://www.n
 
 ### Changelog ###
 
+###### v.1.5.3.0 (2016-06-20)
+
+1. Updated Warzone Match model.
+  * New property: ObjectivesCompleted
+
 ###### v.1.5.2.0 (2016-06-02)
 
 1. Updated Service Record models.

Source/HaloSharp.Test/JSON/Stats/CarnageReport/warzone-match.schema.json

@@ -305,6 +305,9 @@
     "MapVariantResourceId": {
       "$ref": "../common/variant.schema.json"
     },
+    "ObjectivesCompleted": {
+      "type": [ "integer", "null" ]
+    },
 
     "PlayerStats": {
       "type": "array",

Source/HaloSharp.Test/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]

Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs

@@ -9,6 +9,12 @@ namespace HaloSharp.Model.Stats.CarnageReport
     [Serializable]
     public class WarzoneMatch : BaseMatch, IEquatable<WarzoneMatch>
     {
+        /// <summary>
+        /// TODO
+        /// </summary>
+        [JsonProperty(PropertyName = "ObjectivesCompleted")]
+        public int? ObjectivesCompleted { get; set; }
+
         /// <summary>
         /// A list of stats for each player who was present in the match.
         /// </summary>
@@ -35,6 +41,7 @@ public bool Equals(WarzoneMatch other)
             }
 
             return base.Equals(other)
+                && ObjectivesCompleted == other.ObjectivesCompleted
                 && PlayerStats.OrderBy(ps => ps.Player.Gamertag).SequenceEqual(other.PlayerStats.OrderBy(ps => ps.Player.Gamertag))
                 && TeamStats.OrderBy(ts => ts.TeamId).SequenceEqual(other.TeamStats.OrderBy(ts => ts.TeamId));
         }
@@ -64,6 +71,7 @@ public override int GetHashCode()
             unchecked
             {
                 int hashCode = base.GetHashCode();
+                hashCode = (hashCode*397) ^ ObjectivesCompleted.GetHashCode();
                 hashCode = (hashCode*397) ^ (PlayerStats?.GetHashCode() ?? 0);
                 hashCode = (hashCode*397) ^ (TeamStats?.GetHashCode() ?? 0);
                 return hashCode;

Source/HaloSharp/Properties/AssemblyInfo.cs

@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]
 
 //HaloSharp.Test
 [assembly: InternalsVisibleTo("HaloSharp.Test")]