CSV形式に素対潜を追加する

diff --git a/KancolleSniffer/ShipStatus.cs b/KancolleSniffer/ShipStatus.cs
index bd5a4ec..d308472 100644 (file)
--- a/KancolleSniffer/ShipStatus.cs
+++ b/KancolleSniffer/ShipStatus.cs
@@ -159,10 +159,8 @@ namespace KancolleSniffer
                 var depthCharge = false;\r
                 var aircraft = false;\r
                 var all = 0.0;\r
-                var vanilla = AntiSubmarine;\r
                 foreach (var spec in Slot.Select(item => item.Spec))\r
                 {\r
-                    vanilla -= spec.AntiSubmarine;\r
                     if (spec.IsSonar)\r
                     {\r
                         sonar = true;\r
@@ -180,6 +178,7 @@ namespace KancolleSniffer
                     }\r
                     all += spec.EffectiveAntiSubmarine;\r
                 }\r
+                var vanilla = ShipAntiSubmarine;\r
                 if (vanilla == 0 && !aircraft) // 素対潜0で航空機なしは対潜攻撃なし\r
                     return 0;\r
                 var bonus = 1.0;\r
@@ -196,6 +195,8 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
+        public int ShipAntiSubmarine => AntiSubmarine - Slot.Sum(item => item.Spec.AntiSubmarine);\r
+\r
         public bool CanOpeningAntiSubmarineAttack\r
         {\r
             get\r

diff --git a/KancolleSniffer/TextGenerator.cs b/KancolleSniffer/TextGenerator.cs
index 86f1268..01f2701 100644 (file)
--- a/KancolleSniffer/TextGenerator.cs
+++ b/KancolleSniffer/TextGenerator.cs
@@ -22,11 +22,11 @@ namespace KancolleSniffer
     public static class TextGenerator\r
     {\r
         public static string GenerateShipList(IEnumerable<ShipStatus> shipList)\r
-            => "ID,艦種,艦名,レベル,cond\r\n" +\r
+            => "ID,艦種,艦名,レベル,cond,素対潜\r\n" +\r
                string.Join("\r\n",\r
                    from ship in shipList\r
                    orderby ship.Spec.ShipType, -ship.Level, ship.ExpToNext\r
-                   select $"{ship.Id},{ship.Spec.ShipTypeName},{ship.Name},{ship.Level},{ship.Cond}");\r
+                   select $"{ship.Id},{ship.Spec.ShipTypeName},{ship.Name},{ship.Level},{ship.Cond},{ship.ShipAntiSubmarine}");\r
 \r
         public static string GenerateKantaiSarashiData(IEnumerable<ShipStatus> shipList)\r
         {\r