OSDN Git Service

大発ボーナスの小数点2桁四捨五入を切り捨てにする
authorKazuhiro Fujieda <fujieda@users.osdn.me>
Sat, 9 May 2020 07:33:22 +0000 (16:33 +0900)
committerKazuhiro Fujieda <fujieda@users.osdn.me>
Sat, 9 May 2020 07:33:22 +0000 (16:33 +0900)
KancolleSniffer/Model/Fleet.cs
KancolleSniffer/View/FleetSpec.cs

index bb9debf..dd275a6 100644 (file)
@@ -286,7 +286,8 @@ namespace KancolleSniffer.Model
                 }\r
                 var levelAverage = sum == 0 ? 0.0 : (double)level / sum;\r
                 bonus = Min(bonus, 0.2);\r
-                return bonus + 0.01 * bonus * levelAverage + tokudaiBonus[Min(tokudai, 4), Min(daihatsu, 4)];\r
+                var result = bonus + 0.01 * bonus * levelAverage + tokudaiBonus[Min(tokudai, 4), Min(daihatsu, 4)];\r
+                return Floor(result * 1000) / 10;\r
             }\r
         }\r
 \r
@@ -339,7 +340,7 @@ namespace KancolleSniffer.Model
                 if (drums > 0)\r
                     result.Add($"ド{drums}({drumShips}隻)");\r
                 if (DaihatsuBonus > 0)\r
-                    result.Add($"ダ{DaihatsuBonus * 100:f1}%");\r
+                    result.Add($"ダ{DaihatsuBonus:f1}%");\r
                 return string.Join(" ", result);\r
             }\r
         }\r
index 356bb89..16323af 100644 (file)
@@ -206,7 +206,7 @@ namespace KancolleSniffer.View
                     var total = CalcTotal(fleet);\r
                     return "計:" + HideIfZero(" Lv", total.Level) +\r
                            HideIfZero(" ド", total.Drum) + HideIfZero("(", total.DrumShips, "隻)") +\r
-                           HideIfZero(" 大", fleet.DaihatsuBonus * 100, "%") + "\r\n" +\r
+                           HideIfZero(" 大", fleet.DaihatsuBonus, "%") + "\r\n" +\r
                            $"戦闘:燃{total.Fuel / 5}弾{total.Bull / 5} 支援:燃{total.Fuel / 2}弾{(int)(total.Bull * 0.8)}";\r
                 }\r
 \r