1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 10:07:27 +08:00

Adjust naming

This commit is contained in:
smoogipoo 2019-02-18 14:55:39 +09:00
parent 46b979a412
commit 7f4643a83d

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 = 1; private int sameColourCount = 1;
protected override double StrainValueOf(DifficultyHitObject current) protected override double StrainValueOf(DifficultyHitObject current)
{ {
@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
else else
{ {
lastColourSwitch = ColourSwitch.None; lastColourSwitch = ColourSwitch.None;
sameTypeCount = 1; sameColourCount = 1;
} }
double additionFactor = 1; double additionFactor = 1;
@ -71,15 +71,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
if (!taikoCurrent.HasTypeChange) if (!taikoCurrent.HasTypeChange)
{ {
sameTypeCount++; sameColourCount++;
return false; return false;
} }
var oldColourSwitch = lastColourSwitch; var oldColourSwitch = lastColourSwitch;
var newColourSwitch = sameTypeCount % 2 == 0 ? ColourSwitch.Even : ColourSwitch.Odd; var newColourSwitch = sameColourCount % 2 == 0 ? ColourSwitch.Even : ColourSwitch.Odd;
lastColourSwitch = newColourSwitch; lastColourSwitch = newColourSwitch;
sameTypeCount = 1; sameColourCount = 1;
// We only want a bonus if the parity of the color switch changes // We only want a bonus if the parity of the color switch changes
return oldColourSwitch != ColourSwitch.None && oldColourSwitch != newColourSwitch; return oldColourSwitch != ColourSwitch.None && oldColourSwitch != newColourSwitch;