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

Fix mania SR inflation for hold note releases in quick succession #17913

Merged
merged 7 commits into from
Apr 26, 2022
Merged

Fix mania SR inflation for hold note releases in quick succession #17913

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0a83fb
Use closest endTime for holdAddition validity
molneya Apr 21, 2022
e7a149a
Use curve for holdAddition validity cutoff
molneya Apr 21, 2022
574007c
Optimise holdAddition calculation
molneya Apr 21, 2022
97b4a2a
Use better initial value for closestEndTime
molneya Apr 22, 2022
56bbfa5
Add missing absolute value of closestEndTime
molneya Apr 22, 2022
8b55d38
Use isOverlapping bool to determine holdAddition
molneya Apr 22, 2022
6cca56a
Move release_threshold to const
molneya Apr 23, 2022
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
14 changes: 9 additions & 5 deletions osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,35 @@ protected override double StrainValueOf(DifficultyHitObject current)
var maniaCurrent = (ManiaDifficultyHitObject)current;
double endTime = maniaCurrent.EndTime;
int column = maniaCurrent.BaseObject.Column;
double closestEndTime = 100;

double holdFactor = 1.0; // Factor to all additional strains in case something else is held
double holdAddition = 0; // Addition to the current note in case it's a hold and has to be released awkwardly

// Fill up the holdEndTimes array
for (int i = 0; i < holdEndTimes.Length; ++i)
{
// If there is at least one other overlapping end or note, then we get an addition, buuuuuut...
// If there is at least one other overlapping end or note, then we get an addition
if (Precision.DefinitelyBigger(holdEndTimes[i], maniaCurrent.StartTime, 1) && Precision.DefinitelyBigger(endTime, holdEndTimes[i], 1))
holdAddition = 1.0;

// ... this addition only is valid if there is _no_ other note with the same ending. Releasing multiple notes at the same time is just as easy as releasing 1
if (Precision.AlmostEquals(endTime, holdEndTimes[i], 1))
holdAddition = 0;

// We give a slight bonus to everything if something is held meanwhile
if (Precision.DefinitelyBigger(holdEndTimes[i], endTime, 1))
holdFactor = 1.25;

closestEndTime = Math.Min(closestEndTime, Math.Abs(endTime - holdEndTimes[i]));

// Decay individual strains
individualStrains[i] = applyDecay(individualStrains[i], current.DeltaTime, individual_decay_base);
}

holdEndTimes[column] = endTime;

// The hold addition only is valid if there is _no_ other note with the same ending. Releasing multiple notes at the same time is just as easy as releasing 1
// Nerfs the hold addition by half if the closest release is 24ms away
if (holdAddition > 0)
holdAddition *= 1 / (1 + Math.Exp(0.5 * (24 - closestEndTime)));

// Increase individual strain in own column
individualStrains[column] += 2.0 * holdFactor;
individualStrain = individualStrains[column];
Expand Down