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

Fix sound types and banks not being written correctly

Browse Source
This commit is contained in:
smoogipoo 2019-12-12 20:04:46 +09:00
parent ac984423bb
commit 53a665a034
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,6 +236,10 @@ namespace osu.Game.Beatmaps.Formats
writer.Write(FormattableString.Invariant($"{positionData.Y},")); writer.Write(FormattableString.Invariant($"{positionData.Y},"));
writer.Write(FormattableString.Invariant($"{hitObject.StartTime},")); writer.Write(FormattableString.Invariant($"{hitObject.StartTime},"));
writer.Write(FormattableString.Invariant($"{(int)hitObjectType},")); writer.Write(FormattableString.Invariant($"{(int)hitObjectType},"));
if (hitObject is IHasCurve _)
writer.Write(FormattableString.Invariant($"0,")); // A sound type of "none" is written since it's stored per-node
else
writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},")); writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
if (hitObject is IHasCurve curveData) if (hitObject is IHasCurve curveData)
@ -303,7 +307,11 @@ namespace osu.Game.Beatmaps.Formats
else if (hitObject is IHasEndTime endTimeData) else if (hitObject is IHasEndTime endTimeData)
writer.Write(FormattableString.Invariant($"{endTimeData.EndTime},")); writer.Write(FormattableString.Invariant($"{endTimeData.EndTime},"));
writer.Write(getSampleBank(hitObject.Samples)); if (hitObject is IHasCurve _)
writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true)); // A bank of "none" is written since it's stored per-node
else
writer.Write(getSampleBank(hitObject.Samples));
writer.Write(Environment.NewLine); writer.Write(Environment.NewLine);
} }
@ -319,14 +327,11 @@ namespace osu.Game.Beatmaps.Formats
{ {
} }
private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false) private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
{ {
LegacySampleBank normalBank = toLegacySampleBank(samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank); LegacySampleBank normalBank = toLegacySampleBank(samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);
LegacySampleBank addBank = toLegacySampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name) && s.Name != HitSampleInfo.HIT_NORMAL)?.Bank); LegacySampleBank addBank = toLegacySampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name) && s.Name != HitSampleInfo.HIT_NORMAL)?.Bank);
if (addBank == LegacySampleBank.None)
addBank = normalBank;
string customSampleBank = toLegacyCustomSampleBank(samples.FirstOrDefault()?.Suffix); string customSampleBank = toLegacyCustomSampleBank(samples.FirstOrDefault()?.Suffix);
string sampleFilename = samples.FirstOrDefault(s => string.IsNullOrEmpty(s.Name))?.LookupNames.First() ?? string.Empty; string sampleFilename = samples.FirstOrDefault(s => string.IsNullOrEmpty(s.Name))?.LookupNames.First() ?? string.Empty;
@ -334,8 +339,8 @@ namespace osu.Game.Beatmaps.Formats
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.Append(FormattableString.Invariant($"{(int)normalBank}:")); sb.Append(FormattableString.Invariant($"{(zeroBanks ? 0 : (int)normalBank)}:"));
sb.Append(FormattableString.Invariant($"{(int)addBank}")); sb.Append(FormattableString.Invariant($"{(zeroBanks ? 0 : (int)addBank)}"));
if (!banksOnly) if (!banksOnly)
{ {