sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 02:37:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Moved CheckValidNewAction checks into checkCorrectAction

Browse Source
This commit is contained in:
OpenSauce04 2023-03-06 11:10:57 +00:00
parent 4ae2661f1b
commit 36108ea841
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,16 +26,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
public override string Acronym => @"SG"; public override string Acronym => @"SG";
public override LocalisableString Description => @"One key for dons, one key for kats."; public override LocalisableString Description => @"One key for dons, one key for kats.";
protected bool CheckValidNewAction(TaikoAction action)
{
if (action == TaikoAction.LeftCentre || action == TaikoAction.RightCentre)
return lastAcceptedCentreAction == null || lastAcceptedCentreAction == action;
if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
return lastAcceptedRimAction == null || lastAcceptedRimAction == action;
return true;
}
public override double ScoreMultiplier => 1.0; public override double ScoreMultiplier => 1.0;
public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax), typeof(TaikoModCinema) }; public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax), typeof(TaikoModCinema) };
public override ModType Type => ModType.Conversion; public override ModType Type => ModType.Conversion;
@ -99,13 +89,17 @@ namespace osu.Game.Rulesets.Taiko.Mods
&& hitObject is not DrumRoll) && hitObject is not DrumRoll)
return true; return true;
if (CheckValidNewAction(action)) if ((action == TaikoAction.LeftCentre || action == TaikoAction.RightCentre)
&& (lastAcceptedCentreAction == null || lastAcceptedCentreAction == action))
{ {
if (action == TaikoAction.LeftCentre || action == TaikoAction.RightCentre) lastAcceptedCentreAction = action;
lastAcceptedCentreAction = action; return true;
if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim) }
lastAcceptedRimAction = action;
if ((action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
&& (lastAcceptedRimAction == null || lastAcceptedRimAction == action))
{
lastAcceptedRimAction = action;
return true; return true;
} }