h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00
Code Issues Releases Wiki Activity

Removed odd-looking decrement and checks in addHitSamples

Browse Source
This commit is contained in:
Henry Lin 2021-06-24 10:54:21 +08:00
parent 58b439b728
commit 04510f1ace
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
View File

@ -217,29 +217,32 @@ namespace osu.Game.Rulesets.Osu.Mods
{
var lastSampleIdx = 0;
foreach (var x in hitObjects)
foreach (var obj in hitObjects)
{
var samples = getSamplesAtTime(origHitObjects, x.StartTime);
var samples = getSamplesAtTime(origHitObjects, obj.StartTime);
if (samples == null)
{
while (lastSampleIdx < origHitObjects.Count && origHitObjects[lastSampleIdx].StartTime <= x.StartTime)
// If samples aren't available at the exact start time of the object,
// use samples (without additions) in the closest original hit object instead
while (lastSampleIdx < origHitObjects.Count && origHitObjects[lastSampleIdx].StartTime <= obj.StartTime)
lastSampleIdx++;
lastSampleIdx--;
if (lastSampleIdx < 0 && lastSampleIdx >= origHitObjects.Count) continue;
if (lastSampleIdx >= origHitObjects.Count) continue;
if (lastSampleIdx < origHitObjects.Count - 1)
if (lastSampleIdx > 0)
{
// get samples from the next hit object if it is closer in time
if (origHitObjects[lastSampleIdx + 1].StartTime - x.StartTime < x.StartTime - origHitObjects[lastSampleIdx].StartTime)
lastSampleIdx++;
// get samples from the previous hit object if it is closer in time
if (obj.StartTime - origHitObjects[lastSampleIdx - 1].StartTime < origHitObjects[lastSampleIdx].StartTime - obj.StartTime)
lastSampleIdx--;
}
x.Samples = origHitObjects[lastSampleIdx].Samples.Where(s => !HitSampleInfo.AllAdditions.Contains(s.Name)).ToList();
// Remove additions
obj.Samples = origHitObjects[lastSampleIdx].Samples.Where(s => !HitSampleInfo.AllAdditions.Contains(s.Name)).ToList();
}
else
x.Samples = samples;
obj.Samples = samples;
}
}