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

Lower star rating pp exponent and increase accuracy value on high SR maps #15

Merged
merged 13 commits into from
May 15, 2018
Merged

Lower star rating pp exponent and increase accuracy value on high SR maps #15

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
77da1ba
Merge pull request #1 from ppy/master
MillhioreF Mar 8, 2018
c15df90
Shoegazer's proposed mania changes
MillhioreF Mar 10, 2018
eeb1243
formatting
MillhioreF Mar 10, 2018
3faf5c5
This should be a max probably
MillhioreF Mar 10, 2018
bb89d8a
Remove original acc bonus for many notes (reimplemented elsewhere)
MillhioreF Apr 2, 2018
35a5fa1
Merge pull request #3 from ppy/master
MillhioreF May 9, 2018
294f3ef
Reapply merge-overwritten changes and fix mismatched brackets
MillhioreF May 9, 2018
eef8593
Merge branch 'master' into shoegazer-changes
MillhioreF May 10, 2018
fdc62f9
squash
MillhioreF May 10, 2018
e9eb021
Change pp scaling multiplier
MillhioreF May 10, 2018
77735f7
Unoverwrite some refactoring
MillhioreF May 10, 2018
ac43a4c
)
MillhioreF May 10, 2018
8609c57
0.8x multiplier
MillhioreF May 10, 2018
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
22 changes: 13 additions & 9 deletions Src/Processor/Mania/ManiaScore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ void ManiaScore::computeTotalValue()
return;
}

// Custom multipliers for NoFail and SpunOut.
f32 multiplier = 1.1f; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things
/*
Arbitrary initial value for scaling pp in order to standardize distributions across game modes.
The specific number has no intrinsic meaning and can be adjusted as needed.
*/
f32 multiplier = 0.8f;

if ((_mods & EMods::NoFail) > 0)
multiplier *= 0.90f;
Expand Down Expand Up @@ -77,7 +80,7 @@ void ManiaScore::computeStrainValue(const Beatmap& beatmap)
_score *= static_cast<s32>(1.0f / scoreMultiplier); // We don't really mind rounding errors with such small magnitude.

// Obtain strain difficulty
_strainValue = pow(5.0f * std::max(1.0f, beatmap.DifficultyAttribute(_mods, Beatmap::Strain) / 0.0825f) - 4.0f, 3.0f) / 110000.0f;
_strainValue = pow(5.0f * std::max(1.0f, beatmap.DifficultyAttribute(_mods, Beatmap::Strain) / 0.2f) - 4.0f, 2.2f) / 135.0f;

// Longer maps are worth more
_strainValue *= 1 + 0.1f * std::min(1.0f, static_cast<f32>(TotalHits()) / 1500.0f);
Expand All @@ -88,13 +91,13 @@ void ManiaScore::computeStrainValue(const Beatmap& beatmap)
else if (_score <= 600000)
_strainValue *= static_cast<f32>(_score - 500000) / 100000.0f * 0.3f;
else if (_score <= 700000)
_strainValue *= 0.3f + static_cast<f32>(_score - 600000) / 100000.0f * 0.35f;
_strainValue *= 0.3f + static_cast<f32>(_score - 600000) / 100000.0f * 0.25f;
else if (_score <= 800000)
_strainValue *= 0.65f + static_cast<f32>(_score - 700000) / 100000.0f * 0.20f;
_strainValue *= 0.55f + static_cast<f32>(_score - 700000) / 100000.0f * 0.20f;
else if (_score <= 900000)
_strainValue *= 0.85f + static_cast<f32>(_score - 800000) / 100000.0f * 0.1f;
_strainValue *= 0.75f + static_cast<f32>(_score - 800000) / 100000.0f * 0.15f;
else
_strainValue *= 0.95f + static_cast<f32>(_score - 900000) / 100000.0f * 0.05f;
_strainValue *= 0.90f + static_cast<f32>(_score - 900000) / 100000.0f * 0.1f;
}

void ManiaScore::computeAccValue(const Beatmap& beatmap)
Expand All @@ -108,10 +111,11 @@ void ManiaScore::computeAccValue(const Beatmap& beatmap)

// Lots of arbitrary values from testing.
// Considering to use derivation from perfect accuracy in a probabilistic manner - assume normal distribution
_accValue = pow((150.0f / hitWindow300) * pow(Accuracy(), 16), 1.8f) * 2.5f;
_accValue = std::max(0.0f, 0.2f - ((hitWindow300 - 34) * 0.006667f)) * _strainValue
* pow((std::max(0.0f, static_cast<f32>(_score - 960000)) / 40000.0f), 1.1f);

// Bonus for many hitcircles - it's harder to keep good accuracy up for longer
_accValue *= std::min<f32>(1.15f, pow(static_cast<f32>(TotalHits()) / 1500.0f, 0.3f));
//_accValue *= std::min<f32>(1.15f, pow(static_cast<f32>(TotalHits()) / 1500.0f, 0.3f));
}

f32 ManiaScore::Accuracy() const
Expand Down