h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-16 01:33:22 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors.

Browse Source
This commit is contained in:
smoogipooo 2017-03-23 19:39:30 +09:00
parent 99cd215f56
commit a0c0a0fcfe
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
View File

@ -140,11 +140,11 @@ namespace osu.Game.Modes.Taiko
// 3 times bonus points for hitting a finisher with both keys with 120 finishers in the map
finisherScoreScale = -7d / 90d * MathHelper.Clamp(finishers.Count, 30, 120) + 111d / 9d;
foreach (TaikoHitObject obj in beatmap.HitObjects)
foreach (var obj in beatmap.HitObjects)
{
if (obj is Hit)
{
AddJudgement(new TaikoJudgementInfo
AddJudgement(new TaikoJudgement
{
Result = HitResult.Hit,
TaikoResult = TaikoHitResult.Great,
@ -155,7 +155,7 @@ namespace osu.Game.Modes.Taiko
{
for (int i = 0; i < ((DrumRoll)obj).TotalTicks; i++)
{
AddJudgement(new TaikoDrumRollTickJudgementInfo
AddJudgement(new TaikoDrumRollTickJudgement
{
Result = HitResult.Hit,
TaikoResult = TaikoHitResult.Great,
@ -163,7 +163,7 @@ namespace osu.Game.Modes.Taiko
});
}
AddJudgement(new TaikoJudgementInfo
AddJudgement(new TaikoJudgement
{
Result = HitResult.Hit,
TaikoResult = TaikoHitResult.Great,
@ -172,7 +172,7 @@ namespace osu.Game.Modes.Taiko
}
else if (obj is Bash)
{
AddJudgement(new TaikoJudgementInfo
AddJudgement(new TaikoJudgement
{
Result = HitResult.Hit,
TaikoResult = TaikoHitResult.Great
@ -184,9 +184,9 @@ namespace osu.Game.Modes.Taiko
maxComboPortion = comboPortion;
}
protected override void UpdateCalculations(TaikoJudgementInfo newJudgement)
protected override void UpdateCalculations(TaikoJudgement newJudgement)
{
TaikoDrumRollTickJudgementInfo tickJudgement = newJudgement as TaikoDrumRollTickJudgementInfo;
var tickJudgement = newJudgement as TaikoDrumRollTickJudgement;
// Don't consider ticks as a type of hit that counts towards map completion
if (tickJudgement == null)