Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Half-even rounding for fire rates #25

Merged
merged 3 commits into from
Aug 10, 2024
Merged

Half-even rounding for fire rates #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4ebd1f
Add null case for fire rate
lL1l1 Aug 7, 2024
5d7f8a6
Round fire rates properly
lL1l1 Aug 7, 2024
712431d
Merge branch 'master' into fix/fire-rate-rounding
lL1l1 Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions www/res/scripts/calculations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,12 @@ function calculateDps($stdClassWeapon, $unitID, $Projectile){
}


// the rof is rounded down to the nearest tick since the game runs in ticks. (If the units RoF is 0.8 it means it should fire every 1.25 seconds but it fires every 1.2 seconds)
// some weapons also have separate charge and reload times which results in them firing less often. yeah.
// some weapons have separate charge and reload times which results in them firing less often.
// in theory if your total MuzzleSalvoDelay is longer than the reload time your weapon waits for the reload time twice,
// but thats pretty much a bug so not taken into account here
/// BTW - SpookyDB uses round(), not floor(), based on the values seen there. Values will not match between DBs. floor() is the correct method.
$trueReload = max(0.1*floor(10 / ($weapon["RateOfFire"] ?? 1)), 0.1);

// Supcom rounding tie breaks towards evens
$trueReload = max(0.1*round(10 / ($weapon["RateOfFire"] ?? 1), 0, PHP_ROUND_HALF_EVEN), 0.1);
$trueReload = max(
($weapon["RackSalvoChargeTime"] ?? 0) + ($weapon["RackSalvoReloadTime"] ?? 0) +
($weapon["MuzzleSalvoDelay"] ?? 0)*(($weapon["MuzzleSalvoSize"] ?? 1)-1),
Expand Down
Loading