h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:07:44 +08:00
Code Issues Releases Wiki Activity

Rename finisher -> accented.

Browse Source
This commit is contained in:
smoogipooo 2017-03-24 11:09:01 +09:00
parent 4e31e3b443
commit afdb719c60
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
IHasRepeats repeatsData = original as IHasRepeats;
IHasEndTime endTimeData = original as IHasEndTime;
bool isFinisher = ((original.Sample?.Type ?? SampleType.None) & SampleType.Finish) > 0;
bool accented = ((original.Sample?.Type ?? SampleType.None) & SampleType.Finish) > 0;
if (distanceData != null)
{
@ -52,7 +52,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
{
StartTime = original.StartTime,
Sample = original.Sample,
IsFinisher = isFinisher,
Accented = accented,
Distance = distanceData.Distance * (repeatsData?.RepeatCount ?? 1)
};
@ -65,7 +65,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
{
StartTime = original.StartTime,
Sample = original.Sample,
IsFinisher = isFinisher,
Accented = accented,
EndTime = original.StartTime + endTimeData.Duration * bash_convert_factor
};
@ -75,7 +75,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
{
StartTime = original.StartTime,
Sample = original.Sample,
IsFinisher = isFinisher
Accented = accented
};
}
}

5
osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
View File

@ -20,9 +20,10 @@ namespace osu.Game.Modes.Taiko.Objects
public double PreEmpt;
/// <summary>
/// Whether this HitObject is a finisher.
/// Whether this HitObject is accented.
/// Accented hit objects give more points for hitting the hit object with both keys.
/// </summary>
public bool IsFinisher;
public bool Accented;
/// <summary>
/// Whether this HitObject is in Kiai time.

8
osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -134,7 +134,7 @@ namespace osu.Game.Modes.Taiko.Scoring
hpIncreaseGood = hpMultiplierNormal * BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.Difficulty.DrainRate, hp_hit_good_max, hp_hit_good, hp_hit_good);
hpIncreaseMiss = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.Difficulty.DrainRate, hp_miss_min, hp_miss_mid, hp_miss_max);
var finishers = beatmap.HitObjects.FindAll(o => o is Hit && o.IsFinisher);
var finishers = beatmap.HitObjects.FindAll(o => o is Hit && o.Accented);
// This is a linear function that awards:
// 10 times bonus points for hitting a finisher with both keys with 30 finishers in the map
@ -149,7 +149,7 @@ namespace osu.Game.Modes.Taiko.Scoring
{
Result = HitResult.Hit,
TaikoResult = TaikoHitResult.Great,
SecondHit = obj.IsFinisher
SecondHit = obj.Accented
});
}
else if (obj is DrumRoll)
@ -160,7 +160,7 @@ namespace osu.Game.Modes.Taiko.Scoring
{
Result = HitResult.Hit,
TaikoResult = TaikoHitResult.Great,
SecondHit = obj.IsFinisher
SecondHit = obj.Accented
});
}
@ -168,7 +168,7 @@ namespace osu.Game.Modes.Taiko.Scoring
{
Result = HitResult.Hit,
TaikoResult = TaikoHitResult.Great,
SecondHit = obj.IsFinisher
SecondHit = obj.Accented
});
}
else if (obj is Bash)