先制対潜の判定条件がおかしいのを直す

diff --git a/KancolleSniffer/ShipStatus.cs b/KancolleSniffer/ShipStatus.cs
index ce09642..891f895 100644 (file)
--- a/KancolleSniffer/ShipStatus.cs
+++ b/KancolleSniffer/ShipStatus.cs
@@ -205,19 +205,17 @@ namespace KancolleSniffer
                     case "五十鈴改二":\r
                     case "龍田改二":\r
                     case "Jervis改":\r
+                    case "Samuel B.Roberts改":\r
                         return true;\r
-                    case "大鷹":\r
-                        return Slot.Any(item => item.Spec.Name.Contains("九三一空")) && AntiSubmarine >= 65;\r
                     case "大鷹改":\r
                     case "大鷹改二":\r
                         return Slot.Any(item => item.Spec.IsAircraft && item.Spec.EffectiveAntiSubmarine > 0);\r
+                    case "大鷹":\r
                     case "Gambier Bay":\r
                     case "Gambier Bay改":\r
                     case "瑞鳳改二乙":\r
-                        return EffectiveFirepower > 0 &&\r
-                               (HaveSonar\r
-                                   ? AntiSubmarine >= 50\r
-                                   : Slot.Any(item => item.Spec.AntiSubmarine >= 7) && AntiSubmarine >= 65);\r
+                        return Slot.Any(item => item.Spec.IsAircraft && item.Spec.EffectiveAntiSubmarine >= 7) &&\r
+                               AntiSubmarine >= (HaveSonar ? 50 : 65);\r
                     default:\r
                         return Spec.ShipType == 1\r
                             ? Slot.Sum(item => item.Spec.AntiSubmarine) >= 4 && AntiSubmarine >= 75 ||\r