From 840042eb08268d244ea9e354ac59f6b2fd2e140f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Jul 2023 20:09:18 +0000 Subject: [PATCH 1/4] Bump ppy.osu.Game from 2023.419.0 to 2023.717.0 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2023.419.0 to 2023.717.0. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2023.419.0...2023.717.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.Rush/osu.Game.Rulesets.Rush.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj index f88aab2..b81f60e 100644 --- a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj +++ b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj @@ -1,4 +1,4 @@ - + Debug;Release;Development net6.0 @@ -33,6 +33,6 @@ - + From ac53714197484c1c20d96c267c82514ff13460d0 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Tue, 25 Jul 2023 11:37:46 +0200 Subject: [PATCH 2/4] Adjust test scene to avoid breakage --- .../Visual/TestSceneTouchInputHandling.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs index 09e93be..f25a0b5 100644 --- a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs +++ b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs @@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Rush.Tests.Visual { + public partial class TestSceneTouchInputHandling : OsuManualInputManagerTestScene { protected override Ruleset CreateRuleset() => new RushRuleset(); @@ -27,20 +28,26 @@ public partial class TestSceneTouchInputHandling : OsuManualInputManagerTestScen private TouchRegion groundRegion; private TouchRegion feverRegion; - private KeyCounterDisplay keyCounters; + //private KeyCounterDisplay keyCounters; private RushInputManager rushInputManager; + //[Cached] + //private InputCountController controller = null!; + [BackgroundDependencyLoader] private void load() { + rushInputManager = new RushInputManager(Ruleset.Value); + Children = new Drawable[] { + //controller = new InputCountController(), airRegion = new TouchRegion { RelativeSizeAxes = Axes.Both, Anchor = Anchor.TopCentre, Origin = Anchor.TopCentre, - Size = new Vector2(1,0.5f), + Size = new Vector2(1, 0.5f), Action = RushActionTarget.Air, Colour = Color4.Aqua, @@ -51,7 +58,7 @@ private void load() RelativeSizeAxes = Axes.Both, Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, - Size = new Vector2(1,0.5f), + Size = new Vector2(1, 0.5f), Action = RushActionTarget.Ground, Colour = Color4.Red, @@ -68,15 +75,13 @@ private void load() Colour = Color4.Purple, Alpha = 0.8f, }, - keyCounters = new DefaultKeyCounterDisplay() + /*keyCounters = new DefaultKeyCounterDisplay() { Origin = Anchor.BottomRight, Anchor = Anchor.BottomRight, - } + }*/ }; - rushInputManager = new RushInputManager(Ruleset.Value); - rushInputManager.Attach(keyCounters); var tmpChild = InputManager.Child; InputManager.Clear(false); From 316ab0cab55d6f5f5482fc0abe3477d3b0a4cbd6 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Tue, 25 Jul 2023 11:38:02 +0200 Subject: [PATCH 3/4] Make some classes partial --- osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs | 2 +- osu.Game.Rulesets.Rush/RushRuleset.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs b/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs index 6365a76..5e20bff 100644 --- a/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs +++ b/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs @@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Rush.Mods { - public class RushModFlashlight : ModFlashlight + public partial class RushModFlashlight : ModFlashlight { public override double ScoreMultiplier => 1.12; diff --git a/osu.Game.Rulesets.Rush/RushRuleset.cs b/osu.Game.Rulesets.Rush/RushRuleset.cs index 9c508d8..4e80fc7 100644 --- a/osu.Game.Rulesets.Rush/RushRuleset.cs +++ b/osu.Game.Rulesets.Rush/RushRuleset.cs @@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Rush { - public class RushRuleset : Ruleset + public partial class RushRuleset : Ruleset { public override string RulesetAPIVersionSupported => CURRENT_RULESET_API_VERSION; From cadf0ae10cdc9344103c5ccfcae0f334133615ab Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Tue, 25 Jul 2023 13:05:18 +0200 Subject: [PATCH 4/4] Fix crash --- .../Objects/Drawables/DrawableStarSheet.cs | 9 ++++++++- .../Objects/Drawables/DrawableStarSheetHead.cs | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs index 4d0b4ee..1ebe8da 100644 --- a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs +++ b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs @@ -189,8 +189,15 @@ public override bool OnPressed(KeyBindingPressEvent e) public override void OnReleased(KeyBindingReleaseEvent e) { + // TODO: HACK FIX FOR HOTFIX, NEEDS FURTHER INVESTIGATION + if (!IsInUse) + return; + + if (AllJudged) + return; + // Note sheet not held yet (i.e. not our time yet) or already broken / finished. - if (Judged || !Head.IsHit) + if (Judged) return; if (!LaneMatchesAction(e.Action)) diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetHead.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetHead.cs index b4c7598..c77c443 100644 --- a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetHead.cs +++ b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetHead.cs @@ -1,7 +1,9 @@ // Copyright (c) Shane Woolcock. Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using System; using osu.Framework.Graphics; +using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Scoring; namespace osu.Game.Rulesets.Rush.Objects.Drawables