h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:02:54 +08:00
Code Issues Releases Wiki Activity

Extract duplicated conditionals

Browse Source
This commit is contained in:
Henry Lin 2022-03-03 10:43:04 +08:00
parent 55737226a3
commit ff7f65de27
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Graphics.Audio;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
@ -124,10 +125,7 @@ namespace osu.Game.Rulesets.Mods
drawable.OnNewResult += (o, result) => drawable.OnNewResult += (o, result) =>
{ {
if (dequeuedRates.ContainsKey(result.HitObject)) return; if (dequeuedRates.ContainsKey(result.HitObject)) return;
if (!shouldProcessResult(result)) return;
if (!result.IsHit) return;
if (!result.Type.AffectsAccuracy()) return;
if (!previousEndTimes.ContainsKey(result.HitObject)) return;
double prevEndTime = previousEndTimes[result.HitObject]; double prevEndTime = previousEndTimes[result.HitObject];
@ -141,10 +139,7 @@ namespace osu.Game.Rulesets.Mods
drawable.OnRevertResult += (o, result) => drawable.OnRevertResult += (o, result) =>
{ {
if (!dequeuedRates.ContainsKey(result.HitObject)) return; if (!dequeuedRates.ContainsKey(result.HitObject)) return;
if (!shouldProcessResult(result)) return;
if (!result.IsHit) return;
if (!result.Type.AffectsAccuracy()) return;
if (!previousEndTimes.ContainsKey(result.HitObject)) return;
recentRates.Insert(0, dequeuedRates[result.HitObject]); recentRates.Insert(0, dequeuedRates[result.HitObject]);
recentRates.RemoveAt(recentRates.Count - 1); recentRates.RemoveAt(recentRates.Count - 1);
@ -179,5 +174,14 @@ namespace osu.Game.Rulesets.Mods
yield return nested; yield return nested;
} }
} }
private bool shouldProcessResult(JudgementResult result)
{
if (!result.IsHit) return false;
if (!result.Type.AffectsAccuracy()) return false;
if (!previousEndTimes.ContainsKey(result.HitObject)) return false;
return true;
}
} }
} }