h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
Code Issues Releases Wiki Activity

Tidy up string output

Browse Source
This commit is contained in:
Dean Herbert 2019-10-28 12:31:38 +09:00
parent 1953aa64b6
commit 43ad4a3a3c
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
View File

@ -24,6 +24,11 @@ namespace osu.Game.Beatmaps.ControlPoints
set => beatLength = MathHelper.Clamp(value, 6, 60000);
}
/// <summary>
/// The BPM at this control point.
/// </summary>
public double BPM => 60000 / BeatLength;
private double beatLength = DEFAULT_BEAT_LENGTH;
public override bool EquivalentTo(ControlPoint other) =>

2
osu.Game/Screens/Edit/Timing/DifficultySection.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Timing
{
base.LoadComplete();
ControlPoint.BindValueChanged(point => { multiplier.Text = $"Multiplier: {point.NewValue?.SpeedMultiplier}"; });
ControlPoint.BindValueChanged(point => { multiplier.Text = $"Multiplier: {point.NewValue?.SpeedMultiplier::0.##}x"; });
}
protected override DifficultyControlPoint CreatePoint()

4
osu.Game/Screens/Edit/Timing/EffectSection.cs
View File

@ -25,8 +25,8 @@ namespace osu.Game.Screens.Edit.Timing
ControlPoint.BindValueChanged(point =>
{
kiai.Text = $"Kiai: {point.NewValue?.KiaiMode}";
omitBarLine.Text = $"Skip Bar Line: {point.NewValue?.OmitFirstBarLine}";
kiai.Text = $"Kiai: {(point.NewValue?.KiaiMode == true ? "on" : "off")}";
omitBarLine.Text = $"Skip Bar Line: {(point.NewValue?.OmitFirstBarLine == true ? "on" : "off")}";
});
}

4
osu.Game/Screens/Edit/Timing/SampleSection.cs
View File

@ -37,8 +37,8 @@ namespace osu.Game.Screens.Edit.Timing
ControlPoint.BindValueChanged(point =>
{
bank.Text = $"Bank: {point.NewValue?.SampleBank}";
volume.Text = $"Volume: {point.NewValue?.SampleVolume}";
volume.Text = $"Volume: {point.NewValue?.SampleVolume}%";
});
}
}
}
}

2
osu.Game/Screens/Edit/Timing/TimingSection.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Timing
ControlPoint.BindValueChanged(point =>
{
bpm.Text = $"BPM: {point.NewValue?.BeatLength}";
bpm.Text = $"BPM: {point.NewValue?.BPM:0.##}";
timeSignature.Text = $"Signature: {point.NewValue?.TimeSignature}";
});
}