コミットメタ情報

リビジョン9182d1400e7a7167f150f3c6f35f6de50df6cfa4 (tree)
日時2017-08-15 20:35:10
作者Kazuhiro Fujieda <fujieda@user...>
コミッターKazuhiro Fujieda

ログメッセージ

第一艦隊以外のTPを表示する

変更サマリ

差分

--- a/KancolleSniffer/FleetPanel.cs
+++ b/KancolleSniffer/FleetPanel.cs
@@ -62,7 +62,6 @@ namespace KancolleSniffer
6262 {
6363 var list = new List<Record>();
6464 var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};
65- var tp = 0.0;
6665 for (var f = 0; f < fn.Length; f++)
6766 {
6867 var drumTotal = 0;
@@ -111,8 +110,6 @@ namespace KancolleSniffer
111110 drumShips++;
112111 drumTotal += drum;
113112 levelTotal += s.Level;
114- if (f < (sniffer.CombinedFleetType != 0 ? 2 : 1))
115- tp += s.TransportPoint;
116113 var fire = s.EffectiveFirepower;
117114 var subm = s.EffectiveAntiSubmarine;
118115 var torp = s.EffectiveTorpedo;
@@ -136,15 +133,18 @@ namespace KancolleSniffer
136133 ships.AddRange(equips);
137134 }
138135 var daihatsu = sniffer.GetDaihatsuBonus(f);
136+ var tp = sniffer.GetTransportPoint(f);
137+ if (sniffer.CombinedFleetType != 0 && f == 0)
138+ tp += sniffer.GetTransportPoint(1);
139139 list.Add(new Record
140140 {
141141 Fleet = fn[f] + (levelTotal == 0 ? "" : " 合計Lv" + levelTotal) +
142142 (drumTotal == 0 ? "" : " 缶" + drumTotal + "(" + drumShips + "隻)") +
143- (daihatsu > 0 ? $" 発{daihatsu * 100:f1}%" : "")
143+ (daihatsu > 0 ? $" 発{daihatsu * 100:f1}%" : ""),
144+ Fleet2 = sniffer.CombinedFleetType != 0 && f == 1 ? "" : $"TP: S{(int)tp} A{(int)(tp * 0.7)}"
144145 });
145146 list.AddRange(ships);
146147 }
147- list[0].Fleet2 = $"TP: S{(int)tp} A{(int)(tp * 0.7)}";
148148 if (sniffer.BaseAirCorps != null)
149149 {
150150 var name = new[] {"第一", "第二", "第三"};
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -450,6 +450,11 @@ namespace KancolleSniffer
450450 return bonus + 0.01 * bonus * levelAverage + tokudaiBonus[Min(tokudai, 4), Min(daihatsu, 4)];
451451 }
452452
453+ public double GetTransportPoint(int fleet)
454+ {
455+ return GetShipStatuses(fleet).Sum(ship => ship.TransportPoint);
456+ }
457+
453458 public string[] BadlyDamagedShips { get; private set; } = new string[0];
454459
455460 public void SetBadlyDamagedShips()
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -525,6 +525,8 @@ namespace KancolleSniffer
525525
526526 public double GetDaihatsuBonus(int fleet) => _shipInfo.GetDaihatsuBonus(fleet);
527527
528+ public double GetTransportPoint(int fleet) => _shipInfo.GetTransportPoint(fleet);
529+
528530 public ItemStatus[] ItemList
529531 {
530532 get
旧リポジトリブラウザで表示