h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues Releases Wiki Activity

Removed TaikoInputBlockingMod, and instead moved code into TaikoModSingleTap

Browse Source
This commit is contained in:
OpenSauce04 2023-02-28 15:14:03 +00:00
parent beb04379f9
commit 7c84a84fbe
2 changed files with 113 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
osu.Game.Rulesets.Taiko/Mods/TaikoInputBlockingMod.cs
View File

@ -1,122 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Beatmaps.Timing;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Taiko.Objects;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Play;
using osu.Game.Utils;
using osu.Game.Rulesets.Taiko.UI;
namespace osu.Game.Rulesets.Taiko.Mods
{
public abstract partial class TaikoInputBlockingMod : Mod, IApplicableToDrawableRuleset<TaikoHitObject>, IUpdatableByPlayfield
{
public override double ScoreMultiplier => 1.0;
public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax), typeof(TaikoModCinema) };
public override ModType Type => ModType.Conversion;
private DrawableTaikoRuleset ruleset = null!;
private TaikoPlayfield playfield { get; set; } = null!;
protected TaikoAction? LastAcceptedDonAction { get; private set; }
protected TaikoAction? LastAcceptedKatAction { get; private set; }
/// <summary>
/// A tracker for periods where alternate should not be forced (i.e. non-gameplay periods).
/// </summary>
/// <remarks>
/// This is different from <see cref="Player.IsBreakTime"/> in that the periods here end strictly at the first object after the break, rather than the break's end time.
/// </remarks>
private PeriodTracker nonGameplayPeriods = null!;
private IFrameStableClock gameplayClock = null!;
public void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
{
ruleset = (DrawableTaikoRuleset)drawableRuleset;
ruleset.InputManager.Add(new InputInterceptor(this));
playfield = (TaikoPlayfield)ruleset.Playfield;
var periods = new List<Period>();
if (drawableRuleset.Objects.Any())
{
periods.Add(new Period(int.MinValue, getValidJudgementTime(ruleset.Objects.First()) - 1));
foreach (BreakPeriod b in drawableRuleset.Beatmap.Breaks)
periods.Add(new Period(b.StartTime, getValidJudgementTime(ruleset.Objects.First(h => h.StartTime >= b.EndTime)) - 1));
static double getValidJudgementTime(HitObject hitObject) => hitObject.StartTime - hitObject.HitWindows.WindowFor(HitResult.Meh);
}
nonGameplayPeriods = new PeriodTracker(periods);
gameplayClock = drawableRuleset.FrameStableClock;
}
public void Update(Playfield playfield)
{
if (!nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime)) return;
if (LastAcceptedDonAction != null)
LastAcceptedDonAction = null;
if (LastAcceptedKatAction != null)
LastAcceptedKatAction = null;
}
protected abstract bool CheckValidNewAction(TaikoAction action);
private bool checkCorrectAction(TaikoAction action)
{
if (nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
return true;
// If next hit object is strong, allow usage of all actions. Strong drumrolls are ignored in this check.
if (playfield.HitObjectContainer.AliveObjects.FirstOrDefault(h => h.Result?.HasResult != true)?.HitObject is TaikoStrongableHitObject hitObject
&& hitObject.IsStrong
&& hitObject as DrumRoll == null)
return true;
if (CheckValidNewAction(action))
{
if (action == TaikoAction.LeftCentre || action == TaikoAction.RightCentre)
LastAcceptedDonAction = action;
if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
LastAcceptedKatAction = action;
return true;
}
return false;
}
private partial class InputInterceptor : Component, IKeyBindingHandler<TaikoAction>
{
private readonly TaikoInputBlockingMod mod;
public InputInterceptor(TaikoInputBlockingMod mod)
{
this.mod = mod;
}
public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
// if the pressed action is incorrect, block it from reaching gameplay.
=> !mod.checkCorrectAction(e.Action);
public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e)
{
}
}
}
}

115
osu.Game.Rulesets.Taiko/Mods/TaikoModSingleTap.cs
View File

@ -2,15 +2,126 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Localisation;
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Beatmaps.Timing;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Taiko.Objects;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Play;
using osu.Game.Utils;
using osu.Game.Rulesets.Taiko.UI;
namespace osu.Game.Rulesets.Taiko.Mods
{
public class TaikoModSingleTap : TaikoInputBlockingMod
public class TaikoModSingleTap : Mod, IApplicableToDrawableRuleset<TaikoHitObject>, IUpdatableByPlayfield
{
public override string Name => @"Single Tap";
public override string Acronym => @"SG";
public override LocalisableString Description => @"One key for dons, one key for kats.";
protected override bool CheckValidNewAction(TaikoAction action) => LastAcceptedDonAction == null || LastAcceptedDonAction == action || LastAcceptedKatAction == null || LastAcceptedKatAction == action;
protected bool CheckValidNewAction(TaikoAction action) => LastAcceptedDonAction == null || LastAcceptedDonAction == action || LastAcceptedKatAction == null || LastAcceptedKatAction == action;
public override double ScoreMultiplier => 1.0;
public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax), typeof(TaikoModCinema) };
public override ModType Type => ModType.Conversion;
private DrawableTaikoRuleset ruleset = null!;
private TaikoPlayfield playfield { get; set; } = null!;
protected TaikoAction? LastAcceptedDonAction { get; private set; }
protected TaikoAction? LastAcceptedKatAction { get; private set; }
/// <summary>
/// A tracker for periods where alternate should not be forced (i.e. non-gameplay periods).
/// </summary>
/// <remarks>
/// This is different from <see cref="Player.IsBreakTime"/> in that the periods here end strictly at the first object after the break, rather than the break's end time.
/// </remarks>
private PeriodTracker nonGameplayPeriods = null!;
private IFrameStableClock gameplayClock = null!;
public void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
{
ruleset = (DrawableTaikoRuleset)drawableRuleset;
ruleset.InputManager.Add(new InputInterceptor(this));
playfield = (TaikoPlayfield)ruleset.Playfield;
var periods = new List<Period>();
if (drawableRuleset.Objects.Any())
{
periods.Add(new Period(int.MinValue, getValidJudgementTime(ruleset.Objects.First()) - 1));
foreach (BreakPeriod b in drawableRuleset.Beatmap.Breaks)
periods.Add(new Period(b.StartTime, getValidJudgementTime(ruleset.Objects.First(h => h.StartTime >= b.EndTime)) - 1));
static double getValidJudgementTime(HitObject hitObject) => hitObject.StartTime - hitObject.HitWindows.WindowFor(HitResult.Meh);
}
nonGameplayPeriods = new PeriodTracker(periods);
gameplayClock = drawableRuleset.FrameStableClock;
}
public void Update(Playfield playfield)
{
if (!nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime)) return;
if (LastAcceptedDonAction != null)
LastAcceptedDonAction = null;
if (LastAcceptedKatAction != null)
LastAcceptedKatAction = null;
}
private bool checkCorrectAction(TaikoAction action)
{
if (nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
return true;
// If next hit object is strong, allow usage of all actions. Strong drumrolls are ignored in this check.
if (playfield.HitObjectContainer.AliveObjects.FirstOrDefault(h => h.Result?.HasResult != true)?.HitObject is TaikoStrongableHitObject hitObject
&& hitObject.IsStrong
&& hitObject as DrumRoll == null)
return true;
if (CheckValidNewAction(action))
{
if (action == TaikoAction.LeftCentre || action == TaikoAction.RightCentre)
LastAcceptedDonAction = action;
if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
LastAcceptedKatAction = action;
return true;
}
return false;
}
private partial class InputInterceptor : Component, IKeyBindingHandler<TaikoAction>
{
private readonly TaikoModSingleTap mod;
public InputInterceptor(TaikoModSingleTap mod)
{
this.mod = mod;
}
public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
// if the pressed action is incorrect, block it from reaching gameplay.
=> !mod.checkCorrectAction(e.Action);
public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e)
{
}
}
}
}