From 9182d1400e7a7167f150f3c6f35f6de50df6cfa4 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Tue, 15 Aug 2017 20:35:10 +0900
Subject: [PATCH] =?utf8?q?=E7=AC=AC=E4=B8=80=E8=89=A6=E9=9A=8A=E4=BB=A5?=
 =?utf8?q?=E5=A4=96=E3=81=AETP=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?=
 =?utf8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/FleetPanel.cs | 10 +++++-----
 KancolleSniffer/ShipInfo.cs   |  5 +++++
 KancolleSniffer/Sniffer.cs    |  2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/KancolleSniffer/FleetPanel.cs b/KancolleSniffer/FleetPanel.cs
index 12d9ef7..b23c165 100644
--- a/KancolleSniffer/FleetPanel.cs
+++ b/KancolleSniffer/FleetPanel.cs
@@ -62,7 +62,6 @@ namespace KancolleSniffer
         {
             var list = new List<Record>();
             var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};
-            var tp = 0.0;
             for (var f = 0; f < fn.Length; f++)
             {
                 var drumTotal = 0;
@@ -111,8 +110,6 @@ namespace KancolleSniffer
                         drumShips++;
                     drumTotal += drum;
                     levelTotal += s.Level;
-                    if (f < (sniffer.CombinedFleetType != 0 ? 2 : 1))
-                        tp += s.TransportPoint;
                     var fire = s.EffectiveFirepower;
                     var subm = s.EffectiveAntiSubmarine;
                     var torp = s.EffectiveTorpedo;
@@ -136,15 +133,18 @@ namespace KancolleSniffer
                     ships.AddRange(equips);
                 }
                 var daihatsu = sniffer.GetDaihatsuBonus(f);
+                var tp = sniffer.GetTransportPoint(f);
+                if (sniffer.CombinedFleetType != 0 && f == 0)
+                    tp += sniffer.GetTransportPoint(1);
                 list.Add(new Record
                 {
                     Fleet = fn[f] + (levelTotal == 0 ? "" : " 合計Lv" + levelTotal) +
                             (drumTotal == 0 ? "" : " 缶" + drumTotal + "(" + drumShips + "隻)") +
-                            (daihatsu > 0 ? $" 発{daihatsu * 100:f1}%" : "")
+                            (daihatsu > 0 ? $" 発{daihatsu * 100:f1}%" : ""),
+                    Fleet2 = sniffer.CombinedFleetType != 0 && f == 1 ? "" : $"TP: S{(int)tp} A{(int)(tp * 0.7)}"
                 });
                 list.AddRange(ships);
             }
-            list[0].Fleet2 = $"TP: S{(int)tp} A{(int)(tp * 0.7)}";
             if (sniffer.BaseAirCorps != null)
             {
                 var name = new[] {"第一", "第二", "第三"};
diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index cc1de6a..3f07365 100644
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -450,6 +450,11 @@ namespace KancolleSniffer
             return bonus + 0.01 * bonus * levelAverage + tokudaiBonus[Min(tokudai, 4), Min(daihatsu, 4)];
         }
 
+        public double GetTransportPoint(int fleet)
+        {
+            return GetShipStatuses(fleet).Sum(ship => ship.TransportPoint);
+        }
+
         public string[] BadlyDamagedShips { get; private set; } = new string[0];
 
         public void SetBadlyDamagedShips()
diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 0c8d52e..187a03f 100644
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -525,6 +525,8 @@ namespace KancolleSniffer
 
         public double GetDaihatsuBonus(int fleet) => _shipInfo.GetDaihatsuBonus(fleet);
 
+        public double GetTransportPoint(int fleet) => _shipInfo.GetTransportPoint(fleet);
+
         public ItemStatus[] ItemList
         {
             get
-- 
2.11.0