sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improve code quality

Browse Source
This commit is contained in:
Pasi4K5
2022-08-14 19:02:29 +02:00
parent 7a41b9f25a
commit 5106c00a9c
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Mods
for (int i = 0; i < positionInfos.Count; i++) for (int i = 0; i < positionInfos.Count; i++)
{ {
if (shouldStartNewSection(osuBeatmap, positionInfos, i, 0.6f, 0.4f)) if (shouldStartNewSection(osuBeatmap, positionInfos, i))
{ {
sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0008f); sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0008f);
flowDirection = !flowDirection; flowDirection = !flowDirection;
@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Mods
// Offsets only the angle of the current hit object. // Offsets only the angle of the current hit object.
float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f); float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
if (shouldApplyFlowChange(positionInfos, i, 0.6f)) if (shouldApplyFlowChange(positionInfos, i))
{ {
flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f); flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
flowDirection = !flowDirection; flowDirection = !flowDirection;
@ -95,33 +95,35 @@ namespace osu.Game.Rulesets.Osu.Mods
return flowDirection ? -relativeAngle : relativeAngle; return flowDirection ? -relativeAngle : relativeAngle;
} }
/// <summary>
/// A new section should be started...<br/>
/// ...at the beginning of the <see cref="OsuBeatmap"/>.<br/>
/// ...on every combo start with a probability of <paramref name="newComboProbability"/> (excluding new-combo-spam and 1-2-combos).<br/>
/// ...on every downbeat.<br/>
/// ...on every beat with a probability of <paramref name="beatProbability"/>.<br/>
/// </summary>
/// <returns>Whether a new section should be started at the current <see cref="OsuHitObject"/>.</returns> /// <returns>Whether a new section should be started at the current <see cref="OsuHitObject"/>.</returns>
private bool shouldStartNewSection( private bool shouldStartNewSection(OsuBeatmap beatmap, IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i)
OsuBeatmap beatmap, {
IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, if (i == 0)
int i, return true;
float newComboProbability,
float beatProbability // Exclude new-combo-spam and 1-2-combos.
) => bool previousObjectStartedCombo = positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
i == 0 || positionInfos[i - 1].HitObject.NewCombo;
(positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng?.NextDouble() < newComboProbability) || bool previousObjectWasOnDownbeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject, true);
OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject, true) || bool previousObjectWasOnBeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject);
(OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject) && rng?.NextDouble() < beatProbability);
return (previousObjectStartedCombo && randomBool(0.6f)) ||
previousObjectWasOnDownbeat ||
(previousObjectWasOnBeat && randomBool(0.4f));
}
/// <summary>
/// A flow change should occur on every combo start with a probability of <paramref name="probability"/> (excluding new-combo-spam and 1-2-combos).
/// </summary>
/// <returns>Whether a flow change should be applied at the current <see cref="OsuHitObject"/>.</returns> /// <returns>Whether a flow change should be applied at the current <see cref="OsuHitObject"/>.</returns>
private bool shouldApplyFlowChange(IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i, float probability) => private bool shouldApplyFlowChange(IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i)
positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && {
positionInfos[i - 1].HitObject.NewCombo && // Exclude new-combo-spam and 1-2-combos.
bool previousObjectStartedCombo = positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
positionInfos[i - 1].HitObject.NewCombo;
return previousObjectStartedCombo && randomBool(0.6f);
}
/// <returns>true with a probability of <paramref name="probability"/>, false otherwise.</returns>
private bool randomBool(float probability) =>
rng?.NextDouble() < probability; rng?.NextDouble() < probability;
} }
} }