sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move approach rate to EffectControlPoint

Browse Source
This commit is contained in:
Dean Herbert
2021-08-31 23:59:36 +09:00
parent 4eb09ea1a9
commit a3d9ab1e2e
29 changed files with 88 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
View File

@ -12,7 +12,8 @@ namespace osu.Game.Beatmaps.ControlPoints
public static readonly EffectControlPoint DEFAULT = new EffectControlPoint
{
KiaiModeBindable = { Disabled = true },
OmitFirstBarLineBindable = { Disabled = true }
OmitFirstBarLineBindable = { Disabled = true },
ApproachRateBindable = { Disabled = true }
};
/// <summary>
@ -20,6 +21,26 @@ namespace osu.Game.Beatmaps.ControlPoints
/// </summary>
public readonly BindableBool OmitFirstBarLineBindable = new BindableBool();
/// <summary>
/// The relative approach rate at this control point.
/// </summary>
public readonly BindableDouble ApproachRateBindable = new BindableDouble(1)
{
Precision = 0.01,
Default = 1,
MinValue = 0.01,
MaxValue = 10
};
/// <summary>
/// The relative approach rate.
/// </summary>
public double ApproachRate
{
get => ApproachRateBindable.Value;
set => ApproachRateBindable.Value = value;
}
public override Color4 GetRepresentingColour(OsuColour colours) => colours.Purple;
/// <summary>
@ -49,12 +70,14 @@ namespace osu.Game.Beatmaps.ControlPoints
=> !OmitFirstBarLine
&& existing is EffectControlPoint existingEffect
&& KiaiMode == existingEffect.KiaiMode
&& OmitFirstBarLine == existingEffect.OmitFirstBarLine;
&& OmitFirstBarLine == existingEffect.OmitFirstBarLine
&& ApproachRate == existingEffect.ApproachRate;
public override void CopyFrom(ControlPoint other)
{
KiaiMode = ((EffectControlPoint)other).KiaiMode;
OmitFirstBarLine = ((EffectControlPoint)other).OmitFirstBarLine;
ApproachRate = ((EffectControlPoint)other).ApproachRate;
base.CopyFrom(other);
}