From 67f16f21e0dc8a2bb31ebbbe9d046cb4c9bb355d Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Fri, 19 Aug 2016 22:01:38 +0900
Subject: [PATCH] =?utf8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E5=BD=A2?=
 =?utf8?q?=E5=BC=8F=E3=81=AE=E5=9F=BA=E5=9C=B0=E8=88=AA=E7=A9=BA=E9=9A=8A?=
 =?utf8?q?=E3=81=AE=E6=83=85=E5=A0=B1=E3=81=AB=E6=94=B9=E4=BF=AE=E3=83=AC?=
 =?utf8?q?=E3=83=99=E3=83=AB=E3=81=A8=E7=86=9F=E7=B7=B4=E5=BA=A6=E3=81=8C?=
 =?utf8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E7=9B=B4=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/TextGenerator.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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