制空値に全滅した艦載機の熟練度ボーナスが加算されるのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 877688e..1fbe15a 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -336,6 +336,8 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "fighterpower_001");\r
             PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new [] {156, 159}));\r
+            SniffLogFile(sniffer, "fighterpower_002");\r
+            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new[] {140, 143}), "全滅したスロットがある");\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 121682c..79069e9 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 121682c945a6145e17f4186f413d8c3dcbe8d6ac
+Subproject commit 79069e9f70c48e2c8d0b8b23580a73a836b2ce08

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index fd3af81..cc7840d 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -493,7 +493,7 @@ namespace KancolleSniffer
         public int[] GetFighterPower(int fleet)\r
             => GetShipStatuses(fleet).Where(ship => !ship.Escaped).SelectMany(ship =>\r
                 ship.Slot.Zip(ship.OnSlot, (slot, onslot) =>\r
-                    !slot.Spec.CanAirCombat\r
+                    !slot.Spec.CanAirCombat || onslot == 0\r
                         ? new[] {0, 0}\r
                         : new[]\r
                         {\r