RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove superfluous IsRepeat field

This commit is contained in:
Bartłomiej Dach 2020-08-18 19:34:44 +02:00
parent f22050c975
commit c6a640db55
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Taiko/Difficulty/Preprocessing/TaikoDifficultyHitObjectRhythm.cs
View File

@ -7,13 +7,11 @@ public class TaikoDifficultyHitObjectRhythm
{
public readonly double Difficulty;
public readonly double Ratio;
public readonly bool IsRepeat;
public TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty, bool isRepeat)
public TaikoDifficultyHitObjectRhythm(int numerator, int denominator, double difficulty)
{
Ratio = numerator / (double)denominator;
Difficulty = difficulty;
IsRepeat = isRepeat;
}
}
}

2
osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
View File

@ -92,7 +92,7 @@ protected override double StrainValueOf(DifficultyHitObject current)
TaikoDifficultyHitObject hitobject = (TaikoDifficultyHitObject)current;
notesSinceRhythmChange += 1;
if (hitobject.Rhythm.IsRepeat)
if (hitobject.Rhythm.Difficulty == 0.0)
{
return 0.0;
}

18
osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
View File

@ -26,15 +26,15 @@ public class TaikoDifficultyCalculator : DifficultyCalculator
private readonly TaikoDifficultyHitObjectRhythm[] commonRhythms =
{
new TaikoDifficultyHitObjectRhythm(1, 1, 0.0, true),
new TaikoDifficultyHitObjectRhythm(2, 1, 0.3, false),
new TaikoDifficultyHitObjectRhythm(1, 2, 0.5, false),
new TaikoDifficultyHitObjectRhythm(3, 1, 0.3, false),
new TaikoDifficultyHitObjectRhythm(1, 3, 0.35, false),
new TaikoDifficultyHitObjectRhythm(3, 2, 0.6, false),
new TaikoDifficultyHitObjectRhythm(2, 3, 0.4, false),
new TaikoDifficultyHitObjectRhythm(5, 4, 0.5, false),
new TaikoDifficultyHitObjectRhythm(4, 5, 0.7, false)
new TaikoDifficultyHitObjectRhythm(1, 1, 0.0),
new TaikoDifficultyHitObjectRhythm(2, 1, 0.3),
new TaikoDifficultyHitObjectRhythm(1, 2, 0.5),
new TaikoDifficultyHitObjectRhythm(3, 1, 0.3),
new TaikoDifficultyHitObjectRhythm(1, 3, 0.35),
new TaikoDifficultyHitObjectRhythm(3, 2, 0.6),
new TaikoDifficultyHitObjectRhythm(2, 3, 0.4),
new TaikoDifficultyHitObjectRhythm(5, 4, 0.5),
new TaikoDifficultyHitObjectRhythm(4, 5, 0.7)
};
public TaikoDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)