update

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.0.0.{build}
+version: 2.1.0.{build}
 image: Visual Studio 2017
 skip_tags: true
 

src/pubg-dotnet/Models/Common/PubgPlatform.cs

@@ -9,6 +9,10 @@ public enum PubgPlatform
     {
         [EnumMember(Value = "steam")]
         Steam,
+        [EnumMember(Value = "xbox")]
+        Xbox,
+        [EnumMember(Value = "psn")]
+        PlayStation,
         [EnumMember(Value = "kakao")]
         Kakao
     }

src/pubg-dotnet/Models/Common/PubgRegion.cs

@@ -20,6 +20,9 @@ public enum PubgRegion
          [EnumMember(Value = "xbox-oc")]
          XboxOceania,
 
+         [EnumMember(Value = "xbox-sa")]
+         XboxSouthAmerica,
+
          //PC Regions
          [EnumMember(Value = "pc-as")]
          PCAsia,

src/pubg-dotnet/Models/Leaderboard/PubgLeaderboard.cs

@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+using Pubg.Net.Models.Base;
+using System.Collections.Generic;
+
+namespace Pubg.Net
+{
+    public class PubgLeaderboard : PubgShardedEntity
+    {
+        [JsonProperty]
+        public PubgGameMode GameMode { get; set; }
+
+        [JsonProperty]
+        public IEnumerable<PubgLeaderboardPlayer> Players { get; set; }
+    }
+}

src/pubg-dotnet/Models/Leaderboard/PubgLeaderboardPlayer.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+using Pubg.Net.Models.Base;
+
+namespace Pubg.Net
+{
+    public class PubgLeaderboardPlayer : PubgShardedEntity
+    {
+        [JsonProperty]
+        public string Name { get; set; }
+
+        [JsonProperty]
+        public int Rank { get; set; }
+
+        [JsonProperty]
+        public PubgLeaderboardStats Stats { get; set; }
+    }
+}

src/pubg-dotnet/Models/Leaderboard/PubgLeaderboardStats.cs

@@ -0,0 +1,31 @@
+using Newtonsoft.Json;
+
+namespace Pubg.Net
+{
+    public class PubgLeaderboardStats
+    {
+        [JsonProperty]
+        public int AverageDamage { get; set; }
+
+        [JsonProperty]
+        public float AverageRank { get; set; }
+
+        [JsonProperty]
+        public int Games { get; set; }
+
+        [JsonProperty]
+        public int Kills { get; set; }
+
+        [JsonProperty]
+        public float KillDeathRatio { get; set; }
+
+        [JsonProperty]
+        public float RankPoints { get; set; }
+
+        [JsonProperty]
+        public float WinRatio { get; set; }
+
+        [JsonProperty]
+        public int Wins { get; set; }
+    }
+}

src/pubg-dotnet/Models/Match/PubgGameMode.cs

@@ -1,12 +1,15 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
+using Pubg.Net.Infrastructure.Attributes;
+using Pubg.Net.Infrastructure.JsonConverters;
 using System.Runtime.Serialization;
 
 namespace Pubg.Net
 {
-    [JsonConverter(typeof(StringEnumConverter))]
+    [JsonConverter(typeof(DefaultValueStringEnumConverter))]
     public enum PubgGameMode
     {
+        [DefaultEnumMember]
+        Unknown,
         [EnumMember(Value = "squad")]
         Squad,
         [EnumMember(Value = "squad-fpp")]
@@ -19,9 +22,17 @@ public enum PubgGameMode
         Duo,
         [EnumMember(Value = "duo-fpp")]
         DuoFPP,
-        [EnumMember(Value = "warmodetpp")]
-        WarModeTPP,
-        [EnumMember(Value = "warmodefpp")]
-        WarModeFPP
+        [EnumMember(Value = "normal-duo")]
+        NormalDuo,
+        [EnumMember(Value = "normal-duo-fpp")]
+        NormalDuoFPP,
+        [EnumMember(Value = "normal-solo")]
+        NormalSolo,
+        [EnumMember(Value = "normal-solo-fpp")]
+        NormalSoloFPP,
+        [EnumMember(Value = "normal-squad")]
+        NormalSquad,
+        [EnumMember(Value = "normal-squad-fpp")]
+        NormalSquadFPP
     }
 }

src/pubg-dotnet/Models/Match/PubgMatch.cs

@@ -1,5 +1,7 @@
 using Newtonsoft.Json;
 using Pubg.Net.Models.Base;
+using Pubg.Net.Models.Seasons;
+using System;
 using System.Collections.Generic;
 
 namespace Pubg.Net
@@ -10,7 +12,7 @@ public class PubgMatch : PubgShardedEntity
         public string CreatedAt { get; set; }
 
         [JsonProperty]
-        public int Duration { get; set; }
+        public long Duration { get; set; }
 
         [JsonProperty]
         public IEnumerable<PubgRoster> Rosters { get; set; }
@@ -25,7 +27,7 @@ public class PubgMatch : PubgShardedEntity
         public PubgMatchStats Stats { get; set; }
 
         [JsonProperty]
-        public string GameMode { get; set; }
+        public PubgGameMode GameMode { get; set; }
 
         [JsonProperty]
         public string PatchVersion { get; set; }
@@ -41,5 +43,8 @@ public class PubgMatch : PubgShardedEntity
 
         [JsonProperty]
         public bool IsCustomMatch { get; set; }
+
+        [JsonProperty]
+        public PubgSeasonState SeasonState { get; set; }
     }
 }

src/pubg-dotnet/Models/Seasons/PubgSeasonState.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using Pubg.Net.Infrastructure.Attributes;
+using Pubg.Net.Infrastructure.JsonConverters;
+using System.Runtime.Serialization;
+
+namespace Pubg.Net.Models.Seasons
+{
+    [JsonConverter(typeof(DefaultValueStringEnumConverter))]
+    public enum PubgSeasonState
+    {
+        [DefaultEnumMember]
+        Unknown,
+        [EnumMember(Value = "closed")]
+        Closed,
+        [EnumMember(Value = "prepare")]
+        Prepare,
+        [EnumMember(Value = "progress")]
+        Progress
+    }
+}

src/pubg-dotnet/Models/Stats/PubgGameModeStats.cs

@@ -58,6 +58,9 @@ public class PubgGameModeStats
         [JsonProperty]
         public float RankPoints { get; set; }
 
+        [JsonProperty]
+        public PubgRankPointsTitle RankPointsTitle { get; set; }
+
         [JsonProperty]
         public int Revives { get; set; }
 

src/pubg-dotnet/Models/Stats/PubgParticipantStats.cs

@@ -56,9 +56,6 @@ public class PubgParticipantStats
         [JsonProperty]
         public int MostDamage { get; set; }
 
-        [JsonProperty]
-        public float RankPoints { get; set; }
-
         [JsonProperty]
         public int Revives { get; set; }
 

src/pubg-dotnet/Models/Stats/PubgRankPointsTitle.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+using Pubg.Net.Infrastructure.Attributes;
+using Pubg.Net.Infrastructure.JsonConverters;
+using System.Runtime.Serialization;
+
+namespace Pubg.Net.Models.Stats
+{
+    [JsonConverter(typeof(DefaultValueStringEnumConverter))]
+    public enum PubgRankPointsTitle
+    {
+        [DefaultEnumMember]
+        Unknown,
+        [EnumMember(Value = "BEGINNER")]
+        Beginner,
+        [EnumMember(Value = "NOVICE")]
+        Novice,
+        [EnumMember(Value = "EXPERIENCED")]
+        Experienced,
+        [EnumMember(Value = "SKILLED")]
+        Skilled,
+        [EnumMember(Value = "SPECIALIST")]
+        Specialist,
+        [EnumMember(Value = "EXPERT")]
+        Expert,
+        [EnumMember(Value = "SURVIVOR")]
+        Survivor,
+        [EnumMember(Value = "LONE SURVIVOR")]
+        LoneSurvivor
+    }
+}

src/pubg-dotnet/Models/Telemetry/Events/LogPlayerAttack.cs

@@ -14,6 +14,9 @@ public class LogPlayerAttack : PubgTelemetryEvent
         [JsonProperty]
         public PubgAttackType AttackType { get; set; }
 
+        [JsonProperty]
+        public int FireWeaponStackCount { get; set; }
+
         [JsonProperty]
         public PubgItem Weapon { get; set; }
 

src/pubg-dotnet/Models/Telemetry/Events/LogPlayerPosition.cs

@@ -12,5 +12,8 @@ public class LogPlayerPosition : PubgTelemetryEvent
 
         [JsonProperty]
         public int NumAlivePlayers { get; set; }
+
+        [JsonProperty]
+        public PubgVehicle Vehicle { get; set; }
     }
 }

src/pubg-dotnet/Services/Leaderboard/PubgLeaderboardService.cs

@@ -0,0 +1,35 @@
+using JsonApiSerializer;
+using Newtonsoft.Json;
+using Pubg.Net.Infrastructure;
+using Pubg.Net.Values;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Pubg.Net.Services.Leaderboard
+{
+    public class PubgLeaderboardService : PubgService
+    {
+        public PubgLeaderboardService() : base() { }
+        public PubgLeaderboardService(string apiKey) : base(apiKey) { }
+
+        public virtual PubgLeaderboard GetGameModeLeaderboard(PubgPlatform platform, PubgGameMode gameMode, string apiKey = null)
+        {
+            var url = Api.Leaderboard.LeaderboardEndpoint(platform, gameMode);
+            apiKey = string.IsNullOrEmpty(apiKey) ? ApiKey : apiKey;
+
+            var leaderboardJson = HttpRequestor.GetString(url, apiKey);
+
+            return JsonConvert.DeserializeObject<PubgLeaderboard>(leaderboardJson, new JsonApiSerializerSettings());
+        }
+
+        public virtual async Task<PubgLeaderboard> GetGameModeLeaderboardAsync(PubgPlatform platform, PubgGameMode gameMode, string apiKey = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var url = Api.Leaderboard.LeaderboardEndpoint(platform, gameMode);
+            apiKey = string.IsNullOrEmpty(apiKey) ? ApiKey : apiKey;
+
+            var leaderboardJson = await HttpRequestor.GetStringAsync(url, cancellationToken, apiKey).ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<PubgLeaderboard>(leaderboardJson, new JsonApiSerializerSettings());
+        }
+    }
+}