バージョン11.9の準備

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / TextGenerator.cs

diff --git a/KancolleSniffer/TextGenerator.cs b/KancolleSniffer/TextGenerator.cs
index 820959c..a5a7c09 100644 (file)
--- a/KancolleSniffer/TextGenerator.cs
+++ b/KancolleSniffer/TextGenerator.cs
@@ -29,6 +29,7 @@ namespace KancolleSniffer
                    orderby ship.Spec.ShipType, -ship.Level, ship.ExpToNext\r
                    select $"{ship.Id},{ship.Spec.ShipTypeName},{ship.Name},{ship.Level},{ship.Cond},{ship.ShipAntiSubmarine}");\r
 \r
+        // ReSharper disable IdentifierTypo\r
         public static string GenerateKantaiSarashiData(IEnumerable<ShipStatus> shipList)\r
         {\r
             return ".2|" +\r
@@ -44,6 +45,7 @@ namespace KancolleSniffer
                                       ? "." + ship.Spec.Remodel.Step\r
                                       : "")));\r
         }\r
+        // ReSharper restore IdentifierTypo\r
 \r
         public static string GenerateItemList(IEnumerable<ItemStatus> itemList)\r
             => "区分,装備名,熟練度,改修,個数\r\n" +\r
@@ -77,7 +79,7 @@ namespace KancolleSniffer
             var sb = new StringBuilder();\r
             var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};\r
             sb.Append(fn[fleet] + "\r\n");\r
-            sb.Append(string.Concat(from s in target.Ships\r
+            sb.Append(string.Concat(from s in target.ActualShips\r
                 select ($"{s.Name} Lv{s.Level} " +\r
                         string.Join(",",\r
                             from item in s.AllSlot\r
@@ -146,8 +148,8 @@ namespace KancolleSniffer
                 if (fleet.Number != 0)\r
                     sb.Append(",");\r
                 sb.Append($"\"f{fleet.Number + 1}\":{{");\r
-                var ships = fleet.Ships;\r
-                for (var s = 0; s < ships.Length; s++)\r
+                var ships = fleet.ActualShips;\r
+                for (var s = 0; s < ships.Count; s++)\r
                 {\r
                     if (s != 0)\r
                         sb.Append(",");\r