From 9b56b5cb5483313a9ab21fe15a6910dbf8810acc Mon Sep 17 00:00:00 2001
From: veigr <veigr@cat-ears.net>
Date: Fri, 10 Jun 2016 10:12:43 +0900
Subject: [PATCH 01/16] =?UTF-8?q?Fixed=20#195:=2033=E5=BC=8F=E7=B4=A2?=
 =?UTF-8?q?=E6=95=B5=E8=A8=88=E7=AE=97=E5=BC=8F=E3=81=AE=E6=94=B9=E4=BF=AE?=
 =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E4=BB=98=E5=8A=A0=E3=81=AB=E8=AA=A4=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E8=89=A6=E8=BC=89=E6=A9=9F=E7=86=9F=E7=B7=B4=E5=BA=A6?=
 =?UTF-8?q?=E3=82=92=E7=94=A8=E3=81=84=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/Grabacr07.KanColleWrapper/Models/ViewRange.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs b/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs
index 742488bfd..5268daf09 100644
--- a/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs
@@ -221,7 +221,7 @@ public override double Calc(Fleet[] fleets)
 			var itemScore = ships
 				.SelectMany(x => x.EquippedItems)
 				.Select(x => x.Item)
-				.Sum(x => (x.Info.ViewRange + GetAdeptCoefficient(x)) * GetTypeCoefficient(x.Info.Type));
+				.Sum(x => (x.Info.ViewRange + GetLevelCoefficient(x)) * GetTypeCoefficient(x.Info.Type));
 
 			var shipScore = ships
 				.Select(x => x.ViewRange - x.EquippedItems.Sum(s => s.Item.Info.RawData.api_saku))
@@ -255,17 +255,17 @@ private Ship[] GetTargetShips(Fleet[] fleets)
 			return new Ship[0];
 		}
 
-		private static double GetAdeptCoefficient(SlotItem item)
+		private static double GetLevelCoefficient(SlotItem item)
 		{
 			switch (item.Info.Type)
 			{
 				case SlotItemType.水上偵察機:
-					return Math.Sqrt(item.Adept) * 1.2;
+					return Math.Sqrt(item.Level) * 1.2;
 
 				case SlotItemType.小型電探:
 				case SlotItemType.大型電探:
 				case SlotItemType.大型電探_II:
-					return Math.Sqrt(item.Adept) * 1.25;
+					return Math.Sqrt(item.Level) * 1.25;
 
 				default:
 					return 0;

From 001a78be3b5b41ecf81df523aeb3de3b91c9f3fc Mon Sep 17 00:00:00 2001
From: veigr <veigr@cat-ears.net>
Date: Sun, 19 Jun 2016 21:44:18 +0900
Subject: [PATCH 02/16] =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B9=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8B2=E6=A1=81=E3=81=BE=E3=81=A7=E3=81=AB=E5=88=87?=
 =?UTF-8?q?=E3=82=8A=E6=8D=A8=E3=81=A6=E3=81=97=E3=81=A6=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Contents/Fleets/FleetStateViewModel.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
index 84b83bea4..cc75cbb50 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
@@ -23,7 +23,7 @@ public class FleetStateViewModel : ViewModel
 
 		public string MaxAirSuperiorityPotential => this.Source.MaxAirSuperiorityPotential.ToString("##0");
 
-		public string ViewRange => this.Source.ViewRange.ToString("##0.##");
+		public string ViewRange => (Math.Floor(this.Source.ViewRange * 100) / 100).ToString("##0.##");
 
 		public string Speed
 		{

From 141862dc2ae28636805e62db255f849d8acca784 Mon Sep 17 00:00:00 2001
From: veigr <veigr@cat-ears.net>
Date: Sun, 19 Jun 2016 22:31:32 +0900
Subject: [PATCH 03/16] =?UTF-8?q?*=20QuestType=20=E3=81=AE=202016/06/06=20?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=AF=BE=E5=BF=9C=20*=20=E3=80=8C=E5=85=A8?=
 =?UTF-8?q?=E3=80=8D=E4=BB=BB=E5=8B=99=E3=82=BF=E3=83=96=E3=81=AE=E3=81=BF?=
 =?UTF-8?q?=E3=82=92=E3=83=87=E3=83=BC=E3=82=BF=E5=8F=96=E5=BE=97=E5=AF=BE?=
 =?UTF-8?q?=E8=B1=A1=E3=81=A8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/QuestType.cs                       | 21 +++++++------------
 source/Grabacr07.KanColleWrapper/Quests.cs    |  2 ++
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/Models/QuestType.cs b/source/Grabacr07.KanColleWrapper/Models/QuestType.cs
index 95cfbb8d4..bf7d41d95 100644
--- a/source/Grabacr07.KanColleWrapper/Models/QuestType.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/QuestType.cs
@@ -10,34 +10,29 @@ namespace Grabacr07.KanColleWrapper.Models
 	/// </summary>
 	public enum QuestType
 	{
-		/// <summary>
-		/// 1 回のみの任務。
-		/// </summary>
-		OneTime = 1,
-
 		/// <summary>
 		/// デイリー任務。
 		/// </summary>
-		Daily = 2,
+		Daily = 1,
 
 		/// <summary>
 		/// ウィークリー任務。
 		/// </summary>
-		Weekly = 3,
+		Weekly = 2,
 
 		/// <summary>
-		/// 日付の一の位が3,7,0の日のみ出現する任務。
+		/// マンスリー任務。
 		/// </summary>
-		X3X7X0 = 4,
+		Monthly = 3,
 
 		/// <summary>
-		/// 日付の一の位が2,8の日のみ出現する任務。
+		/// 1 回のみの任務。
 		/// </summary>
-		X2X8 = 5,
+		OneTime = 4,
 
 		/// <summary>
-		/// マンスリー任務。
+		/// その他。
 		/// </summary>
-		Monthly = 6,
+		Other = 5,
 	}
 }
diff --git a/source/Grabacr07.KanColleWrapper/Quests.cs b/source/Grabacr07.KanColleWrapper/Quests.cs
index 0c71f34f3..adea916a7 100644
--- a/source/Grabacr07.KanColleWrapper/Quests.cs
+++ b/source/Grabacr07.KanColleWrapper/Quests.cs
@@ -14,6 +14,7 @@
 using Grabacr07.KanColleWrapper.Internal;
 using Grabacr07.KanColleWrapper.Models;
 using Grabacr07.KanColleWrapper.Models.Raw;
+using System.Web;
 
 namespace Grabacr07.KanColleWrapper
 {
@@ -108,6 +109,7 @@ internal Quests(KanColleProxy proxy)
 			this.All = this.Current = new List<Quest>();
 
 			proxy.api_get_member_questlist
+				.Where(x => HttpUtility.ParseQueryString(x.Request.BodyAsString)["api_tab_id"] == "0")
 				.Select(Serialize)
 				.Where(x => x != null)
 				.Subscribe(this.Update);

From 0c5f4988f4c79aece976db4561606f5e0d64c33c Mon Sep 17 00:00:00 2001
From: Manato KAMEYA <grabacr07+github@gmail.com>
Date: Sun, 19 Jun 2016 23:13:53 +0900
Subject: [PATCH 04/16] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E3=81=8B?=
 =?UTF-8?q?=E3=81=88=E3=81=BE=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/Grabacr07.KanColleViewer/KanColleViewer.csproj | 1 +
 source/KanColleViewer.sln.DotSettings                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
index becd2939f..d8bbecacf 100644
--- a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
+++ b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -37,6 +37,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/source/KanColleViewer.sln.DotSettings b/source/KanColleViewer.sln.DotSettings
index d02b631ae..70276cb3d 100644
--- a/source/KanColleViewer.sln.DotSettings
+++ b/source/KanColleViewer.sln.DotSettings
@@ -7,6 +7,7 @@
 	<s:Boolean x:Key="/Default/CodeEditing/TypingAssist/Xaml/AutoInsertTagFooter/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Grabacr07_002EKanColleViewer_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AccessToModifiedClosure/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoNotCallOverridableMethodsInConstructor/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ExplicitCallerInfoArgument/@EntryIndexedValue">HINT</s:String>

From e93b2cb51076a0501b529ded75793e13cf9bd501 Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Mon, 20 Jun 2016 01:50:09 +0900
Subject: [PATCH 05/16] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?=
 =?UTF-8?q?=E3=83=AA=E6=9B=B4=E6=96=B0=20=E3=81=82=E3=81=A8=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E4=B8=8A=E3=81=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/Grabacr07.KanColleViewer/KanColleViewer.csproj       | 4 ++--
 source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs  | 2 +-
 source/Grabacr07.KanColleViewer/packages.config             | 2 +-
 source/Grabacr07.KanColleViewer/readme.txt                  | 4 +++-
 source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj     | 4 ++--
 source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec     | 2 +-
 source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs | 4 ++--
 source/Grabacr07.KanColleWrapper/packages.config            | 2 +-
 source/MetroRadiance                                        | 2 +-
 source/MetroTrilithon                                       | 2 +-
 source/Plugins/TaskbarProgress/TaskbarProgress.csproj       | 2 +-
 source/Plugins/TaskbarProgress/packages.config              | 2 +-
 12 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
index d8bbecacf..68ca33dbe 100644
--- a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
+++ b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -86,8 +86,8 @@
       <HintPath>..\packages\Nekoxy.1.5.2.20\lib\net45\Nekoxy.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="StatefulModel, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StatefulModel.0.5.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
+    <Reference Include="StatefulModel">
+      <HintPath>..\packages\StatefulModel.0.6.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
index 66bbe0fa8..565f9a56c 100644
--- a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -15,4 +15,4 @@
 	ResourceDictionaryLocation.None,
 	ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("4.2.5.0")]
+[assembly: AssemblyVersion("4.2.6.0")]
diff --git a/source/Grabacr07.KanColleViewer/packages.config b/source/Grabacr07.KanColleViewer/packages.config
index 8a366094e..437a66756 100644
--- a/source/Grabacr07.KanColleViewer/packages.config
+++ b/source/Grabacr07.KanColleViewer/packages.config
@@ -11,5 +11,5 @@
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="Rx-WPF" version="2.2.5" targetFramework="net45" />
   <package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
-  <package id="StatefulModel" version="0.5.0" targetFramework="net46" />
+  <package id="StatefulModel" version="0.6.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/readme.txt b/source/Grabacr07.KanColleViewer/readme.txt
index f54ef0bdf..17d423892 100644
--- a/source/Grabacr07.KanColleViewer/readme.txt
+++ b/source/Grabacr07.KanColleViewer/readme.txt
@@ -1,6 +1,6 @@
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 提督業も忙しい！ (KanColleViewer)
-                                             version 4.2.1  2016/02/12
+                                             version 4.2.6  2016/06/20
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 
@@ -167,6 +167,8 @@ Desktop Toast
 
 ■更新履歴
 
+2016/06/20 - version 4.2.6 リリース
+ (わすれました)
 2016/02/12 - version 4.2.1 リリース
 2016/02/08 - version 4.2 リリース
 2015/11/10 - version 4.1.6 リリース
diff --git a/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj b/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
index 08af9dc3c..10fe59956 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
+++ b/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
@@ -62,8 +62,8 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="StatefulModel, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StatefulModel.0.5.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
+    <Reference Include="StatefulModel">
+      <HintPath>..\packages\StatefulModel.0.6.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec b/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec
index 0ccc04856..8f26fbb85 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec
+++ b/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec
@@ -15,7 +15,7 @@
     <dependencies>
       <dependency id="Nekoxy" version="1.5.2" />
       <dependency id="Rx-Main" version="2.2.5" />
-      <dependency id="StatefulModel" version="0.5.0" />
+      <dependency id="StatefulModel" version="0.6.0" />
       <dependency id="MetroTrilithon" version="0.1.7" />
     </dependencies>
   </metadata>
diff --git a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
index 62d964519..ac65a8a5c 100644
--- a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
@@ -10,5 +10,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("8A13AB28-4E9F-423D-80AD-23EEF2821959")]
 
-[assembly: AssemblyVersion("1.5.2")]
-[assembly: AssemblyInformationalVersion("1.5.2")]
+[assembly: AssemblyVersion("1.5.3")]
+[assembly: AssemblyInformationalVersion("1.5.3")]
diff --git a/source/Grabacr07.KanColleWrapper/packages.config b/source/Grabacr07.KanColleWrapper/packages.config
index a8ef60b9b..7b1ae0be1 100644
--- a/source/Grabacr07.KanColleWrapper/packages.config
+++ b/source/Grabacr07.KanColleWrapper/packages.config
@@ -12,5 +12,5 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="StatefulModel" version="0.5.0" targetFramework="net45" />
+  <package id="StatefulModel" version="0.6.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/source/MetroRadiance b/source/MetroRadiance
index 4e416a846..2b091772a 160000
--- a/source/MetroRadiance
+++ b/source/MetroRadiance
@@ -1 +1 @@
-Subproject commit 4e416a8461d9fb367f0cffdc7526c40fcf72eda7
+Subproject commit 2b091772a2907172c9b8788a9f8920c0087d098e
diff --git a/source/MetroTrilithon b/source/MetroTrilithon
index 25bb02e7e..bd31e38ce 160000
--- a/source/MetroTrilithon
+++ b/source/MetroTrilithon
@@ -1 +1 @@
-Subproject commit 25bb02e7ea2494730498287043ae335c8d555abc
+Subproject commit bd31e38ce976fdc7a1689057f3b775fa9cec0f51
diff --git a/source/Plugins/TaskbarProgress/TaskbarProgress.csproj b/source/Plugins/TaskbarProgress/TaskbarProgress.csproj
index 3f3b80fb0..28bc36231 100644
--- a/source/Plugins/TaskbarProgress/TaskbarProgress.csproj
+++ b/source/Plugins/TaskbarProgress/TaskbarProgress.csproj
@@ -42,7 +42,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="StatefulModel, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\StatefulModel.0.5.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
+      <HintPath>..\..\packages\StatefulModel.0.6.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/source/Plugins/TaskbarProgress/packages.config b/source/Plugins/TaskbarProgress/packages.config
index 7c8f44d45..7e88d0938 100644
--- a/source/Plugins/TaskbarProgress/packages.config
+++ b/source/Plugins/TaskbarProgress/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="LivetCask" version="1.3.1.0" targetFramework="net46" />
-  <package id="StatefulModel" version="0.5.0" targetFramework="net46" />
+  <package id="StatefulModel" version="0.6.0" targetFramework="net46" />
 </packages>
\ No newline at end of file

From 3d941f1a45befb488a23db73019916abc157f4c5 Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Sat, 2 Jul 2016 00:23:47 +0900
Subject: [PATCH 06/16] =?UTF-8?q?=E5=AF=BE=E6=BD=9C=E3=82=BD=E3=83=BC?=
 =?UTF-8?q?=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KanColleViewer.csproj                     | 33 +++++++++----------
 .../Catalogs/ShipCatalogSortWorker.cs         |  2 ++
 .../Views/Behaviors/ScreenshotAction.cs       |  2 +-
 .../Views/Catalogs/ShipCatalogWindow.xaml     | 17 ++++++++++
 .../Views/Controls/KanColleHost.cs            |  2 +-
 .../Grabacr07.KanColleWrapper/Models/Ship.cs  |  2 ++
 6 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
index 68ca33dbe..8dd47ac64 100644
--- a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
+++ b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -618,13 +618,28 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="readme.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\LICENSE.txt">
+      <Visible>False</Visible>
+      <Link>license.txt</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\licenses\*.*">
+      <Visible>False</Visible>
+      <Link>Licenses\%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <COMReference Include="MSHTML">
       <Guid>{3050F1C5-98B5-11CF-BB82-00AA00BDCE0B}</Guid>
       <VersionMajor>4</VersionMajor>
       <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
+      <WrapperTool>primary</WrapperTool>
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
@@ -638,22 +653,6 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="readme.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\LICENSE.txt">
-      <Visible>False</Visible>
-      <Link>license.txt</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\licenses\*.*">
-      <Visible>False</Visible>
-      <Link>Licenses\%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs
index 747d8b522..b90ecf9bc 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs
@@ -27,6 +27,7 @@ public class ShipCatalogSortWorker : ViewModel
 		public static readonly SortableColumn LuckColumn = new SortableColumn { Name = "運", KeySelector = x => x.Luck.Current, DefaultIsDescending = true, };
 		public static readonly SortableColumn HPColumn = new SortableColumn { Name = "耐久", KeySelector = x => x.HP.Maximum, DefaultIsDescending = true, };
 		public static readonly SortableColumn ViewRangeColumn = new SortableColumn { Name = "索敵", KeySelector = x => x.ViewRange, DefaultIsDescending = true, };
+		public static readonly SortableColumn ASWColumn = new SortableColumn { Name = "対潜", KeySelector = x => x.ASW, DefaultIsDescending = true, };
 		public static readonly SortableColumn TimeToRepairColumn = new SortableColumn { Name = "修復時間", KeySelector = x => x.TimeToRepair.Ticks, DefaultIsDescending = true, };
 
 		public static SortableColumn[] Columns { get; set; }
@@ -48,6 +49,7 @@ static ShipCatalogSortWorker()
 				LuckColumn,
 				HPColumn,
 				ViewRangeColumn,
+				ASWColumn,
 				TimeToRepairColumn,
 			};
 		}
diff --git a/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs b/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
index 4b981e017..d520e201d 100644
--- a/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
+++ b/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
@@ -9,7 +9,7 @@
 using Grabacr07.KanColleViewer.Win32;
 using Livet.Behaviors.Messaging;
 using Livet.Messaging;
-using MSHTML;
+using mshtml;
 using SHDocVw;
 using IServiceProvider = Grabacr07.KanColleViewer.Win32.IServiceProvider;
 using WebBrowser = System.Windows.Controls.WebBrowser;
diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
index 0701c3a13..409e41d84 100644
--- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -815,6 +815,23 @@
 								</GridViewColumn.CellTemplate>
 							</GridViewColumn>
 
+							<GridViewColumn Width="45">
+								<GridViewColumn.Header>
+									<metro2:SortButton MethodName="Sort"
+													   MethodParameter="{x:Static viewModels:ShipCatalogSortWorker.ASWColumn}">
+										<TextBlock Text="対潜"
+												   ToolTip="装備によるステータス上昇を含んだ値です" />
+									</metro2:SortButton>
+								</GridViewColumn.Header>
+								<GridViewColumn.CellTemplate>
+									<DataTemplate>
+										<TextBlock Text="{Binding Ship.ASW, Mode=OneWay}"
+												   Foreground="{DynamicResource ActiveForegroundBrushKey}"
+												   Margin="0,3" />
+									</DataTemplate>
+								</GridViewColumn.CellTemplate>
+							</GridViewColumn>
+
 							<GridViewColumn Width="{Binding ShipSallyAreaFilter.ColumnWidth}">
 								<GridViewColumn.Header>
 									<TextBlock Text="出撃海域" />
diff --git a/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs b/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
index a026481bb..0989e1479 100644
--- a/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
+++ b/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
@@ -9,9 +9,9 @@
 using System.Windows.Navigation;
 using Grabacr07.KanColleViewer.Models;
 using Grabacr07.KanColleViewer.ViewModels;
+using mshtml;
 using MetroRadiance.Interop;
 using MetroTrilithon.UI.Controls;
-using MSHTML;
 using SHDocVw;
 using IServiceProvider = Grabacr07.KanColleViewer.Win32.IServiceProvider;
 using WebBrowser = System.Windows.Controls.WebBrowser;
diff --git a/source/Grabacr07.KanColleWrapper/Models/Ship.cs b/source/Grabacr07.KanColleWrapper/Models/Ship.cs
index b988c96b3..df05f63fb 100644
--- a/source/Grabacr07.KanColleWrapper/Models/Ship.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/Ship.cs
@@ -306,6 +306,8 @@ public TimeSpan TimeToRepair
 		/// </summary>
 		public int ViewRange => this.RawData.api_sakuteki.Get(0) ?? 0;
 
+		public int ASW => this.RawData.api_taisen.Get(0) ?? 0;
+
 		/// <summary>
 		/// 火力・雷装・対空・装甲のすべてのステータス値が最大値に達しているかどうかを示す値を取得します。
 		/// </summary>

From d90c87560e1ed3330ef9895a92b0ab48aa88ec1d Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Sat, 2 Jul 2016 05:26:54 +0900
Subject: [PATCH 07/16] =?UTF-8?q?#198=20=E6=9A=AB=E5=AE=9A=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=20(=E6=A7=98=E5=AD=90=E8=A6=8B=E7=89=88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KanColleClient.cs                         | 39 +++++++------------
 source/KanColleViewer.sln.DotSettings         |  2 +
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/KanColleClient.cs b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
index e435dd58e..853fc8cb0 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleClient.cs
+++ b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
-using Grabacr07.KanColleWrapper.Models;
 using Grabacr07.KanColleWrapper.Models.Raw;
 
 namespace Grabacr07.KanColleWrapper
@@ -98,32 +96,23 @@ private KanColleClient()
 		public void Initialieze()
 		{
 			var proxy = this.Proxy ?? (this.Proxy = new KanColleProxy());
-			var requireInfoSource = proxy.api_get_member_require_info
-				.TryParse<kcsapi_require_info>()
-				.FirstAsync()
-				.ToTask();
 
-			proxy.api_start2.FirstAsync().Subscribe(async session =>
-			{
-				var timeout = Task.Delay(TimeSpan.FromSeconds(20));
-				var canInitialize = await Task.WhenAny(requireInfoSource, timeout) != timeout;
-
-				SvData<kcsapi_start2> svd;
-				if (!SvData.TryParse(session, out svd)) return;
-
-				this.Master = new Master(svd.Data);
-				if (this.Homeport == null) this.Homeport = new Homeport(proxy);
-
-				if (canInitialize)
+			proxy.api_start2
+				.TryParse<kcsapi_start2>()
+				.Zip(
+					proxy.api_get_member_require_info.TryParse<kcsapi_require_info>(),
+					(start2, requireInfo) => new { start2 = start2.Data, requireInfo = requireInfo.Data, })
+				.Subscribe(x =>
 				{
-					var requireInfo = await requireInfoSource;
-					this.Homeport.UpdateAdmiral(requireInfo.Data.api_basic);
-					this.Homeport.Itemyard.Update(requireInfo.Data.api_slot_item);
-					this.Homeport.Dockyard.Update(requireInfo.Data.api_kdock);
-				}
+					this.Master = new Master(x.start2);
+					if (this.Homeport == null) this.Homeport = new Homeport(proxy);
+
+					this.Homeport.UpdateAdmiral(x.requireInfo.api_basic);
+					this.Homeport.Itemyard.Update(x.requireInfo.api_slot_item);
+					this.Homeport.Dockyard.Update(x.requireInfo.api_kdock);
 
-				this.IsStarted = true;
-			});
+					this.IsStarted = true;
+				});
 		}
 	}
 }
diff --git a/source/KanColleViewer.sln.DotSettings b/source/KanColleViewer.sln.DotSettings
index 70276cb3d..9663e507e 100644
--- a/source/KanColleViewer.sln.DotSettings
+++ b/source/KanColleViewer.sln.DotSettings
@@ -12,8 +12,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoNotCallOverridableMethodsInConstructor/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ExplicitCallerInfoArgument/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAnonymousTypePropertyName/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantIfElseBlock/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantNameQualifier/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantThisQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>

From 1fc9adb0e2d2a911f55c5d490569b01199614cf6 Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Sun, 3 Jul 2016 01:59:22 +0900
Subject: [PATCH 08/16] =?UTF-8?q?#198=20=E8=B5=B7=E5=8B=95=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E6=9C=80=E9=81=A9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KanColleClient.cs                         | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/KanColleClient.cs b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
index 853fc8cb0..df4924c74 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleClient.cs
+++ b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive;
+using System.Reactive.Concurrency;
 using System.Reactive.Linq;
+using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
 using Grabacr07.KanColleWrapper.Models.Raw;
 
@@ -97,22 +100,37 @@ public void Initialieze()
 		{
 			var proxy = this.Proxy ?? (this.Proxy = new KanColleProxy());
 
-			proxy.api_start2
-				.TryParse<kcsapi_start2>()
-				.Zip(
-					proxy.api_get_member_require_info.TryParse<kcsapi_require_info>(),
-					(start2, requireInfo) => new { start2 = start2.Data, requireInfo = requireInfo.Data, })
-				.Subscribe(x =>
-				{
-					this.Master = new Master(x.start2);
-					if (this.Homeport == null) this.Homeport = new Homeport(proxy);
+			var start2Source = proxy.api_start2.TryParse<kcsapi_start2>();
+			var requireInfoSource = proxy.api_get_member_require_info.TryParse<kcsapi_require_info>();
+			var firstTime = start2Source
+				.CombineLatest(requireInfoSource, (start2, requireInfo) => new { start2, requireInfo, })
+				.FirstAsync();
 
-					this.Homeport.UpdateAdmiral(x.requireInfo.api_basic);
-					this.Homeport.Itemyard.Update(x.requireInfo.api_slot_item);
-					this.Homeport.Dockyard.Update(x.requireInfo.api_kdock);
+			// Homeport の初期化と require_info の適用に Master のインスタンスが必要なため、初回のみ足並み揃えて実行
+			// 2 回目以降は受信したタイミングでそれぞれ更新すればよい
 
-					this.IsStarted = true;
-				});
+			firstTime.Subscribe(x =>
+			{
+				this.Master = new Master(x.start2.Data);
+				this.Homeport = new Homeport(proxy);
+				this.SetRequireInfo(x.requireInfo.Data);
+				this.IsStarted = true;
+			});
+
+			start2Source
+				.SkipUntil(firstTime)
+				.Subscribe(x => this.Master = new Master(x.Data));
+
+			requireInfoSource
+				.SkipUntil(firstTime)
+				.Subscribe(x => this.SetRequireInfo(x.Data));
+		}
+
+		private void SetRequireInfo(kcsapi_require_info data)
+		{
+			this.Homeport.UpdateAdmiral(data.api_basic);
+			this.Homeport.Itemyard.Update(data.api_slot_item);
+			this.Homeport.Dockyard.Update(data.api_kdock);
 		}
 	}
 }

From ebfe4ea0e1cd390f129984d726c4a3f1695867b7 Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Sun, 3 Jul 2016 02:01:03 +0900
Subject: [PATCH 09/16] =?UTF-8?q?(=E8=A9=A6=E8=A1=8C=E9=8C=AF=E8=AA=A4?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E7=97=95=E8=B7=A1=E3=81=8C=E8=A6=8B=E3=81=88?=
 =?UTF-8?q?=E3=81=A6=E3=81=AF=E3=81=9A=E3=81=8B=E3=81=97=E3=81=84=E3=82=84?=
 =?UTF-8?q?=E3=81=A4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/Grabacr07.KanColleWrapper/KanColleClient.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/KanColleClient.cs b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
index df4924c74..be91a1868 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleClient.cs
+++ b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
 using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
 using Grabacr07.KanColleWrapper.Models.Raw;
 

From 82451c7ff419fd60492cbba49aef9073d08e1e9a Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Sun, 3 Jul 2016 08:46:56 +0900
Subject: [PATCH 10/16] =?UTF-8?q?=E5=88=B6=E7=A9=BA=E8=A8=88=E7=AE=97?=
 =?UTF-8?q?=E3=81=AE=E5=86=8D=E5=AE=9F=E8=A3=85=20=E3=83=BBCalculator=20?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E5=88=B6=E7=A9=BA=E8=A8=88=E7=AE=97=E3=81=AE?=
 =?UTF-8?q?=E3=81=BF=E5=88=87=E3=82=8A=E5=87=BA=E3=81=97=E3=81=A6=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D=E7=9B=B4=E3=81=97=20=E3=83=BB=E6=94=B9=E4=BF=AE?=
 =?UTF-8?q?=E5=80=A4=E3=81=AB=E3=82=88=E3=82=8B=E5=88=B6=E7=A9=BA=E5=80=A4?=
 =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=8A=E3=82=B9=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Catalogs/SlotItemCatalogViewModel.cs      |   2 +-
 .../ViewModels/Catalogs/SlotItemCounter.cs    |   2 +-
 .../Contents/Fleets/FleetStateViewModel.cs    |   2 -
 .../Views/FleetWindow.xaml                    |   2 +-
 .../Grabacr07.KanColleWrapper/Calculator.cs   | 140 ------------
 .../KanColleWrapper.csproj                    |   1 +
 .../Models/AirSuperiorityPotential.cs         | 205 ++++++++++++++++++
 .../Models/FleetState.cs                      |  27 +--
 .../Models/SlotItem.cs                        |   8 +-
 .../Models/SlotItemInfo.cs                    |  34 +--
 .../Models/SlotItemType.cs                    |  31 ++-
 11 files changed, 251 insertions(+), 203 deletions(-)
 create mode 100644 source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs

diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
index dcaf9a814..7408723e9 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
@@ -93,7 +93,7 @@ private static List<SlotItemCounter> UpdateCore()
 			{
 				foreach (var target in ship.EquippedItems.Select(slot => new { slot, counter = dic[slot.Item.Info.Id] }))
 				{
-					target.counter.AddShip(ship, target.slot.Item.Level, target.slot.Item.Adept);
+					target.counter.AddShip(ship, target.slot.Item.Level, target.slot.Item.Proficiency);
 				}
 			}
 
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs
index 1089132ec..332e9e0a0 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs
@@ -45,7 +45,7 @@ public SlotItemCounter(SlotItemInfo target, IEnumerable<SlotItem> items)
 			this.Target = target;
 
 			this.itemsByLevel = items
-				.GroupBy(x => new SlotItemCounterKey(x.Level, x.Adept))
+				.GroupBy(x => new SlotItemCounterKey(x.Level, x.Proficiency))
 				.ToDictionary(
 					x => x.Key,
 					x => new SlotItemCounterByLevel { CounterKey = x.Key, Count = x.Count(), }
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
index cc75cbb50..e01178db4 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
@@ -17,8 +17,6 @@ public class FleetStateViewModel : ViewModel
 
 		public string TotalLevel => this.Source.TotalLevel.ToString("###0");
 
-		public string AirSuperiorityPotential => this.Source.AirSuperiorityPotential.ToString("##0");
-
 		public string MinAirSuperiorityPotential => this.Source.MinAirSuperiorityPotential.ToString("##0");
 
 		public string MaxAirSuperiorityPotential => this.Source.MaxAirSuperiorityPotential.ToString("##0");
diff --git a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml
index c57c8c9a8..84700155b 100644
--- a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml
@@ -385,7 +385,7 @@
 												<Run Text="{Binding Item.Info.Name, Mode=OneWay}" />
 												<Run Text="{Binding Item.LevelText, Mode=OneWay}"
 													 Foreground="#FF45A9A5" />
-												<Run Text="{Binding Item.AdeptText, Mode=OneWay}"
+												<Run Text="{Binding Item.ProficiencyText, Mode=OneWay}"
 													 Foreground="{DynamicResource ForegroundBrushKey}" />
 											</TextBlock>
 										</Grid>
diff --git a/source/Grabacr07.KanColleWrapper/Calculator.cs b/source/Grabacr07.KanColleWrapper/Calculator.cs
index 8abb31095..6a8bee0f1 100644
--- a/source/Grabacr07.KanColleWrapper/Calculator.cs
+++ b/source/Grabacr07.KanColleWrapper/Calculator.cs
@@ -8,146 +8,6 @@ namespace Grabacr07.KanColleWrapper
 {
 	internal static class Calculator
 	{
-		#region 制空値計算
-
-		/// <summary>
-		/// 装備と搭載数を指定して、スロット単位の制空能力を計算します。
-		/// </summary>
-		/// <param name="slotItem">対空能力を持つ装備。</param>
-		/// <param name="onslot">搭載数。</param>
-		/// <returns></returns>
-		public static int CalcAirSuperiorityPotential(this SlotItem slotItem, int onslot)
-		{
-			if (slotItem.Info.IsAirSuperiorityFighter)
-			{
-				return (int)(slotItem.Info.AA * Math.Sqrt(onslot));
-			}
-
-			return 0;
-		}
-		/// <summary>
-		/// 指定した艦の制空能力を計算します。
-		/// </summary>
-		public static int CalcAirSuperiorityPotential(this Ship ship)
-		{
-			return ship.EquippedItems
-				.Select(x => x.Item.CalcAirSuperiorityPotential(x.Current))
-				.Sum();
-		}
-
-		/// <summary>
-		/// 指定した艦の制空能力の最小値を計算します。
-		/// </summary>
-		public static int CalcMinAirSuperiorityPotential(this Ship ship)
-		{
-			return ship.EquippedItems
-				.Select(x => (x.Item.Info.Type == SlotItemType.艦上戦闘機
-							|| x.Item.Info.Type == SlotItemType.水上戦闘機
-								? x.Item.CalcAirSuperiorityPotential(x.Current)
-								: 0)
-							 + x.Item.CalcMinAirecraftAdeptBonus(x.Current))
-				.Select(x => (int)x)
-				.Sum();
-		}
-
-		/// <summary>
-		/// 指定した艦の制空能力の最大値を計算します。
-		/// </summary>
-		public static int CalcMaxAirSuperiorityPotential(this Ship ship)
-		{
-			return ship.EquippedItems
-				.Select(x => x.Item.CalcAirSuperiorityPotential(x.Current)
-							+ x.Item.CalcMaxAirecraftAdeptBonus(x.Current))
-				.Select(x => (int)x)
-				.Sum();
-		}
-
-		/// <summary>
-		/// 熟練度による制空能力ボーナス最小値を計算します。
-		/// </summary>
-		/// <param name="slotItem">対空能力を持つ装備。</param>
-		/// <param name="onslot">搭載数。</param>
-		/// <returns></returns>
-		private static double CalcMinAirecraftAdeptBonus(this SlotItem slotItem, int onslot)
-		{
-			if(onslot < 1) return 0;
-			return slotItem.Info.Type == SlotItemType.艦上戦闘機
-				|| slotItem.Info.Type == SlotItemType.水上戦闘機
-				? slotItem.CalcAirecraftAdeptBonusOfType() + slotItem.CalcMinInternalAirecraftAdeptBonus()
-				: 0; // 艦戦・水戦以外は簡単に吹き飛ぶので最小値としては計算に入れない
-		}
-
-		/// <summary>
-		/// 熟練度による制空能力ボーナス最大値を計算します。
-		/// </summary>
-		/// <param name="slotItem">対空能力を持つ装備。</param>
-		/// <param name="onslot">搭載数。</param>
-		/// <returns></returns>
-		private static double CalcMaxAirecraftAdeptBonus(this SlotItem slotItem, int onslot)
-			=> onslot < 1 ? 0
-			: slotItem.CalcAirecraftAdeptBonusOfType() + slotItem.CalcMaxInternalAirecraftAdeptBonus();
-
-		/// <summary>
-		/// 各表記熟練度に対応した機種別熟練度ボーナスを計算します。
-		/// </summary>
-		/// <param name="slotItem"></param>
-		/// <returns></returns>
-		private static int CalcAirecraftAdeptBonusOfType(this SlotItem slotItem)
-			=> slotItem.Info.Type == SlotItemType.艦上戦闘機
-			|| slotItem.Info.Type == SlotItemType.水上戦闘機
-				? slotItem.Adept == 1 ? 0
-				: slotItem.Adept == 2 ? 2
-				: slotItem.Adept == 3 ? 5
-				: slotItem.Adept == 4 ? 9
-				: slotItem.Adept == 5 ? 14
-				: slotItem.Adept == 6 ? 14
-				: slotItem.Adept == 7 ? 22
-				: 0 // Adept == 0
-			: slotItem.Info.Type == SlotItemType.水上爆撃機
-				? slotItem.Adept == 1 ? 0
-				: slotItem.Adept == 2 ? 1
-				: slotItem.Adept == 3 ? 1
-				: slotItem.Adept == 4 ? 1
-				: slotItem.Adept == 5 ? 3
-				: slotItem.Adept == 6 ? 3
-				: slotItem.Adept == 7 ? 6
-				: 0 // Adept == 0
-			: 0;
-
-		/// <summary>
-		/// 各表記熟練度に対応した艦載機内部熟練度ボーナスの最小値を計算します。
-		/// </summary>
-		/// <param name="slotItem"></param>
-		/// <returns></returns>
-		private static double CalcMinInternalAirecraftAdeptBonus(this SlotItem slotItem)
-		{
-			return slotItem.Info.IsAirSuperiorityFighter
-				? Math.Sqrt((slotItem.Adept != 0 ? (slotItem.Adept - 1) * 15 + 10 : 0) / 10d)
-				: 0;
-		}
-
-		/// <summary>
-		/// 各表記熟練度に対応した艦載機内部熟練度ボーナスの最大値を計算します。
-		/// </summary>
-		/// <param name="slotItem"></param>
-		/// <returns></returns>
-		private static double CalcMaxInternalAirecraftAdeptBonus(this SlotItem slotItem)
-		{
-			if (!slotItem.Info.IsAirSuperiorityFighter)
-				return 0;
-			switch (slotItem.Adept)
-			{
-				case 0:
-					return Math.Sqrt(9d / 10);
-				case 7:
-					return Math.Sqrt(120d / 10);
-				default:
-					return Math.Sqrt((slotItem.Adept * 15 + 9) / 10d);
-			}
-		}
-
-		#endregion
-
 		public static double CalcViewRange(this Fleet fleet)
 		{
 			return ViewRangeCalcLogic.Get(KanColleClient.Current.Settings.ViewRangeCalcType).Calc(new[] { fleet });
diff --git a/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj b/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
index 10fe59956..b309b6c9d 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
+++ b/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
@@ -95,6 +95,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Models\AirSuperiorityPotential.cs" />
     <Compile Include="Annotations\DarkAttribute.cs" />
     <Compile Include="Annotations\ElementalAttribute.cs" />
     <Compile Include="Annotations\LightAttribute.cs" />
diff --git a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
new file mode 100644
index 000000000..373f41616
--- /dev/null
+++ b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Grabacr07.KanColleWrapper.Models
+{
+	[Flags]
+	public enum AirSuperiorityCalculationOptions
+	{
+		Default = Maximum,
+
+		Minimum = InternalProficiencyMinValue | Fighter,
+		Maximum = InternalProficiencyMaxValue | Fighter | Attacker | SeaplaneBomber,
+
+		/// <summary>艦上戦闘機、水上戦闘機。</summary>
+		Fighter = 0x0001,
+
+		/// <summary>艦上攻撃機、艦上爆撃機。</summary>
+		Attacker = 0x0002,
+
+		/// <summary>水上爆撃機。</summary>
+		SeaplaneBomber = 0x0004,
+
+		/// <summary>内部熟練度最小値による計算。</summary>
+		InternalProficiencyMinValue = 0x0100,
+
+		/// <summary>内部熟練度最小値による計算。</summary>
+		InternalProficiencyMaxValue = 0x0200,
+	}
+
+	public static class AirSuperiorityPotential
+	{
+		/// <summary>
+		/// 指定した艦の制空能力を計算します。
+		/// </summary>
+		public static int GetAirSuperiorityPotential(this Ship ship, AirSuperiorityCalculationOptions options = AirSuperiorityCalculationOptions.Default)
+		{
+			return ship.EquippedItems
+				.Select(x => GetAirSuperiorityPotential(x.Item, x.Current, options))
+				.Sum();
+		}
+
+		/// <summary>
+		/// 装備と搭載数を指定して、スロット単位の制空能力を計算します。
+		/// </summary>
+		public static int GetAirSuperiorityPotential(this SlotItem slotItem, int onslot, AirSuperiorityCalculationOptions options = AirSuperiorityCalculationOptions.Default)
+		{
+			var calculator = slotItem.GetCalculator();
+			return options.HasFlag(calculator.Options) && onslot >= 1
+				? calculator.GetAirSuperiority(slotItem, onslot, options)
+				: 0;
+		}
+
+		private static AirSuperiorityCalculator GetCalculator(this SlotItem slotItem)
+		{
+			switch (slotItem.Info.Type)
+			{
+				case SlotItemType.艦上戦闘機:
+				case SlotItemType.水上戦闘機:
+					return new Fighter();
+
+				case SlotItemType.艦上攻撃機:
+				case SlotItemType.艦上爆撃機:
+					return new Attacker();
+
+				case SlotItemType.水上爆撃機:
+					return new SeaplaneBomber();
+
+				default:
+					return Empty.Instance;
+			}
+		}
+
+		private abstract class AirSuperiorityCalculator
+		{
+			public abstract AirSuperiorityCalculationOptions Options { get; }
+
+			public int GetAirSuperiority(SlotItem slotItem, int onslot, AirSuperiorityCalculationOptions options)
+			{
+				// 装備の対空値とスロットの搭載数による制空値
+				var airSuperiority = this.GetAirSuperiority(slotItem, onslot);
+
+				// 装備の熟練度による制空値ボーナス
+				airSuperiority += this.GetProficiencyBonus(slotItem, options);
+
+				// 装備の改修値による制空値ボーナス
+				airSuperiority += this.GetLevelBonus(slotItem, onslot);
+
+				return (int)airSuperiority;
+			}
+
+			protected virtual double GetAirSuperiority(SlotItem slotItem, int onslot)
+			{
+				return slotItem.Info.AA * Math.Sqrt(onslot);
+			}
+
+			protected abstract double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options);
+
+			protected abstract double GetLevelBonus(SlotItem slotItem, int onSlot);
+		}
+
+		#region AirSuperiorityCalculator 派生型
+
+		private class Fighter : AirSuperiorityCalculator
+		{
+			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.Fighter;
+
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
+			{
+				var proficiencyValue = slotItem.GetProficiencyValue();
+				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0) + proficiencyValue.FighterBonus;
+			}
+
+			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
+			{
+				return slotItem.Level >= 1
+					? slotItem.Level * .2 + Math.Sqrt(onSlot)
+					: .0;
+			}
+		}
+
+		private class Attacker : AirSuperiorityCalculator
+		{
+			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.Attacker;
+
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
+			{
+				var proficiencyValue = slotItem.GetProficiencyValue();
+				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0);
+			}
+
+			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
+			{
+				return .0;
+			}
+		}
+
+		private class SeaplaneBomber : AirSuperiorityCalculator
+		{
+			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.SeaplaneBomber;
+
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
+			{
+				var proficiencyValue = slotItem.GetProficiencyValue();
+				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0) + proficiencyValue.SeaplaneBomberBonus;
+			}
+
+			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
+			{
+				return .0;
+			}
+		}
+
+		private class Empty : AirSuperiorityCalculator
+		{
+			public static Empty Instance { get; } = new Empty();
+
+			public override AirSuperiorityCalculationOptions Options => ~AirSuperiorityCalculationOptions.Default;
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options) => .0;
+			protected override double GetLevelBonus(SlotItem slotItem, int onSlot) => .0;
+
+			private Empty() { }
+		}
+
+		#endregion
+
+		private class ProficiencyValue
+		{
+			private readonly int internalMinValue;
+			private readonly int internalMaxValue;
+
+			public int FighterBonus { get; }
+			public int SeaplaneBomberBonus { get; }
+
+			public ProficiencyValue(int internalMin, int internalMax, int fighterBonus, int seaplaneBomberBonus)
+			{
+				this.internalMinValue = internalMin;
+				this.internalMaxValue = internalMax;
+				this.FighterBonus = fighterBonus;
+				this.SeaplaneBomberBonus = seaplaneBomberBonus;
+			}
+
+			public int GetInternalValue(AirSuperiorityCalculationOptions options)
+			{
+				if (options.HasFlag(AirSuperiorityCalculationOptions.InternalProficiencyMinValue)) return this.internalMinValue;
+				if (options.HasFlag(AirSuperiorityCalculationOptions.InternalProficiencyMaxValue)) return this.internalMaxValue;
+				return (this.internalMaxValue + this.internalMinValue) / 2; // <- めっちゃ適当
+			}
+		}
+
+		private static readonly Dictionary<int, ProficiencyValue> proficiencyValues = new Dictionary<int, ProficiencyValue>()
+		{
+			{ 0, new ProficiencyValue(0, 9, 0, 0) },
+			{ 1, new ProficiencyValue(10, 24, 0, 0) },
+			{ 2, new ProficiencyValue(25, 39, 2, 1) },
+			{ 3, new ProficiencyValue(40, 54, 5, 1) },
+			{ 4, new ProficiencyValue(55, 69, 9, 1) },
+			{ 5, new ProficiencyValue(70, 84, 14, 3) },
+			{ 6, new ProficiencyValue(85, 99, 14, 3) },
+			{ 7, new ProficiencyValue(100, 120, 22, 6) },
+		};
+
+		private static ProficiencyValue GetProficiencyValue(this SlotItem slotItem) => proficiencyValues[Math.Max(Math.Min(slotItem.Proficiency, 7), 0)];
+	}
+}
diff --git a/source/Grabacr07.KanColleWrapper/Models/FleetState.cs b/source/Grabacr07.KanColleWrapper/Models/FleetState.cs
index 54d033878..84f50333d 100644
--- a/source/Grabacr07.KanColleWrapper/Models/FleetState.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/FleetState.cs
@@ -60,28 +60,6 @@ private set
 
 		#endregion
 
-		#region AirSuperiorityPotential 変更通知プロパティ
-
-		private double _AirSuperiorityPotential;
-
-		/// <summary>
-		/// 艦隊の制空能力を取得します。
-		/// </summary>
-		public double AirSuperiorityPotential
-		{
-			get { return this._AirSuperiorityPotential; }
-			private set
-			{
-				if (this._AirSuperiorityPotential != value)
-				{
-					this._AirSuperiorityPotential = value;
-					this.RaisePropertyChanged();
-				}
-			}
-		}
-
-		#endregion
-
 		#region MinAirSuperiorityPotential 変更通知プロパティ
 
 		private double _MinAirSuperiorityPotential;
@@ -257,9 +235,8 @@ public void Calculate()
 
 			this.TotalLevel = ships.HasItems() ? ships.Sum(x => x.Level) : 0;
 			this.AverageLevel = ships.HasItems() ? (double)this.TotalLevel / ships.Length : 0.0;
-			this.AirSuperiorityPotential = firstFleetShips.Sum(s => s.CalcAirSuperiorityPotential());
-			this.MinAirSuperiorityPotential = firstFleetShips.Sum(s => s.CalcMinAirSuperiorityPotential());
-			this.MaxAirSuperiorityPotential = firstFleetShips.Sum(s => s.CalcMaxAirSuperiorityPotential());
+			this.MinAirSuperiorityPotential = firstFleetShips.Sum(x => x.GetAirSuperiorityPotential(AirSuperiorityCalculationOptions.Minimum));
+			this.MaxAirSuperiorityPotential = firstFleetShips.Sum(x => x.GetAirSuperiorityPotential(AirSuperiorityCalculationOptions.Maximum));
 			this.Speed = ships.All(x => x.Info.Speed == ShipSpeed.Fast)
 				? FleetSpeed.Fast
 				: ships.All(x => x.Info.Speed == ShipSpeed.Low)
diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs
index cecee0943..a2a625a3d 100644
--- a/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs
@@ -16,11 +16,11 @@ public class SlotItem : RawDataWrapper<kcsapi_slotitem>, IIdentifiable
 
 		public string LevelText => this.Level >= 10 ? "★max" : this.Level >= 1 ? ("★+" + this.Level) : "";
 
-		public string NameWithLevel => $"{this.Info.Name}{(this.Level >= 1 ? (" " + this.LevelText) : "")}{(this.Adept >= 1 ? (" " + this.AdeptText) : "")}";
+		public string NameWithLevel => $"{this.Info.Name}{(this.Level >= 1 ? (" " + this.LevelText) : "")}{(this.Proficiency >= 1 ? (" " + this.ProficiencyText) : "")}";
 
-		public int Adept => this.RawData.api_alv;
+		public int Proficiency => this.RawData.api_alv;
 
-		public string AdeptText => this.Adept >= 1 ? (" (熟練度 " + this.Adept + ")") : "";
+		public string ProficiencyText => this.Proficiency >= 1 ? (" (熟練度 " + this.Proficiency + ")") : "";
 
 		internal SlotItem(kcsapi_slotitem rawData)
 			: base(rawData)
@@ -40,7 +40,7 @@ public void Remodel(int level, int masterId)
 
 		public override string ToString()
 		{
-			return $"ID = {this.Id}, Name = \"{this.Info.Name}\", Level = {this.Level}, Adapt = {this.Adept}";
+			return $"ID = {this.Id}, Name = \"{this.Info.Name}\", Level = {this.Level}, Proficiency = {this.Proficiency}";
 		}
 
 
diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs
index ee7777814..9ddb1cd8a 100644
--- a/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
+using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Grabacr07.KanColleWrapper.Internal;
 using Grabacr07.KanColleWrapper.Models.Raw;
@@ -73,22 +72,7 @@ public class SlotItemInfo : RawDataWrapper<kcsapi_mst_slotitem>, IIdentifiable
 		/// </summary>
 		public int ViewRange => this.RawData.api_saku;
 
-		/// <summary>
-		/// 制空戦に参加できる戦闘機または水上機かどうかを示す値を取得します。
-		/// </summary>
-		public bool IsAirSuperiorityFighter => this.Type == SlotItemType.艦上戦闘機
-											   || this.Type == SlotItemType.艦上攻撃機
-											   || this.Type == SlotItemType.艦上爆撃機
-											   || this.Type == SlotItemType.水上爆撃機
-											   || this.Type == SlotItemType.水上戦闘機;
-
-		public bool IsNumerable => this.Type == SlotItemType.艦上偵察機
-								   || this.Type == SlotItemType.艦上戦闘機
-								   || this.Type == SlotItemType.艦上攻撃機
-								   || this.Type == SlotItemType.艦上爆撃機
-								   || this.Type == SlotItemType.水上偵察機
-								   || this.Type == SlotItemType.水上爆撃機
-								   || this.Type == SlotItemType.水上戦闘機;
+		public bool IsNumerable => this.Type.IsNumerable();
 
 		public SlotItemEquipType EquipType { get; }
 
@@ -104,12 +88,14 @@ public override string ToString()
 
 		#region static members
 
-	    public static SlotItemInfo Dummy { get; } = new SlotItemInfo(new kcsapi_mst_slotitem()
-		{
-		    api_id = 0,
-		    api_name = "？？？",
-		}, new MasterTable<SlotItemEquipType>());
+		public static SlotItemInfo Dummy { get; } = new SlotItemInfo(
+			new kcsapi_mst_slotitem()
+			{
+				api_id = 0,
+				api_name = "？？？",
+			},
+			new MasterTable<SlotItemEquipType>());
 
-	    #endregion
+		#endregion
 	}
 }
diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs
index 5b9b7007e..104aada4d 100644
--- a/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// ReSharper disable InconsistentNaming
 
 namespace Grabacr07.KanColleWrapper.Models
 {
@@ -59,4 +55,29 @@ public enum SlotItemType
 		大型電探_II = 93,
 		艦上偵察機_II = 94,
 	}
+
+	public static class SlotItemTypeExtensions
+	{
+		public static bool IsNumerable(this SlotItemType type)
+		{
+			switch (type)
+			{
+				case SlotItemType.艦上偵察機:
+				case SlotItemType.艦上偵察機_II:
+				case SlotItemType.艦上戦闘機:
+				case SlotItemType.艦上攻撃機:
+				case SlotItemType.艦上爆撃機:
+				case SlotItemType.水上偵察機:
+				case SlotItemType.水上爆撃機:
+				case SlotItemType.水上戦闘機:
+				case SlotItemType.オートジャイロ:
+				case SlotItemType.対潜哨戒機:
+				case SlotItemType.大型飛行艇:
+					return true;
+
+				default:
+					return false;
+			}
+		}
+	}
 }

From b8810a012accf85295e5fe59950068b06843b1ba Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Mon, 4 Jul 2016 08:11:05 +0900
Subject: [PATCH 11/16] =?UTF-8?q?=E5=BE=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/AirSuperiorityPotential.cs                      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
index 373f41616..bdbbe674f 100644
--- a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
@@ -24,14 +24,14 @@ public enum AirSuperiorityCalculationOptions
 		/// <summary>内部熟練度最小値による計算。</summary>
 		InternalProficiencyMinValue = 0x0100,
 
-		/// <summary>内部熟練度最小値による計算。</summary>
+		/// <summary>内部熟練度最大値による計算。</summary>
 		InternalProficiencyMaxValue = 0x0200,
 	}
 
 	public static class AirSuperiorityPotential
 	{
 		/// <summary>
-		/// 指定した艦の制空能力を計算します。
+		/// 艦娘の制空能力を計算します。
 		/// </summary>
 		public static int GetAirSuperiorityPotential(this Ship ship, AirSuperiorityCalculationOptions options = AirSuperiorityCalculationOptions.Default)
 		{
@@ -114,7 +114,7 @@ protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityC
 			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
 			{
 				return slotItem.Level >= 1
-					? slotItem.Level * .2 + Math.Sqrt(onSlot)
+					? slotItem.Level * 0.2 + Math.Sqrt(onSlot)
 					: .0;
 			}
 		}
@@ -156,6 +156,7 @@ private class Empty : AirSuperiorityCalculator
 			public static Empty Instance { get; } = new Empty();
 
 			public override AirSuperiorityCalculationOptions Options => ~AirSuperiorityCalculationOptions.Default;
+			protected override double GetAirSuperiority(SlotItem slotItem, int onslot) => .0;
 			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options) => .0;
 			protected override double GetLevelBonus(SlotItem slotItem, int onSlot) => .0;
 

From c672cefc26b547e273945bc9b736d35fa9bd7f50 Mon Sep 17 00:00:00 2001
From: Manato KAMEYA <kameya@lifebear.co.jp>
Date: Tue, 5 Jul 2016 17:33:40 +0900
Subject: [PATCH 12/16] =?UTF-8?q?=E6=94=B9=E4=BF=AE=E3=83=9C=E3=83=BC?=
 =?UTF-8?q?=E3=83=8A=E3=82=B9=E8=A8=88=E7=AE=97=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/AirSuperiorityPotential.cs                         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
index bdbbe674f..d3840aaf3 100644
--- a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
@@ -113,9 +113,7 @@ protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityC
 
 			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
 			{
-				return slotItem.Level >= 1
-					? slotItem.Level * 0.2 + Math.Sqrt(onSlot)
-					: .0;
+				return slotItem.Level * 0.2;
 			}
 		}
 

From 3fd844f39e0e2182ae3dac0ced65f365b07ce99b Mon Sep 17 00:00:00 2001
From: Manato KAMEYA <kameya@lifebear.co.jp>
Date: Tue, 5 Jul 2016 19:37:20 +0900
Subject: [PATCH 13/16] =?UTF-8?q?0.2=E2=98=85=E3=80=81=E5=88=B6=E7=A9=BA?=
 =?UTF-8?q?=E5=80=A4=E3=81=AB=E5=8A=A0=E7=AE=97=E3=81=A7=E3=81=AA=E3=81=8F?=
 =?UTF-8?q?=E5=AF=BE=E7=A9=BA=E5=80=A4=E3=81=AB=E5=8A=A0=E7=AE=97=E3=81=A0?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/AirSuperiorityPotential.cs         | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
index d3840aaf3..9d746b349 100644
--- a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
@@ -83,9 +83,6 @@ public int GetAirSuperiority(SlotItem slotItem, int onslot, AirSuperiorityCalcul
 				// 装備の熟練度による制空値ボーナス
 				airSuperiority += this.GetProficiencyBonus(slotItem, options);
 
-				// 装備の改修値による制空値ボーナス
-				airSuperiority += this.GetLevelBonus(slotItem, onslot);
-
 				return (int)airSuperiority;
 			}
 
@@ -95,8 +92,6 @@ protected virtual double GetAirSuperiority(SlotItem slotItem, int onslot)
 			}
 
 			protected abstract double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options);
-
-			protected abstract double GetLevelBonus(SlotItem slotItem, int onSlot);
 		}
 
 		#region AirSuperiorityCalculator 派生型
@@ -105,15 +100,16 @@ private class Fighter : AirSuperiorityCalculator
 		{
 			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.Fighter;
 
-			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
+			protected override double GetAirSuperiority(SlotItem slotItem, int onslot)
 			{
-				var proficiencyValue = slotItem.GetProficiencyValue();
-				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0) + proficiencyValue.FighterBonus;
+				// 装備改修による対空値加算 (★ x 0.2)
+				return (slotItem.Info.AA + slotItem.Level * 0.2) * Math.Sqrt(onslot);
 			}
 
-			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
 			{
-				return slotItem.Level * 0.2;
+				var proficiencyValue = slotItem.GetProficiencyValue();
+				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0) + proficiencyValue.FighterBonus;
 			}
 		}
 
@@ -126,11 +122,6 @@ protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityC
 				var proficiencyValue = slotItem.GetProficiencyValue();
 				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0);
 			}
-
-			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
-			{
-				return .0;
-			}
 		}
 
 		private class SeaplaneBomber : AirSuperiorityCalculator
@@ -142,11 +133,6 @@ protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityC
 				var proficiencyValue = slotItem.GetProficiencyValue();
 				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0) + proficiencyValue.SeaplaneBomberBonus;
 			}
-
-			protected override double GetLevelBonus(SlotItem slotItem, int onSlot)
-			{
-				return .0;
-			}
 		}
 
 		private class Empty : AirSuperiorityCalculator
@@ -156,7 +142,6 @@ private class Empty : AirSuperiorityCalculator
 			public override AirSuperiorityCalculationOptions Options => ~AirSuperiorityCalculationOptions.Default;
 			protected override double GetAirSuperiority(SlotItem slotItem, int onslot) => .0;
 			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options) => .0;
-			protected override double GetLevelBonus(SlotItem slotItem, int onSlot) => .0;
 
 			private Empty() { }
 		}

From 6e094784a2055ac6e582e5d6036808af52e7b2a4 Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Tue, 5 Jul 2016 21:26:19 +0900
Subject: [PATCH 14/16] =?UTF-8?q?=E5=90=8D=E5=89=8D=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/AirSuperiorityPotential.cs         | 59 ++++++++++---------
 source/KanColleViewer.sln.DotSettings         |  2 +
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
index 9d746b349..d1e850378 100644
--- a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
@@ -57,17 +57,17 @@ private static AirSuperiorityCalculator GetCalculator(this SlotItem slotItem)
 			{
 				case SlotItemType.艦上戦闘機:
 				case SlotItemType.水上戦闘機:
-					return new Fighter();
+					return new FighterCalculator();
 
 				case SlotItemType.艦上攻撃機:
 				case SlotItemType.艦上爆撃機:
-					return new Attacker();
+					return new AttackerCalculator();
 
 				case SlotItemType.水上爆撃機:
-					return new SeaplaneBomber();
+					return new SeaplaneBomberCalculator();
 
 				default:
-					return Empty.Instance;
+					return EmptyCalculator.Instance;
 			}
 		}
 
@@ -96,7 +96,7 @@ protected virtual double GetAirSuperiority(SlotItem slotItem, int onslot)
 
 		#region AirSuperiorityCalculator 派生型
 
-		private class Fighter : AirSuperiorityCalculator
+		private class FighterCalculator : AirSuperiorityCalculator
 		{
 			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.Fighter;
 
@@ -108,47 +108,47 @@ protected override double GetAirSuperiority(SlotItem slotItem, int onslot)
 
 			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
 			{
-				var proficiencyValue = slotItem.GetProficiencyValue();
-				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0) + proficiencyValue.FighterBonus;
+				var proficiency = slotItem.GetProficiency();
+				return Math.Sqrt(proficiency.GetInternalValue(options) / 10.0) + proficiency.FighterBonus;
 			}
 		}
 
-		private class Attacker : AirSuperiorityCalculator
+		private class AttackerCalculator : AirSuperiorityCalculator
 		{
 			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.Attacker;
 
 			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
 			{
-				var proficiencyValue = slotItem.GetProficiencyValue();
-				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0);
+				var proficiency = slotItem.GetProficiency();
+				return Math.Sqrt(proficiency.GetInternalValue(options) / 10.0);
 			}
 		}
 
-		private class SeaplaneBomber : AirSuperiorityCalculator
+		private class SeaplaneBomberCalculator : AirSuperiorityCalculator
 		{
 			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.SeaplaneBomber;
 
 			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
 			{
-				var proficiencyValue = slotItem.GetProficiencyValue();
-				return Math.Sqrt(proficiencyValue.GetInternalValue(options) / 10.0) + proficiencyValue.SeaplaneBomberBonus;
+				var proficiency = slotItem.GetProficiency();
+				return Math.Sqrt(proficiency.GetInternalValue(options) / 10.0) + proficiency.SeaplaneBomberBonus;
 			}
 		}
 
-		private class Empty : AirSuperiorityCalculator
+		private class EmptyCalculator : AirSuperiorityCalculator
 		{
-			public static Empty Instance { get; } = new Empty();
+			public static EmptyCalculator Instance { get; } = new EmptyCalculator();
 
 			public override AirSuperiorityCalculationOptions Options => ~AirSuperiorityCalculationOptions.Default;
 			protected override double GetAirSuperiority(SlotItem slotItem, int onslot) => .0;
 			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options) => .0;
 
-			private Empty() { }
+			private EmptyCalculator() { }
 		}
 
 		#endregion
 
-		private class ProficiencyValue
+		private class Proficiency
 		{
 			private readonly int internalMinValue;
 			private readonly int internalMaxValue;
@@ -156,7 +156,7 @@ private class ProficiencyValue
 			public int FighterBonus { get; }
 			public int SeaplaneBomberBonus { get; }
 
-			public ProficiencyValue(int internalMin, int internalMax, int fighterBonus, int seaplaneBomberBonus)
+			public Proficiency(int internalMin, int internalMax, int fighterBonus, int seaplaneBomberBonus)
 			{
 				this.internalMinValue = internalMin;
 				this.internalMaxValue = internalMax;
@@ -164,6 +164,9 @@ public ProficiencyValue(int internalMin, int internalMax, int fighterBonus, int
 				this.SeaplaneBomberBonus = seaplaneBomberBonus;
 			}
 
+			/// <summary>
+			/// 内部熟練度値を取得します。
+			/// </summary>
 			public int GetInternalValue(AirSuperiorityCalculationOptions options)
 			{
 				if (options.HasFlag(AirSuperiorityCalculationOptions.InternalProficiencyMinValue)) return this.internalMinValue;
@@ -172,18 +175,18 @@ public int GetInternalValue(AirSuperiorityCalculationOptions options)
 			}
 		}
 
-		private static readonly Dictionary<int, ProficiencyValue> proficiencyValues = new Dictionary<int, ProficiencyValue>()
+		private static readonly Dictionary<int, Proficiency> proficiencies = new Dictionary<int, Proficiency>()
 		{
-			{ 0, new ProficiencyValue(0, 9, 0, 0) },
-			{ 1, new ProficiencyValue(10, 24, 0, 0) },
-			{ 2, new ProficiencyValue(25, 39, 2, 1) },
-			{ 3, new ProficiencyValue(40, 54, 5, 1) },
-			{ 4, new ProficiencyValue(55, 69, 9, 1) },
-			{ 5, new ProficiencyValue(70, 84, 14, 3) },
-			{ 6, new ProficiencyValue(85, 99, 14, 3) },
-			{ 7, new ProficiencyValue(100, 120, 22, 6) },
+			{ 0, new Proficiency(0, 9, 0, 0) },
+			{ 1, new Proficiency(10, 24, 0, 0) },
+			{ 2, new Proficiency(25, 39, 2, 1) },
+			{ 3, new Proficiency(40, 54, 5, 1) },
+			{ 4, new Proficiency(55, 69, 9, 1) },
+			{ 5, new Proficiency(70, 84, 14, 3) },
+			{ 6, new Proficiency(85, 99, 14, 3) },
+			{ 7, new Proficiency(100, 120, 22, 6) },
 		};
 
-		private static ProficiencyValue GetProficiencyValue(this SlotItem slotItem) => proficiencyValues[Math.Max(Math.Min(slotItem.Proficiency, 7), 0)];
+		private static Proficiency GetProficiency(this SlotItem slotItem) => proficiencies[Math.Max(Math.Min(slotItem.Proficiency, 7), 0)];
 	}
 }
diff --git a/source/KanColleViewer.sln.DotSettings b/source/KanColleViewer.sln.DotSettings
index 9663e507e..7bb37ce0a 100644
--- a/source/KanColleViewer.sln.DotSettings
+++ b/source/KanColleViewer.sln.DotSettings
@@ -15,7 +15,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAnonymousTypePropertyName/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantIfElseBlock/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantNameQualifier/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantThisQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>

From 8158dd56e7e5615bc8aa4753a2868b9dc69dbe84 Mon Sep 17 00:00:00 2001
From: Manato KAMEYA <grabacr07+github@gmail.com>
Date: Wed, 6 Jul 2016 20:54:50 +0900
Subject: [PATCH 15/16] version 4.2.7

---
 source/Grabacr07.KanColleViewer/KanColleViewer.csproj         | 2 +-
 source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs    | 2 +-
 .../Views/Behaviors/ScreenshotAction.cs                       | 2 +-
 .../Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs   | 2 +-
 source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
index 8dd47ac64..b689593aa 100644
--- a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
+++ b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -639,7 +639,7 @@
       <VersionMajor>4</VersionMajor>
       <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
+      <WrapperTool>tlbimp</WrapperTool>
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
index 565f9a56c..4fbe7ed0f 100644
--- a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -15,4 +15,4 @@
 	ResourceDictionaryLocation.None,
 	ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("4.2.6.0")]
+[assembly: AssemblyVersion("4.2.7.0")]
diff --git a/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs b/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
index d520e201d..4b981e017 100644
--- a/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
+++ b/source/Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
@@ -9,7 +9,7 @@
 using Grabacr07.KanColleViewer.Win32;
 using Livet.Behaviors.Messaging;
 using Livet.Messaging;
-using mshtml;
+using MSHTML;
 using SHDocVw;
 using IServiceProvider = Grabacr07.KanColleViewer.Win32.IServiceProvider;
 using WebBrowser = System.Windows.Controls.WebBrowser;
diff --git a/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs b/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
index 0989e1479..a026481bb 100644
--- a/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
+++ b/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
@@ -9,9 +9,9 @@
 using System.Windows.Navigation;
 using Grabacr07.KanColleViewer.Models;
 using Grabacr07.KanColleViewer.ViewModels;
-using mshtml;
 using MetroRadiance.Interop;
 using MetroTrilithon.UI.Controls;
+using MSHTML;
 using SHDocVw;
 using IServiceProvider = Grabacr07.KanColleViewer.Win32.IServiceProvider;
 using WebBrowser = System.Windows.Controls.WebBrowser;
diff --git a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
index ac65a8a5c..601dda8c1 100644
--- a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
@@ -10,5 +10,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("8A13AB28-4E9F-423D-80AD-23EEF2821959")]
 
-[assembly: AssemblyVersion("1.5.3")]
-[assembly: AssemblyInformationalVersion("1.5.3")]
+[assembly: AssemblyVersion("1.6.0")]
+[assembly: AssemblyInformationalVersion("1.6.0")]

From f7fc8a65db6eeafc0b74ec54214e4b18e673006c Mon Sep 17 00:00:00 2001
From: Yuubari <remilia@koumakan.jp>
Date: Wed, 6 Jul 2016 20:10:57 +0300
Subject: [PATCH 16/16] Update locstrings

---
 .../Properties/Resources.Designer.cs          | 36 +++++++++++++++++++
 .../Properties/Resources.en.resx              | 14 +++++++-
 .../Properties/Resources.resx                 | 12 +++++++
 .../Views/Catalogs/ShipCatalogWindow.xaml     |  4 +--
 .../Views/Settings/Operation.xaml             |  6 ++--
 5 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
index c39e113c0..8566a69bd 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
@@ -2041,6 +2041,33 @@ public static string Settings_Operation_LoS_Title {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 連合艦隊時、以下の艦隊を索敵値計算の対象として使用する.
+        /// </summary>
+        public static string Settings_Operation_LoS_UseFleets {
+            get {
+                return ResourceManager.GetString("Settings_Operation_LoS_UseFleets", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 第1艦隊.
+        /// </summary>
+        public static string Settings_Operation_LoS_UseFleets_Fleet1 {
+            get {
+                return ResourceManager.GetString("Settings_Operation_LoS_UseFleets_Fleet1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 第2艦隊.
+        /// </summary>
+        public static string Settings_Operation_LoS_UseFleets_Fleet2 {
+            get {
+                return ResourceManager.GetString("Settings_Operation_LoS_UseFleets_Fleet2", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 索敵値計算.
         /// </summary>
@@ -2770,6 +2797,15 @@ public static string ShipCatalog_Column_ASW {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 装備によるステータス上昇を含んだ値です.
+        /// </summary>
+        public static string ShipCatalog_Column_ASW_Tooltip {
+            get {
+                return ResourceManager.GetString("ShipCatalog_Column_ASW_Tooltip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cond..
         /// </summary>
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
index 2d52f43fb..612f31173 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
@@ -713,7 +713,7 @@ GPU: Slow! GPU optimization for tablets.</value>
     <value>Give a notification for ships in critical condition</value>
   </data>
   <data name="Settings_Operation_LoSCalculation" xml:space="preserve">
-    <value>Settings_Plugins_PluginInfo_Features</value>
+    <value>LoS Calculation</value>
   </data>
   <data name="Settings_Operation_LoS_CarrierBasedRecon" xml:space="preserve">
     <value>Carrier-based Recon Aircraft</value>
@@ -1432,4 +1432,16 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar
   <data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
     <value>Below 50</value>
   </data>
+  <data name="Settings_Operation_LoS_UseFleets" xml:space="preserve">
+    <value>In a combined fleet setting, use these fleets to calculate LoS:</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet1" xml:space="preserve">
+    <value>Fleet #1</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet2" xml:space="preserve">
+    <value>Fleet #2</value>
+  </data>
+  <data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
+    <value>Includes stat bonuses from the equipment</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
index 1ebc248b6..84410eb5e 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -1424,4 +1424,16 @@ HTTP プロトコルの通信は自動構成も含め「インターネット 
   <data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
     <value>50 未満</value>
   </data>
+  <data name="Settings_Operation_LoS_UseFleets" xml:space="preserve">
+    <value>連合艦隊時、以下の艦隊を索敵値計算の対象として使用する</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet1" xml:space="preserve">
+    <value>第1艦隊</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet2" xml:space="preserve">
+    <value>第2艦隊</value>
+  </data>
+  <data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
+    <value>装備によるステータス上昇を含んだ値です</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
index 16ebfd761..7970dc8d7 100644
--- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -841,8 +841,8 @@
 								<GridViewColumn.Header>
 									<metro2:SortButton MethodName="Sort"
 													   MethodParameter="{x:Static viewModels:ShipCatalogSortWorker.ASWColumn}">
-										<TextBlock Text="対潜"
-												   ToolTip="装備によるステータス上昇を含んだ値です" />
+										<TextBlock Text="{Binding Resources.ShipCatalog_Column_ASW, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
+												   ToolTip="{Binding Resources.ShipCatalog_Column_ASW_Tooltip, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 									</metro2:SortButton>
 								</GridViewColumn.Header>
 								<GridViewColumn.CellTemplate>
diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
index 34da0a244..97937a4b3 100644
--- a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
@@ -79,16 +79,16 @@
 					   Style="{DynamicResource DetailTextStyleKey}"/>
 
 
-			<TextBlock Text="連合艦隊時、以下の艦隊を索敵値計算の対象として使用する"
+			<TextBlock Text="{Binding Resources.Settings_Operation_LoS_UseFleets, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 					   Margin="0,12,0,5"
 					   Visibility="{Binding SelectedViewRangeCalcType.HasCombinedSettings, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 			
 			<StackPanel Orientation="Horizontal"
 						Visibility="{Binding SelectedViewRangeCalcType.HasCombinedSettings, Converter={StaticResource BooleanToVisibilityConverter}}">
-				<CheckBox Content="第1艦隊"
+				<CheckBox Content="{Binding Resources.Settings_Operation_LoS_UseFleets_Fleet1, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 						  IsChecked="{Binding Source={x:Static ms:KanColleSettings.IsViewRangeCalcIncludeFirstFleet}, Path=Value}"
 						  Margin="0,0,20,0"/>
-				<CheckBox Content="第2艦隊"
+				<CheckBox Content="{Binding Resources.Settings_Operation_LoS_UseFleets_Fleet2, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 						  IsChecked="{Binding Source={x:Static ms:KanColleSettings.IsViewRangeCalcIncludeSecondFleet}, Path=Value}"/>
 			</StackPanel>