h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-11 01:07:23 +08:00
Code Issues Releases Wiki Activity

Merge pull request #32098 from bdach/dont-drop-green-line-sample-bank

Browse Source 
Attempt to preserve sample control point bank when encoding beatmap
This commit is contained in:
Dean Herbert 2025-03-04 18:32:16 +09:00 committed by GitHub
commit d9162daac2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
View File

@ -319,11 +319,13 @@ namespace osu.Game.Beatmaps.Formats
SampleControlPoint createSampleControlPointFor(double time, IList<HitSampleInfo> samples) SampleControlPoint createSampleControlPointFor(double time, IList<HitSampleInfo> samples)
{ {
int volume = samples.Max(o => o.Volume); int volume = samples.Max(o => o.Volume);
string bank = samples.Where(s => s.Name == HitSampleInfo.HIT_NORMAL).Select(s => s.Bank).FirstOrDefault()
?? samples.Select(s => s.Bank).First();
int customIndex = samples.Any(o => o is ConvertHitObjectParser.LegacyHitSampleInfo) int customIndex = samples.Any(o => o is ConvertHitObjectParser.LegacyHitSampleInfo)
? samples.OfType<ConvertHitObjectParser.LegacyHitSampleInfo>().Max(o => o.CustomSampleBank) ? samples.OfType<ConvertHitObjectParser.LegacyHitSampleInfo>().Max(o => o.CustomSampleBank)
: -1; : -1;
return new LegacyBeatmapDecoder.LegacySampleControlPoint { Time = time, SampleVolume = volume, CustomSampleBank = customIndex }; return new LegacyBeatmapDecoder.LegacySampleControlPoint { Time = time, SampleVolume = volume, SampleBank = bank, CustomSampleBank = customIndex };
} }
} }