Commit: 6308a986a3a6a13079810d9b597241dbb086d55f - KancolleSniffer (git)

Commit MetaInfo

• Revision: 6308a986a3a6a13079810d9b597241dbb086d55f (tree)
• Zeit: 2020-05-09 16:33:22
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

大発ボーナスの小数点2桁四捨五入を切り捨てにする

Ändern Zusammenfassung

• modified: KancolleSniffer/Model/Fleet.cs
• modified: KancolleSniffer/View/FleetSpec.cs

Diff

--- a/KancolleSniffer/Model/Fleet.cs
+++ b/KancolleSniffer/Model/Fleet.cs
@@ -286,7 +286,8 @@ namespace KancolleSniffer.Model
                 }
                 var levelAverage = sum == 0 ? 0.0 : (double)level / sum;
                 bonus = Min(bonus, 0.2);
-                return bonus + 0.01 * bonus * levelAverage + tokudaiBonus[Min(tokudai, 4), Min(daihatsu, 4)];
+                var result = bonus + 0.01 * bonus * levelAverage + tokudaiBonus[Min(tokudai, 4), Min(daihatsu, 4)];
+                return Floor(result * 1000) / 10;
             }
         }
 
@@ -339,7 +340,7 @@ namespace KancolleSniffer.Model
                 if (drums > 0)
                     result.Add($"ド{drums}({drumShips}隻)");
                 if (DaihatsuBonus > 0)
-                    result.Add($"ﾀﾞ{DaihatsuBonus * 100:f1}%");
+                    result.Add($"ﾀﾞ{DaihatsuBonus:f1}%");
                 return string.Join(" ", result);
             }
         }

--- a/KancolleSniffer/View/FleetSpec.cs
+++ b/KancolleSniffer/View/FleetSpec.cs
@@ -206,7 +206,7 @@ namespace KancolleSniffer.View
                     var total = CalcTotal(fleet);
                     return "計:" + HideIfZero(" Lv", total.Level) +
                            HideIfZero(" ド", total.Drum) + HideIfZero("(", total.DrumShips, "隻)") +
-                           HideIfZero(" 大", fleet.DaihatsuBonus * 100, "%") + "\r\n" +
+                           HideIfZero(" 大", fleet.DaihatsuBonus, "%") + "\r\n" +
                            $"戦闘:燃{total.Fuel / 5}弾{total.Bull / 5} 支援:燃{total.Fuel / 2}弾{(int)(total.Bull * 0.8)}";
                 }