From c8093b1e3d18dabf37f1236e1c6fbe1f0fda2613 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:57:36 +0000 Subject: [PATCH 1/2] Bump ppy.osu.Game from 2023.511.0 to 2023.614.1 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2023.511.0 to 2023.614.1. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2023.511.0...2023.614.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.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj b/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj index f3ccbf1..fd8c6b5 100644 --- a/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj +++ b/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj @@ -11,7 +11,7 @@ - + From 497f411a58e14ce13739e6b55a18ce1b4d26d65d Mon Sep 17 00:00:00 2001 From: Alden Wu Date: Wed, 14 Jun 2023 21:10:11 -0700 Subject: [PATCH 2/2] Ruleset: Fix `CreateStatisticsForScore` method --- osu.Game.Rulesets.Soyokaze/SoyokazeRuleset.cs | 76 +++++++------------ 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/osu.Game.Rulesets.Soyokaze/SoyokazeRuleset.cs b/osu.Game.Rulesets.Soyokaze/SoyokazeRuleset.cs index 7aa07d4..d91c03d 100644 --- a/osu.Game.Rulesets.Soyokaze/SoyokazeRuleset.cs +++ b/osu.Game.Rulesets.Soyokaze/SoyokazeRuleset.cs @@ -9,8 +9,6 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Framework.Input.Bindings; -using osu.Framework.Logging; -using osu.Framework.Platform; using osu.Game.Beatmaps; using osu.Game.Configuration; using osu.Game.Overlays.Settings; @@ -77,66 +75,46 @@ public override ISkin CreateSkinTransformer(ISkin skin, IBeatmap beatmap) public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new SoyokazeReplayFrame(); - public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) + public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) { - List[] HitEventsLists = new List[8]; - for (int i = 0; i < HitEventsLists.Length; i++) - HitEventsLists[i] = new List(); + var hitEventLists = new List[8]; + for (int i = 0; i < hitEventLists.Length; i++) + hitEventLists[i] = new List(); - foreach (HitEvent hitEvent in score.HitEvents) + foreach (var hitEvent in score.HitEvents) { if (!(hitEvent.HitObject is SoyokazeHitObject soyokazeObject)) continue; - Logger.Log("OBJECT: " + hitEvent.HitObject.GetType()); - - HitEventsLists[(int)soyokazeObject.Button].Add(hitEvent); + hitEventLists[(int)soyokazeObject.Button].Add(hitEvent); } - return new StatisticRow[] + return new[] { - new StatisticRow + new StatisticItem("Button Accuracies", () => { - Columns = new StatisticItem[] + Container accuracyGraphsContainer = new Container() { - new StatisticItem("Button Accuracies", () => - { - Container accuracyGraphsContainer = new Container() - { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - AutoSizeAxes = Axes.Both, - }; - Vector2[] positions = PositionExtensions.GetPositions(220, 110, true, Anchor.Centre); - for (int i = 0; i < positions.Length; i++) - accuracyGraphsContainer.Add(new AccuracyGraph(HitEventsLists[i]) { Position = positions[i] }); - return accuracyGraphsContainer; - }), - }, - }, - new StatisticRow + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + AutoSizeAxes = Axes.Both, + }; + Vector2[] positions = PositionExtensions.GetPositions(220, 110, true, Anchor.Centre); + for (int i = 0; i < positions.Length; i++) + accuracyGraphsContainer.Add(new AccuracyGraph(hitEventLists[i]) { Position = positions[i] }); + return accuracyGraphsContainer; + }, true), + new StatisticItem("Overall Distribution", () => new HitEventTimingDistributionGraph(score.HitEvents) { - Columns = new StatisticItem[] - { - new StatisticItem("Overall Distribution", () => new HitEventTimingDistributionGraph(score.HitEvents) - { - RelativeSizeAxes = Axes.X, - Size = new Vector2(1f, 100f) - }), - } - }, - new StatisticRow + RelativeSizeAxes = Axes.X, + Size = new Vector2(1f, 100f) + }, true), + new StatisticItem("", () => new UnstableRate(score.HitEvents) { - Columns = new StatisticItem[] - { - new StatisticItem("", () => new UnstableRate(score.HitEvents) - { - AutoSizeAxes = Axes.None, - RelativeSizeAxes = Axes.X, - Size = new Vector2(0.2f, 10f) - }), - }, - }, + AutoSizeAxes = Axes.None, + RelativeSizeAxes = Axes.X, + Size = new Vector2(0.2f, 10f) + }, true), }; }