Merge pull request #7 from Jebzou/develop

Discord Rich Presence
ElectronicObserverEN · Sep 4, 2019 · d65c41d · d65c41d
2 parents fd01c1f + a1576ea
commit d65c41d
Show file tree

Hide file tree

Showing 17 changed files with 4,227 additions and 3,749 deletions.
diff --git a/ElectronicObserver/App.config b/ElectronicObserver/App.config
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="ElectronicObserver.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
   </configSections>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
       </dependentAssembly>
     </assemblyBinding>
-    <enforceFIPSPolicy enabled="false"/>
+    <enforceFIPSPolicy enabled="false" />
   </runtime>
   <applicationSettings>
     <ElectronicObserver.Properties.Settings>

diff --git a/ElectronicObserver/Data/AdmiralData.cs b/ElectronicObserver/Data/AdmiralData.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static ElectronicObserver.Data.Constants;
 
 namespace ElectronicObserver.Data
 {
@@ -48,10 +49,15 @@ public int AdmiralID
 		/// </summary>
 		public int Rank => (int)RawData.api_rank;
 
-		/// <summary>
-		/// 提督経験値
+        /// <summary>
+		/// 階級
 		/// </summary>
-		public int Exp => (int)RawData.api_experience;
+		public string RankString => getRank(Rank);
+
+        /// <summary>
+        /// 提督経験値
+        /// </summary>
+        public int Exp => (int)RawData.api_experience;
 
 		/// <summary>
 		/// 提督コメント
@@ -127,11 +133,16 @@ public int Medals
 			get { return (int)RawData.api_medals; }
 		}
 
-
-		/// <summary>
-		/// 資源の自然回復上限
+        /// <summary>
+		/// Senka
 		/// </summary>
-		public int MaxResourceRegenerationAmount => Level * 250 + 750;
+		public int? Senka
+        { get; set; }
+
+        /// <summary>
+        /// 資源の自然回復上限
+        /// </summary>
+        public int MaxResourceRegenerationAmount => Level * 250 + 750;
 
 
 		public override void LoadFromRequest(string apiname, Dictionary<string, string> data)