基地航空隊の制空値に陸上偵察機の効果を反映する

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 521a28d..89c1b91 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -163,6 +163,26 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 陸上偵察機の効果を反映した制空値を計算する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void FighterPowerWithLandBaseReconBonus()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "airbase_005");\r
+\r
+            // 二式陸上偵察機(熟練)\r
+            var fp1 = sniffer.AirBase[0].AirCorps[0].CalcFighterPower();\r
+            PAssert.That(() => (int)fp1[0].AirCombat == 266);\r
+            PAssert.That(() => (int)fp1[0].Interception == 293);\r
+\r
+            // 二式陸上偵察機\r
+            var fp3 = sniffer.AirBase[0].AirCorps[2].CalcFighterPower();\r
+            PAssert.That(() => (int)fp3[0].AirCombat == 200);\r
+            PAssert.That(() => (int)fp3[0].Interception == 303);\r
+        }\r
+\r
+        /// <summary>\r
         /// マップ索敵の判定式(33)を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 661a3e8..fdf7a6e 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 661a3e809ab78022829a3541285c86e3f1b0de6a
+Subproject commit fdf7a6e1a45053b92b38a36246658a8c2289b722

diff --git a/KancolleSniffer/Model/ItemSpec.cs b/KancolleSniffer/Model/ItemSpec.cs
index 834625d..692d773 100644 (file)
--- a/KancolleSniffer/Model/ItemSpec.cs
+++ b/KancolleSniffer/Model/ItemSpec.cs
@@ -210,8 +210,9 @@ namespace KancolleSniffer.Model
                         return new AirBaseParams(1.0, LoS <= 7 ? 1.2 : 1.3);\r
                     case 10:\r
                     case 41:\r
-                        return new AirBaseParams(1.0, LoS <= 7 ? 1.1 :\r
-                            LoS <= 8 ? 1.13 : 1.16);\r
+                        return new AirBaseParams(1.0, LoS <= 7 ? 1.1 : LoS <= 8 ? 1.13 : 1.16);\r
+                    case 49:\r
+                        return new AirBaseParams(LoS <= 8 ? 1.15 : 1.18, LoS <= 8 ? 1.18 : 1.24);\r
                 }\r
                 return new AirBaseParams(1.0, 1.0);\r
             }\r