Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.5.3.0 #25

Merged
merged 2 commits into from
Jun 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@
"MapVariantResourceId": {
"$ref": "../common/variant.schema.json"
},
"ObjectivesCompleted": {
"type": [ "integer", "null" ]
},

"PlayerStats": {
"type": "array",
Expand Down
4 changes: 2 additions & 2 deletions Source/HaloSharp.Test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
8 changes: 8 additions & 0 deletions Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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));
}
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Source/HaloSharp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]