From 360bd1c19b8bdc38d839f7c34dd8d4c7f5c90e86 Mon Sep 17 00:00:00 2001 From: Damon Pollard Date: Mon, 20 Jun 2016 14:52:51 +0800 Subject: [PATCH 1/2] Updated Warzone Match model. Added 'ObjectivesCompleted', most likely for FF release. --- .../JSON/Stats/CarnageReport/warzone-match.schema.json | 3 +++ .../HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/Source/HaloSharp.Test/JSON/Stats/CarnageReport/warzone-match.schema.json b/Source/HaloSharp.Test/JSON/Stats/CarnageReport/warzone-match.schema.json index 6930dd3..8ac2f03 100644 --- a/Source/HaloSharp.Test/JSON/Stats/CarnageReport/warzone-match.schema.json +++ b/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", diff --git a/Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs b/Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs index 1a04f59..6f37c7a 100644 --- a/Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs +++ b/Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs @@ -9,6 +9,12 @@ namespace HaloSharp.Model.Stats.CarnageReport [Serializable] public class WarzoneMatch : BaseMatch, IEquatable { + /// + /// TODO + /// + [JsonProperty(PropertyName = "ObjectivesCompleted")] + public int? ObjectivesCompleted { get; set; } + /// /// A list of stats for each player who was present in the match. /// @@ -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; From 330b2a5699119ea3d55cc38b1a45290db308b7cf Mon Sep 17 00:00:00 2001 From: Damon Pollard Date: Mon, 20 Jun 2016 14:57:04 +0800 Subject: [PATCH 2/2] NuGet package v1.5.3.0 --- README.md | 5 +++++ Source/HaloSharp.Test/Properties/AssemblyInfo.cs | 4 ++-- Source/HaloSharp/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 52932c3..66e47f0 100644 --- a/README.md +++ b/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. diff --git a/Source/HaloSharp.Test/Properties/AssemblyInfo.cs b/Source/HaloSharp.Test/Properties/AssemblyInfo.cs index 138e58f..9b631cd 100644 --- a/Source/HaloSharp.Test/Properties/AssemblyInfo.cs +++ b/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")] \ No newline at end of file +[assembly: AssemblyVersion("1.5.3.0")] +[assembly: AssemblyFileVersion("1.5.3.0")] \ No newline at end of file diff --git a/Source/HaloSharp/Properties/AssemblyInfo.cs b/Source/HaloSharp/Properties/AssemblyInfo.cs index 4d71c94..3edb056 100644 --- a/Source/HaloSharp/Properties/AssemblyInfo.cs +++ b/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")] \ No newline at end of file