RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-28 08:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove suffix hackery

Browse Source
This commit is contained in:
smoogipoo 2020-04-14 21:33:32 +09:00
parent 00d564d29c
commit 44981431c5
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -420,24 +420,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
{ {
customSampleBank = value; customSampleBank = value;
// A 0 custom sample bank should cause LegacyBeatmapSkin to always fall back to the user skin. This is done by giving a null suffix. if (value >= 2)
if (value > 0)
Suffix = value.ToString(); Suffix = value.ToString();
} }
} }
public override IEnumerable<string> LookupNames
{
get
{
// The lookup should only contain the suffix for custom sample bank 2 and beyond.
// For custom sample bank 1 and 0, the lookup should not contain the suffix as only the lookup source (beatmap or user skin) is changed.
if (CustomSampleBank >= 2)
yield return $"{Bank}-{Name}{Suffix}";
yield return $"{Bank}-{Name}";
}
}
} }
private class FileHitSampleInfo : LegacyHitSampleInfo private class FileHitSampleInfo : LegacyHitSampleInfo

5
osu.Game/Skinning/LegacyBeatmapSkin.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Bindables;
using osu.Framework.IO.Stores; using osu.Framework.IO.Stores;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Objects.Legacy;
namespace osu.Game.Skinning namespace osu.Game.Skinning
{ {
@ -37,9 +38,9 @@ namespace osu.Game.Skinning
public override SampleChannel GetSample(ISampleInfo sampleInfo) public override SampleChannel GetSample(ISampleInfo sampleInfo)
{ {
if (sampleInfo is HitSampleInfo hsi && string.IsNullOrEmpty(hsi.Suffix)) if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
{ {
// When no custom sample set is provided, always fall-back to the default samples. // When no custom sample bank is provided, always fall-back to the default samples.
return null; return null;
} }