艦隊情報のテキスト形式で補強増設スロットがない艦の最後に,が付くのを直す

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 2c52254..9f1ae61 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -50,7 +50,7 @@ namespace KancolleSniffer
 \r
         public int CombinedFleetType { get; set; }\r
 \r
-        private IEnumerable<ItemStatus> AllSlot => Slot.Concat(new[] {SlotEx});\r
+        public IEnumerable<ItemStatus> AllSlot => SlotEx.Id == 0 ? Slot : Slot.Concat(new[] {SlotEx});\r
 \r
         public ShipStatus()\r
         {\r

diff --git a/KancolleSniffer/TextGenerator.cs b/KancolleSniffer/TextGenerator.cs
index e0bd246..dc3f989 100644 (file)
--- a/KancolleSniffer/TextGenerator.cs
+++ b/KancolleSniffer/TextGenerator.cs
@@ -66,7 +66,7 @@ namespace KancolleSniffer
                 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
+                                from item in s.AllSlot\r
                                 where item.Id != -1\r
                                 select dict[item.Spec.Name] + ItemStatusString(item))).TrimEnd(' ') + "\r\n"));\r
                 var fp = sniffer.GetFighterPower(f);\r