diff -r c062eb0dd7ce -r f3faa54581ff www/includes/formulas.php --- a/www/includes/formulas.php Mon Oct 28 20:52:17 2019 +0100 +++ b/www/includes/formulas.php Tue Oct 29 10:44:08 2019 +0100 @@ -235,11 +235,19 @@ } $whirlibus = 0; - if ($useat == 4) { // Any whirlpool - if ($whirlpool9) + if ($useat == 3 || $useat == 4) { // Flameout or any whirlpool + if ($whirlpool9) { $whirlibus += ($mass * ($alpha / 100) * 20) / $volume * $whirlpool9 / 50; - if ($whirlpool7) + } else { + if ($useat == 3) // Flameout hops are 2 minutes in this range. + $whirlibus += ($mass * ($alpha / 100) * 20) / $volume * (2 / 50); + } + if ($whirlpool7) { $whirlibus += ($mass * ($alpha / 100) * 6) / $volume * $whirlpool7 / 50; + } else { + if ($useat == 3) // Flameout hops are 4 minutes in this range. + $whirlibus += ($mass * ($alpha / 100) * 6) / $volume * (4 / 50); + } if ($whirlpool6) $whirlibus += ($mass * ($alpha / 100) * 2) / $volume * $whirlpool6 / 50; }