diff --git a/.gitignore b/.gitignore index 49f40e7..1f06cde 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ _ReSharper*/ [Bb]uild/ *.nupkg /.vs/WowDotNetAPI/v15/sqlite3 +/.vs diff --git a/Explorers.Test/CharacterTests.cs b/Explorers.Test/CharacterTests.cs index 8f4764b..cb60fd8 100644 --- a/Explorers.Test/CharacterTests.cs +++ b/Explorers.Test/CharacterTests.cs @@ -418,5 +418,15 @@ public void Get_Artifact_Weapon() { Assert.IsTrue(briandek.Items.MainHand.ArtifactId > 0); Assert.IsTrue(briandek.Items.MainHand.Relics.Any()); } + + [TestMethod] + public void Get_Azerite_Level() { + var briandek = explorer.GetCharacter(Realm, CharacterName, CharacterOptions.GetEverything); + + Assert.IsNotNull(briandek.Items); + Assert.IsTrue(briandek.Items.Neck.AzeriteItem.AzeriteLevel >= 0); + Assert.IsTrue(briandek.Items.Neck.AzeriteItem.AzeriteExperience >= 0); + Assert.IsTrue(briandek.Items.Neck.AzeriteItem.AzeriteExperienceRemaining >= 0); + } } } diff --git a/Explorers.Test/Explorers.Test.csproj b/Explorers.Test/Explorers.Test.csproj index 878c234..ae6dd9c 100644 --- a/Explorers.Test/Explorers.Test.csproj +++ b/Explorers.Test/Explorers.Test.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,9 +11,10 @@ Properties WowDotNetAPI.Explorers.Test WowDotNetAPI.Explorers.Test - v4.0 + v4.7 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true @@ -23,6 +24,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,6 +33,7 @@ TRACE prompt 4 + false @@ -76,6 +79,7 @@ ResXFileCodeGenerator TestStrings.Designer.cs + Designer diff --git a/Explorers.Test/GuildTests.cs b/Explorers.Test/GuildTests.cs index db41c20..7b61a1b 100644 --- a/Explorers.Test/GuildTests.cs +++ b/Explorers.Test/GuildTests.cs @@ -135,5 +135,13 @@ public void Get_Guild_With_Connected_Realms() { List guildMembers = guild2.Members.Where(x => x.Character.Name.Equals("Danishpala", StringComparison.CurrentCultureIgnoreCase)).ToList(); Assert.AreEqual(0, guildMembers.Count(x => !x.Character.Realm.Equals(x.Character.GuildRealm))); } + + [TestMethod] + public void Get_Guild_With_Void_Elf_Character() { + WowExplorer explorer2 = new WowExplorer(Region.EU, Locale.en_GB, APIKey); + Guild guild2 = explorer2.GetGuild("argent dawn", "the chosen", GuildOptions.GetMembers); + var guildMember = guild2.Members.FirstOrDefault(x => x.Character.Name.Equals("Odd", StringComparison.CurrentCultureIgnoreCase)); + Assert.IsTrue(guildMember != null && guildMember.Character.Race == CharacterRace.VOID_ELF); + } } } diff --git a/Explorers/Explorers.csproj b/Explorers/Explorers.csproj index c3ba216..916dab1 100644 --- a/Explorers/Explorers.csproj +++ b/Explorers/Explorers.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties WowDotNetAPI WowDotNetAPI - v4.0 + v4.7 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +31,7 @@ TRACE prompt 4 + false false @@ -59,6 +61,8 @@ + + diff --git a/Explorers/Models/Character.cs b/Explorers/Models/Character.cs index 6c448d3..83a4b4f 100644 --- a/Explorers/Models/Character.cs +++ b/Explorers/Models/Character.cs @@ -40,7 +40,11 @@ public enum CharacterRace WORGEN = 22, PANDAREN_NEUTRAL = 24, PANDAREN_ALLIANCE = 25, - PANDAREN_HORDE = 26 + PANDAREN_HORDE = 26, + NIGHTBORNE = 27, + HIGHMOUNTAIN_TAUREN = 28, + VOID_ELF = 29, + LIGHTFORGED_DRAENEI = 30 } [DataContract] diff --git a/Explorers/Models/CharacterItem.cs b/Explorers/Models/CharacterItem.cs index da9e022..a250037 100644 --- a/Explorers/Models/CharacterItem.cs +++ b/Explorers/Models/CharacterItem.cs @@ -46,6 +46,13 @@ public class CharacterItem [DataMember(Name = "relics")] public IEnumerable Relics { get; set; } + // BFA + [DataMember(Name = "azeriteItem")] + public CharacterItemAzerite AzeriteItem { get; set; } + + [DataMember(Name = "azeriteEmpoweredItem")] + public IEnumerable AzeriteEmpoweredItems { get; set; } + public override string ToString() { return string.Format("{0}", Name); diff --git a/Explorers/Models/CharacterItemAzerite.cs b/Explorers/Models/CharacterItemAzerite.cs new file mode 100644 index 0000000..6d2182e --- /dev/null +++ b/Explorers/Models/CharacterItemAzerite.cs @@ -0,0 +1,15 @@ +using System.Runtime.Serialization; + +namespace WowDotNetAPI.Models { + [DataContract] + public class CharacterItemAzerite { + [DataMember(Name="azeriteLevel")] + public int AzeriteLevel { get; set; } + + [DataMember(Name = "azeriteExperience")] + public int AzeriteExperience { get; set; } + + [DataMember(Name = "azeriteExperienceRemaining")] + public int AzeriteExperienceRemaining { get; set; } + } +} diff --git a/Explorers/Models/CharacterItemAzeriteEmpoweredItem.cs b/Explorers/Models/CharacterItemAzeriteEmpoweredItem.cs new file mode 100644 index 0000000..1734c2f --- /dev/null +++ b/Explorers/Models/CharacterItemAzeriteEmpoweredItem.cs @@ -0,0 +1,7 @@ +using System.Runtime.Serialization; + +namespace WowDotNetAPI.Models { + [DataContract] + public class CharacterItemAzeriteEmpoweredItem { + } +} diff --git a/Explorers/Models/ItemTooltipParameters.cs b/Explorers/Models/ItemTooltipParameters.cs index 4445628..b244834 100644 --- a/Explorers/Models/ItemTooltipParameters.cs +++ b/Explorers/Models/ItemTooltipParameters.cs @@ -7,14 +7,14 @@ namespace WowDotNetAPI.Models { [DataContract] - public class ItemTooltipParameters - { + public class ItemTooltipParameters + { [DataMember(Name="gem0")] public int Gem0 { get; set; } - + [DataMember(Name = "gem1")] public int Gem1 { get; set; } - + [DataMember(Name = "gem2")] public int Gem2 { get; set; } @@ -37,6 +37,21 @@ public class ItemTooltipParameters public int Suffix { get; set; } [DataMember(Name = "upgrade")] - public ItemUpgrade ItemUpgrade { get; set; } - } + public ItemUpgrade ItemUpgrade { get; set; } + + [DataMember(Name = "azeritePower0")] + public int AzeritePower0 { get; set; } + + [DataMember(Name = "azeritePower1")] + public int AzeritePower1 { get; set; } + + [DataMember(Name = "azeritePower2")] + public int AzeritePower2 { get; set; } + + [DataMember(Name = "azeritePower3")] + public int AzeritePower3 { get; set; } + + [DataMember(Name = "azeritePowerLevel")] + public int AzeritePowerLevel { get; set; } + } } diff --git a/Explorers/Utilities/JsonUtility.cs b/Explorers/Utilities/JsonUtility.cs index a20d22e..5b2132f 100644 --- a/Explorers/Utilities/JsonUtility.cs +++ b/Explorers/Utilities/JsonUtility.cs @@ -36,6 +36,7 @@ public static string GetJSON(HttpWebRequest req) public static T FromJSON(string url) where T : class { HttpWebRequest req = WebRequest.Create(url) as HttpWebRequest; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; return FromJSON(req); }