Skip to content
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ _ReSharper*/
[Bb]uild/
*.nupkg
/.vs/WowDotNetAPI/v15/sqlite3
/.vs
10 changes: 10 additions & 0 deletions Explorers.Test/CharacterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
8 changes: 6 additions & 2 deletions Explorers.Test/Explorers.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -11,9 +11,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WowDotNetAPI.Explorers.Test</RootNamespace>
<AssemblyName>WowDotNetAPI.Explorers.Test</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -23,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -31,6 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
Expand Down Expand Up @@ -76,6 +79,7 @@
<EmbeddedResource Include="TestStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>TestStrings.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
8 changes: 8 additions & 0 deletions Explorers.Test/GuildTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,13 @@ public void Get_Guild_With_Connected_Realms() {
List<GuildMember> 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);
}
}
}
8 changes: 6 additions & 2 deletions Explorers/Explorers.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WowDotNetAPI</RootNamespace>
<AssemblyName>WowDotNetAPI</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -22,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -30,6 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
Expand Down Expand Up @@ -59,6 +61,8 @@
<Compile Include="Models\Challenges.cs" />
<Compile Include="Models\ChallengeTime.cs" />
<Compile Include="Models\CharacterHunterPet.cs" />
<Compile Include="Models\CharacterItemAzeriteEmpoweredItem.cs" />
<Compile Include="Models\CharacterItemAzerite.cs" />
<Compile Include="Models\CharacterItemRelic.cs" />
<Compile Include="Models\CharacterItemArtifactTrait.cs" />
<Compile Include="Models\CharacterMount.cs" />
Expand Down
6 changes: 5 additions & 1 deletion Explorers/Models/Character.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 7 additions & 0 deletions Explorers/Models/CharacterItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ public class CharacterItem
[DataMember(Name = "relics")]
public IEnumerable<CharacterItemRelic> Relics { get; set; }

// BFA
[DataMember(Name = "azeriteItem")]
public CharacterItemAzerite AzeriteItem { get; set; }

[DataMember(Name = "azeriteEmpoweredItem")]
public IEnumerable<CharacterItemAzeriteEmpoweredItem> AzeriteEmpoweredItems { get; set; }

public override string ToString()
{
return string.Format("{0}", Name);
Expand Down
15 changes: 15 additions & 0 deletions Explorers/Models/CharacterItemAzerite.cs
Original file line number Diff line number Diff line change
@@ -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; }
}
}
7 changes: 7 additions & 0 deletions Explorers/Models/CharacterItemAzeriteEmpoweredItem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using System.Runtime.Serialization;

namespace WowDotNetAPI.Models {
[DataContract]
public class CharacterItemAzeriteEmpoweredItem {
}
}
27 changes: 21 additions & 6 deletions Explorers/Models/ItemTooltipParameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand All @@ -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; }
}
}
1 change: 1 addition & 0 deletions Explorers/Utilities/JsonUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public static string GetJSON(HttpWebRequest req)
public static T FromJSON<T>(string url) where T : class
{
HttpWebRequest req = WebRequest.Create(url) as HttpWebRequest;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
return FromJSON<T>(req);
}

Expand Down