From 81f8f89a9a60760b1bb3c25bff018bfe168d79f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 12:51:16 +0000 Subject: [PATCH 1/5] Bump ppy.osu.Game from 2022.118.0 to 2022.126.0 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2022.118.0 to 2022.126.0. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2022.118.0...2022.126.0) --- 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.Sentakki/osu.Game.Rulesets.Sentakki.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj index 5fb14f707..d2a04d3a8 100644 --- a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj +++ b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj @@ -9,7 +9,7 @@ osu.Game.Rulesets.Sentakki - + From 9f67661c33eea60d19a95def9c5d27c0cbc532fa Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Wed, 26 Jan 2022 14:00:41 +0100 Subject: [PATCH 2/5] Update test host usage --- osu.Game.Rulesets.Sentakki.Tests/VisualTestRunner.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Sentakki.Tests/VisualTestRunner.cs b/osu.Game.Rulesets.Sentakki.Tests/VisualTestRunner.cs index 2393ea51a..be6a8aca6 100644 --- a/osu.Game.Rulesets.Sentakki.Tests/VisualTestRunner.cs +++ b/osu.Game.Rulesets.Sentakki.Tests/VisualTestRunner.cs @@ -10,7 +10,7 @@ public static class VisualTestRunner [STAThread] public static int Main(string[] args) { - using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true)) + using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu", new HostOptions { BindIPC = true })) { host.Run(new OsuTestBrowser()); return 0; From 7d10e5c41bb481aa0950f5d038cd0267821427fe Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Wed, 26 Jan 2022 14:02:04 +0100 Subject: [PATCH 3/5] Use Difficulty instead of BaseDifficulty --- .../Beatmaps/SentakkiBeatmapConverter.cs | 2 +- .../Beatmaps/SentakkiPatternGenerator.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverter.cs b/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverter.cs index 39afc8455..fccdd932a 100644 --- a/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverter.cs +++ b/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverter.cs @@ -43,7 +43,7 @@ protected override Beatmap ConvertBeatmap(IBeatmap original, // But we initialize to defaults so HR can adjust HitWindows in a controlled manner // We clone beforehand to avoid altering the original (it really should be readonly :P) convertedBeatmap.BeatmapInfo = convertedBeatmap.BeatmapInfo.Clone(); - convertedBeatmap.BeatmapInfo.BaseDifficulty = new BeatmapDifficulty(); + convertedBeatmap.BeatmapInfo.Difficulty = new BeatmapDifficulty(); return convertedBeatmap; } diff --git a/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiPatternGenerator.cs b/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiPatternGenerator.cs index 1cbf2a5fe..14539e92b 100644 --- a/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiPatternGenerator.cs +++ b/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiPatternGenerator.cs @@ -25,7 +25,7 @@ public class SentakkiPatternGenerator public SentakkiPatternGenerator(IBeatmap beatmap) { this.beatmap = beatmap; - var difficulty = beatmap.BeatmapInfo.BaseDifficulty; + var difficulty = beatmap.BeatmapInfo.Difficulty; int seed = ((int)MathF.Round(difficulty.DrainRate + difficulty.CircleSize) * 20) + (int)(difficulty.OverallDifficulty * 41.2) + (int)MathF.Round(difficulty.ApproachRate); rng = new Random(seed); } @@ -195,7 +195,7 @@ private IEnumerable createTapsFromTicks(HitObject original) if (isRepeatSpam) yield break; - var difficulty = beatmap.BeatmapInfo.BaseDifficulty; + var difficulty = beatmap.BeatmapInfo.Difficulty; var controlPointInfo = (LegacyControlPointInfo)beatmap.ControlPointInfo; From 092096b65b93f0b65115ce8943de991021d6f10f Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Wed, 26 Jan 2022 14:04:50 +0100 Subject: [PATCH 4/5] Update use of TimeSignature --- osu.Game.Rulesets.Sentakki/UI/Components/LiveCounter.cs | 2 +- osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Sentakki/UI/Components/LiveCounter.cs b/osu.Game.Rulesets.Sentakki/UI/Components/LiveCounter.cs index 27ab738be..95a8b7afb 100644 --- a/osu.Game.Rulesets.Sentakki/UI/Components/LiveCounter.cs +++ b/osu.Game.Rulesets.Sentakki/UI/Components/LiveCounter.cs @@ -74,7 +74,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, float panicDurationMultiplier = 1 * MathF.Pow(0.75f, panicLevel); float beatMagnitude = 0.1f + (0.05f * panicLevel); - if (beatIndex % (int)((int)timingPoint.TimeSignature * Math.Max(panicDurationMultiplier, 0.5f)) == 0) + if (beatIndex % (int)(timingPoint.TimeSignature.Numerator * Math.Max(panicDurationMultiplier, 0.5f)) == 0) this.ScaleTo(1 + beatMagnitude, 200 * panicDurationMultiplier) .Then().ScaleTo(1, 120 * panicDurationMultiplier) .Then().ScaleTo(1 + beatMagnitude, 160 * panicDurationMultiplier) diff --git a/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs b/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs index d93d8b907..b4ad4bdd0 100644 --- a/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs +++ b/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs @@ -127,7 +127,7 @@ protected override void PopIn() messageText.Text = "Get ready!"; var currentTimingPoint = beatmap.Value.Beatmap.ControlPointInfo.TimingPointAt(beatmap.Value.Track.CurrentTime); - barLength = (int)currentTimingPoint.TimeSignature; + barLength = currentTimingPoint.TimeSignature.Numerator; beatlength = currentTimingPoint.BeatLength; // Reset the countdown, plus a second for preparation From d9b6ce2fbe3400ff1d8b3ff03f2570f121d910af Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Thu, 27 Jan 2022 15:03:15 +0100 Subject: [PATCH 5/5] Bump to newer package --- osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj index d2a04d3a8..4d32b956f 100644 --- a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj +++ b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj @@ -9,7 +9,7 @@ osu.Game.Rulesets.Sentakki - +