Replace IsKat with HitType

This commit is contained in:
smoogipoo
2020-08-13 01:35:56 +09:00
parent d2a03f1146
commit 5010d2044a
3 changed files with 49 additions and 57 deletions

View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Rulesets.Taiko.Objects;
namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
{
@ -17,10 +18,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
hitObjects = difficultyHitObjects;
findRolls(3);
findRolls(4);
findTlTap(0, true);
findTlTap(1, true);
findTlTap(0, false);
findTlTap(1, false);
findTlTap(0, HitType.Rim);
findTlTap(1, HitType.Rim);
findTlTap(0, HitType.Centre);
findTlTap(1, HitType.Centre);
}
private void findRolls(int patternLength)
@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
for (int j = 0; j < patternLength; j++)
{
if (history[j].IsKat != history[j + patternLength].IsKat)
if (history[j].HitType != history[j + patternLength].HitType)
{
isRepeat = false;
}
@ -63,13 +64,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
}
}
private void findTlTap(int parity, bool kat)
private void findTlTap(int parity, HitType type)
{
int tlLength = -2;
for (int i = parity; i < hitObjects.Count; i += 2)
{
if (kat == hitObjects[i].IsKat)
if (hitObjects[i].HitType == type)
{
tlLength += 2;
}

View File

@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
public class TaikoDifficultyHitObject : DifficultyHitObject
{
public readonly TaikoDifficultyHitObjectRhythm Rhythm;
public readonly bool IsKat;
public readonly HitType? HitType;
public bool StaminaCheese = false;
@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Preprocessing
double prevLength = (lastObject.StartTime - lastLastObject.StartTime) / clockRate;
Rhythm = getClosestRhythm(DeltaTime / prevLength, commonRhythms);
IsKat = currentHit?.Type == HitType.Rim;
HitType = currentHit?.Type;
ObjectIndex = objectIndex;
}