From 52d79fa1543b48df9c5f83fd020ea0a002847da7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Oct 2021 20:40:09 +0000 Subject: [PATCH 1/3] Bump ppy.osu.Game from 2021.916.0 to 2021.1006.1 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2021.916.0 to 2021.1006.1. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2021.916.0...2021.1006.1) --- updated-dependencies: - dependency-name: ppy.osu.Game dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj index d51438b7..cf9879fc 100644 --- a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj +++ b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj @@ -14,7 +14,7 @@ - + From 15fbf966ab1b456872d7d5ab95fd90467c94350d Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Wed, 6 Oct 2021 22:49:42 +0200 Subject: [PATCH 2/3] Replace use of BeatmapDifficulty --- osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs | 4 ++-- osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs | 2 +- osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs | 2 +- osu.Game.Rulesets.Tau/UI/Cursor/TauCursor.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs b/osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs index 60e4f5da..20deb61d 100644 --- a/osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs +++ b/osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs @@ -27,7 +27,7 @@ public void TestManyDistributionEvents() public void TestAroundCentre() { var beatmap = new TestBeatmap(new TauRuleset().RulesetInfo); - var angleRange = (float)BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10); + var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10); createTest(Enumerable.Range(0, (int)angleRange).Select(i => new HitEvent(i / 50f, HitResult.Perfect, new Beat(), new Beat(), new Vector2((i - (angleRange / 2)), 0))).ToList()); } @@ -64,7 +64,7 @@ public static List CreateDistributedHitEvents() { var hitEvents = new List(); var beatmap = new TestBeatmap(new TauRuleset().RulesetInfo); - var angleRange = (float)BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10); + var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10); for (int i = 0; i < 100; i++) { diff --git a/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs b/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs index 62dca0b7..5da05a0b 100644 --- a/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs +++ b/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs @@ -38,7 +38,7 @@ protected override IEnumerable ConvertHitObject(HitObject original if (!CanConvertToSliders) goto default; - if (pathData.Duration < BeatmapDifficulty.DifficultyRange(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / 2) + if (pathData.Duration < IBeatmapDifficultyInfo.DifficultyRange(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / 2) goto default; var nodes = new List(); diff --git a/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs b/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs index dd619be7..7d3e01b1 100644 --- a/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs +++ b/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs @@ -29,7 +29,7 @@ public PaddleDistributionGraph(IReadOnlyList hitEvents, IBeatmap beatm { this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.HitObject is Beat && e.Result.IsHit()).ToList(); - angleRange = (float)BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10); + angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10); } [BackgroundDependencyLoader] diff --git a/osu.Game.Rulesets.Tau/UI/Cursor/TauCursor.cs b/osu.Game.Rulesets.Tau/UI/Cursor/TauCursor.cs index ead0855c..ce74243b 100644 --- a/osu.Game.Rulesets.Tau/UI/Cursor/TauCursor.cs +++ b/osu.Game.Rulesets.Tau/UI/Cursor/TauCursor.cs @@ -27,7 +27,7 @@ public class TauCursor : CompositeDrawable public TauCursor(BeatmapDifficulty difficulty) { - angleRange = (float)BeatmapDifficulty.DifficultyRange(difficulty.CircleSize, 75, 25, 10); + angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.CircleSize, 75, 25, 10); Origin = Anchor.Centre; Anchor = Anchor.Centre; From 0c1ae2cddbbd4aef92bc87274f623746c4c1665d Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Wed, 6 Oct 2021 22:51:19 +0200 Subject: [PATCH 3/3] some missed ones --- osu.Game.Rulesets.Tau/Objects/TauHitObject.cs | 4 ++-- osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game.Rulesets.Tau/Objects/TauHitObject.cs b/osu.Game.Rulesets.Tau/Objects/TauHitObject.cs index 8267643c..371f1c7e 100644 --- a/osu.Game.Rulesets.Tau/Objects/TauHitObject.cs +++ b/osu.Game.Rulesets.Tau/Objects/TauHitObject.cs @@ -70,11 +70,11 @@ public bool LastInCombo protected override HitWindows CreateHitWindows() => new TauHitWindows(); - protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty) + protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty) { base.ApplyDefaultsToSelf(controlPointInfo, difficulty); - TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450); + TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450); TimeFadeIn = 100; } diff --git a/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs b/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs index 803b875b..64e59135 100644 --- a/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs +++ b/osu.Game.Rulesets.Tau/UI/TauResumeOverlay.cs @@ -25,7 +25,7 @@ public class TauResumeOverlay : ResumeOverlay public TauResumeOverlay(BeatmapDifficulty difficulty) { - angleRange = (float)BeatmapDifficulty.DifficultyRange(difficulty.CircleSize, 75, 25, 10); + angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.CircleSize, 75, 25, 10); } [BackgroundDependencyLoader]