From 1b42a1ca1b63ee68e1063a83ad522ac9690f56a8 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Fri, 27 Oct 2017 20:45:01 +0900
Subject: [PATCH] =?utf8?q?=E8=89=A6=E9=9A=8A=E6=83=85=E5=A0=B1=E3=81=AB?=
 =?utf8?q?=E5=AF=BE=E6=BD=9C=E3=80=81=E5=AF=BE=E7=A9=BA=E3=80=81=E7=B4=A2?=
 =?utf8?q?=E6=95=B5=E3=81=AE=E8=89=A6=E9=9A=8A=E3=81=94=E3=81=A8=E3=81=AE?=
 =?utf8?q?=E5=90=88=E8=A8=88=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/FleetPanel.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/KancolleSniffer/FleetPanel.cs b/KancolleSniffer/FleetPanel.cs
index b23c165..5a53504 100644
--- a/KancolleSniffer/FleetPanel.cs
+++ b/KancolleSniffer/FleetPanel.cs
@@ -61,12 +61,15 @@ namespace KancolleSniffer
         private void CreateTable(Sniffer sniffer)
         {
             var list = new List<Record>();
-            var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};
+            var fn = new[] {"第一", "第二", "第三", "第四"};
             for (var f = 0; f < fn.Length; f++)
             {
                 var drumTotal = 0;
                 var drumShips = 0;
                 var levelTotal = 0;
+                var aswTotal = 0;
+                var antiAirTotal = 0;
+                var losTotal = 0;
                 var ships = new List<Record>();
                 foreach (var s in sniffer.GetShipStatuses(f))
                 {
@@ -110,6 +113,9 @@ namespace KancolleSniffer
                         drumShips++;
                     drumTotal += drum;
                     levelTotal += s.Level;
+                    aswTotal += s.AntiSubmarine;
+                    antiAirTotal += s.AntiAir;
+                    losTotal += s.LoS;
                     var fire = s.EffectiveFirepower;
                     var subm = s.EffectiveAntiSubmarine;
                     var torp = s.EffectiveTorpedo;
@@ -138,10 +144,13 @@ namespace KancolleSniffer
                     tp += sniffer.GetTransportPoint(1);
                 list.Add(new Record
                 {
-                    Fleet = fn[f] + (levelTotal == 0 ? "" : " 合計Lv" + levelTotal) +
+                    Fleet = fn[f] + (levelTotal == 0 ? "" : " Lv" + levelTotal) +
                             (drumTotal == 0 ? "" : " 缶" + drumTotal + "(" + drumShips + "隻)") +
-                            (daihatsu > 0 ? $" 発{daihatsu * 100:f1}%" : ""),
-                    Fleet2 = sniffer.CombinedFleetType != 0 && f == 1 ? "" : $"TP: S{(int)tp} A{(int)(tp * 0.7)}"
+                            (aswTotal > 0 ? $" 潜{CutOverFlow(aswTotal)}" : "") +
+                            (antiAirTotal > 0 ? $" 空{CutOverFlow(antiAirTotal)}" : "") +
+                            (losTotal > 0 ? $" ç´¢{CutOverFlow(losTotal)}" : ""),
+                    Fleet2 = (sniffer.CombinedFleetType != 0 && f == 1 ? "" : $"TP:S{(int)tp}A{(int)(tp * 0.7)}") +
+                             (daihatsu > 0 ? $" 発{daihatsu * 100:f1}%" : "")
                 });
                 list.AddRange(ships);
             }
@@ -175,6 +184,8 @@ namespace KancolleSniffer
             _table = list.ToArray();
         }
 
+        private int CutOverFlow(int value) => value > 999 ? 999 : value;
+
         private string GenEquipString(ItemStatus item)
         {
             var name = item.Spec.Name;
-- 
2.11.0