h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00
Code Issues Releases Wiki Activity

Rename judgement count to not mention "shape"

Browse Source
This commit is contained in:
Dean Herbert 2022-09-22 15:18:20 +09:00
parent e48fe3a9e2
commit f3898da37a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
View File

@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Gameplay
public void TestJudgementAmountChange() public void TestJudgementAmountChange()
{ {
AddRepeatStep("Add judgement", applyOneJudgement, 10); AddRepeatStep("Add judgement", applyOneJudgement, 10);
AddStep("Judgement count change to 4", () => colourHitErrorMeter.HitShapeCount.Value = 4); AddStep("Judgement count change to 4", () => colourHitErrorMeter.JudgementCount.Value = 4);
AddRepeatStep("Add judgement", applyOneJudgement, 8); AddRepeatStep("Add judgement", applyOneJudgement, 8);
} }

10
osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
private const int drawable_judgement_size = 8; private const int drawable_judgement_size = 8;
[SettingSource("Judgement count", "Number of displayed judgements")] [SettingSource("Judgement count", "Number of displayed judgements")]
public BindableNumber<int> HitShapeCount { get; } = new BindableNumber<int>(20) public BindableNumber<int> JudgementCount { get; } = new BindableNumber<int>(20)
{ {
MinValue = 1, MinValue = 1,
MaxValue = 30, MaxValue = 30,
@ -60,7 +60,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
if (!judgement.Type.IsScorable() || judgement.Type.IsBonus()) if (!judgement.Type.IsScorable() || judgement.Type.IsBonus())
return; return;
judgementsFlow.Push(GetColourForHitResult(judgement.Type), HitShapeCount.Value); judgementsFlow.Push(GetColourForHitResult(judgement.Type), JudgementCount.Value);
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -69,14 +69,14 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
HitShapeOpacity.BindValueChanged(_ => judgementsFlow.Alpha = HitShapeOpacity.Value, true); HitShapeOpacity.BindValueChanged(_ => judgementsFlow.Alpha = HitShapeOpacity.Value, true);
HitShapeSpacing.BindValueChanged(_ => HitShapeSpacing.BindValueChanged(_ =>
{ {
judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value; judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
judgementsFlow.Spacing = new Vector2(0, HitShapeSpacing.Value); judgementsFlow.Spacing = new Vector2(0, HitShapeSpacing.Value);
}, true); }, true);
HitShapeCount.BindValueChanged(_ => JudgementCount.BindValueChanged(_ =>
{ {
//Used to clear out the overflowing judgement children when the value is lowered //Used to clear out the overflowing judgement children when the value is lowered
judgementsFlow.RemoveAll(_ => true, true); judgementsFlow.RemoveAll(_ => true, true);
judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value; judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
}, true); }, true);
HitShape.BindValueChanged(_ => judgementsFlow.Shape.Value = HitShape.Value, true); HitShape.BindValueChanged(_ => judgementsFlow.Shape.Value = HitShape.Value, true);
} }