sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix taiko sample mapping for strong hits

Browse Source
This commit is contained in:
Dean Herbert
2020-05-11 12:53:54 +09:00
parent 7072207c7c
commit b4d790c076
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
View File

@ -167,13 +167,39 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
default:
{
bool isRim = samples.Any(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE);
bool isRimDefinition(HitSampleInfo s) => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE;
bool isRim = samples.Any(isRimDefinition);
if (isRim)
{
// consume then remove the rim definition sample types.
var updatedSamples = samples.Where(s => !isRimDefinition(s)).ToList();
// strong + rim always maps to whistle.
if (strong)
{
for (var i = 0; i < updatedSamples.Count; i++)
{
var s = samples[i];
if (s.Name != HitSampleInfo.HIT_FINISH)
continue;
var sClone = s.Clone();
sClone.Name = HitSampleInfo.HIT_WHISTLE;
updatedSamples[i] = sClone;
}
}
samples = updatedSamples;
}
yield return new Hit
{
StartTime = obj.StartTime,
Type = isRim ? HitType.Rim : HitType.Centre,
Samples = obj.Samples,
Samples = samples,
IsStrong = strong
};