Fix colour changes not being reset

This commit is contained in:
smoogipoo 2019-02-18 14:55:20 +09:00
parent cb17cbcdc4
commit 46b979a412
2 changed files with 10 additions and 5 deletions

View File

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
private ColourSwitch lastColourSwitch = ColourSwitch.None; private ColourSwitch lastColourSwitch = ColourSwitch.None;
private int sameTypeCount; private int sameTypeCount = 1;
protected override double StrainValueOf(DifficultyHitObject current) protected override double StrainValueOf(DifficultyHitObject current)
{ {
@ -28,11 +28,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
// We get an extra addition if we are not a slider or spinner // We get an extra addition if we are not a slider or spinner
if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000) if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000)
{ {
if (hasRhythmChange(current))
addition += 1;
if (hasColourChange(current)) if (hasColourChange(current))
addition += 0.75; addition += 0.75;
if (hasRhythmChange(current))
addition += 1;
}
else
{
lastColourSwitch = ColourSwitch.None;
sameTypeCount = 1;
} }
double additionFactor = 1; double additionFactor = 1;

View File

@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
{ {
public class TaikoDifficultyCalculator : DifficultyCalculator public class TaikoDifficultyCalculator : DifficultyCalculator
{ {
private const double star_scaling_factor = 0.018; private const double star_scaling_factor = 0.04125;
public TaikoDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap) public TaikoDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
: base(ruleset, beatmap) : base(ruleset, beatmap)