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

CI fixes.

This commit is contained in:
smoogipooo 2017-04-26 17:04:57 +09:00
parent d9dec9d444
commit 47cd91fa63
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Taiko/Objects/TaikoHitObjectDifficulty.cs
View File

@ -27,14 +27,14 @@ internal class TaikoHitObjectDifficulty
/// </summary>
internal double Strain = 1;
private double timeElapsed = 0;
private double timeElapsed;
private int sameTypeSince = 1;
private bool isRim => BaseHitObject is RimHit;
public TaikoHitObjectDifficulty(TaikoHitObject baseHitObject)
{
this.BaseHitObject = baseHitObject;
BaseHitObject = baseHitObject;
}
internal void CalculateStrains(TaikoHitObjectDifficulty previousHitObject, double timeRate)

30
osu.Game.Rulesets.Taiko/TaikoDifficultyCalculator.cs
View File

@ -30,7 +30,7 @@ internal class TaikoDifficultyCalculator : DifficultyCalculator<TaikoHitObject>
/// <summary>
/// HitObjects are stored as a member variable.
/// </summary>
private List<TaikoHitObjectDifficulty> difficultyHitObjects = new List<TaikoHitObjectDifficulty>();
private readonly List<TaikoHitObjectDifficulty> difficultyHitObjects = new List<TaikoHitObjectDifficulty>();
public TaikoDifficultyCalculator(Beatmap beatmap)
: base(beatmap)
@ -64,22 +64,22 @@ protected override double CalculateInternal(Dictionary<string, string> categoryD
private bool calculateStrainValues()
{
// Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
List<TaikoHitObjectDifficulty>.Enumerator hitObjectsEnumerator = difficultyHitObjects.GetEnumerator();
if (!hitObjectsEnumerator.MoveNext()) return false;
TaikoHitObjectDifficulty currentHitObject = hitObjectsEnumerator.Current;
TaikoHitObjectDifficulty nextHitObject;
// First hitObject starts at strain 1. 1 is the default for strain values, so we don't need to set it here. See DifficultyHitObject.
while (hitObjectsEnumerator.MoveNext())
using (List<TaikoHitObjectDifficulty>.Enumerator hitObjectsEnumerator = difficultyHitObjects.GetEnumerator())
{
nextHitObject = hitObjectsEnumerator.Current;
nextHitObject.CalculateStrains(currentHitObject, TimeRate);
currentHitObject = nextHitObject;
}
if (!hitObjectsEnumerator.MoveNext()) return false;
return true;
TaikoHitObjectDifficulty current = hitObjectsEnumerator.Current;
// First hitObject starts at strain 1. 1 is the default for strain values, so we don't need to set it here. See DifficultyHitObject.
while (hitObjectsEnumerator.MoveNext())
{
var next = hitObjectsEnumerator.Current;
next?.CalculateStrains(current, TimeRate);
current = next;
}
return true;
}
}
private double calculateDifficulty()