From 6326b34f4e03403c09204995eb2a117de3f8c3f1 Mon Sep 17 00:00:00 2001
From: ellesde <ellesde@protonmail.com>
Date: Sat, 18 Apr 2020 14:59:20 -0400
Subject: [PATCH] Use hero assest url from v2 API

---
 E7 Gear Optimizer/App.config | 1 -
 E7 Gear Optimizer/Hero.cs    | 3 ++-
 E7 Gear Optimizer/Util.cs    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/E7 Gear Optimizer/App.config b/E7 Gear Optimizer/App.config
index 8930bfa..a2c5242 100644
--- a/E7 Gear Optimizer/App.config	
+++ b/E7 Gear Optimizer/App.config	
@@ -10,7 +10,6 @@
   </startup>
   <appSettings>
     <add key="ApiUrl" value="https://api.epicsevendb.com" />
-    <add key="AssetUrl" value="http://assets.epicsevendb.com" />
     <add key="GitHubUrl" value="https://github.com/Zarroc2762/E7-Gear-Optimizer/releases"/>
     <add key="GitHubApiUrl" value="https://api.github.com/repos/Zarroc2762/E7-Gear-Optimizer/releases/latest"/>
     <add key="Version" value="2.0.2.0"/>
diff --git a/E7 Gear Optimizer/Hero.cs b/E7 Gear Optimizer/Hero.cs
index ecdbc73..5477818 100644
--- a/E7 Gear Optimizer/Hero.cs	
+++ b/E7 Gear Optimizer/Hero.cs	
@@ -110,7 +110,8 @@ private Image getPortrait(string name)
                 }
                 else
                 {
-                    portrait = new Bitmap(Util.client.OpenRead(Util.AssetUrl + "/hero/" + Util.toAPIUrl(Name) + "/icon.png"));
+                    string json = loadJson();
+                    portrait = new Bitmap(Util.client.OpenRead(JObject.Parse(json)["results"][0]["assets"]["icon"].ToString()));
                     if (Properties.Settings.Default.UseCache)
                     {
                         portrait.Save(cacheFileName, ImageFormat.Png);
diff --git a/E7 Gear Optimizer/Util.cs b/E7 Gear Optimizer/Util.cs
index 331361b..958a2dd 100644
--- a/E7 Gear Optimizer/Util.cs	
+++ b/E7 Gear Optimizer/Util.cs	
@@ -92,7 +92,6 @@ public enum HeroClass
     public static class Util
     {
         public static string ApiUrl = System.Configuration.ConfigurationManager.AppSettings["ApiUrl"];
-        public static string AssetUrl = System.Configuration.ConfigurationManager.AppSettings["AssetUrl"];
         public static string GitHubUrl = System.Configuration.ConfigurationManager.AppSettings["GitHubUrl"];
         public static string GitHubApiUrl = System.Configuration.ConfigurationManager.AppSettings["GitHubApiUrl"];
         public static string ver = System.Configuration.ConfigurationManager.AppSettings["Version"];