sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

CI cleanups

Browse Source
This commit is contained in:
smoogipoo 2019-12-13 21:29:10 +09:00
parent 9bc02f489e
commit ea4eb6b204
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,9 +225,9 @@ namespace osu.Game.Beatmaps.Formats
LegacyHitObjectType hitObjectType = (LegacyHitObjectType)(comboData.ComboOffset << 4); LegacyHitObjectType hitObjectType = (LegacyHitObjectType)(comboData.ComboOffset << 4);
if (comboData.NewCombo) if (comboData.NewCombo)
hitObjectType |= LegacyHitObjectType.NewCombo; hitObjectType |= LegacyHitObjectType.NewCombo;
if (hitObject is IHasCurve _) if (hitObject is IHasCurve)
hitObjectType |= LegacyHitObjectType.Slider; hitObjectType |= LegacyHitObjectType.Slider;
else if (hitObject is IHasEndTime _) else if (hitObject is IHasEndTime)
hitObjectType |= LegacyHitObjectType.Spinner | LegacyHitObjectType.NewCombo; hitObjectType |= LegacyHitObjectType.Spinner | LegacyHitObjectType.NewCombo;
else else
hitObjectType |= LegacyHitObjectType.Circle; hitObjectType |= LegacyHitObjectType.Circle;
@ -237,10 +237,9 @@ namespace osu.Game.Beatmaps.Formats
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(hitObject is IHasCurve
writer.Write(FormattableString.Invariant($"0,")); // A sound type of "none" is written since it's stored per-node ? FormattableString.Invariant($"0,")
else : FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
if (hitObject is IHasCurve curveData) if (hitObject is IHasCurve curveData)
{ {
@ -307,10 +306,9 @@ 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},"));
if (hitObject is IHasCurve _) writer.Write(hitObject is IHasCurve
writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true)); // A bank of "none" is written since it's stored per-node ? getSampleBank(hitObject.Samples, zeroBanks: true)
else : getSampleBank(hitObject.Samples));
writer.Write(getSampleBank(hitObject.Samples));
writer.Write(Environment.NewLine); writer.Write(Environment.NewLine);
} }