テキスト形式の基地航空隊の情報に改修レベルと熟練度がないのを直す

diff --git a/KancolleSniffer/TextGenerator.cs b/KancolleSniffer/TextGenerator.cs
index d226253..0aa2d23 100644 (file)
--- a/KancolleSniffer/TextGenerator.cs
+++ b/KancolleSniffer/TextGenerator.cs
@@ -65,12 +65,10 @@ namespace KancolleSniffer
                 sb.Append(fn[f] + "\r\n");\r
                 sb.Append(string.Concat(from s in sniffer.GetShipStatuses(f)\r
                     select ($"{s.Name} Lv{s.Level} " +\r
-                           string.Join(",",\r
-                               from item in s.Slot.Concat(new[] {s.SlotEx})\r
-                               where item.Id != -1\r
-                               select dict[item.Spec.Name] +\r
-                                      (item.Alv == 0 ? "" : "+" + item.Alv) +\r
-                                      (item.Level == 0 ? "" : "★" + item.Level))).TrimEnd(' ') + "\r\n"));\r
+                            string.Join(",",\r
+                                from item in s.Slot.Concat(new[] {s.SlotEx})\r
+                                where item.Id != -1\r
+                                select dict[item.Spec.Name] + ItemStatusString(item))).TrimEnd(' ') + "\r\n"));\r
                 var fp = sniffer.GetFighterPower(f);\r
                 sb.Append($"制空: {(fp[0] == fp[1] ? fp[0].ToString() : fp[0] + "～" + fp[1])} " +\r
                           $"索敵: {sniffer.GetFleetLineOfSights(f):F1}\r\n");\r
@@ -86,12 +84,17 @@ namespace KancolleSniffer
                     sb.Append(\r
                         string.Join(",",\r
                             from plane in airCorps.Planes\r
-                            select plane.State == 1 ? dict[plane.Slot.Spec.Name] : plane.StateName) + "\r\n");\r
+                            select plane.State == 1\r
+                                ? dict[plane.Slot.Spec.Name] + ItemStatusString(plane.Slot)\r
+                                : plane.StateName) + "\r\n");\r
                 }\r
             }\r
             return sb.ToString();\r
         }\r
 \r
+        private static string ItemStatusString(ItemStatus item)\r
+            => (item.Alv == 0 ? "" : "+" + item.Alv) + (item.Level == 0 ? "" : "★" + item.Level);\r
+\r
         private class ItemName\r
         {\r
             private readonly Dictionary<string, string> _dict = new Dictionary<string, string>();\r