diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs index 09e93beb..f25a0b5c 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); diff --git a/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs b/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs index 6365a765..5e20bff0 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/Objects/Drawables/DrawableStarSheet.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs index 4d0b4ee4..1ebe8dae 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 b4c75989..c77c4430 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 diff --git a/osu.Game.Rulesets.Rush/RushRuleset.cs b/osu.Game.Rulesets.Rush/RushRuleset.cs index 9c508d8f..4e80fc78 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; diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj index f88aab21..b81f60e0 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 @@ - +