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

Fix up taiko judgement creation

Browse Source
This commit is contained in:
smoogipoo 2018-08-03 16:11:38 +09:00
parent 482526135f
commit fa3c919e2e
5 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
View File

@ -3,11 +3,8 @@
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using System; using System;
using System.Collections.Generic;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Taiko.Judgements;
namespace osu.Game.Rulesets.Taiko.Objects namespace osu.Game.Rulesets.Taiko.Objects
{ {
@ -84,13 +81,5 @@ namespace osu.Game.Rulesets.Taiko.Objects
first = false; first = false;
} }
} }
protected override IEnumerable<Judgement> CreateJudgements()
{
yield return new TaikoJudgement();
if (IsStrong)
yield return new TaikoStrongHitJudgement();
}
} }
} }

9
osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Taiko.Judgements; using osu.Game.Rulesets.Taiko.Judgements;
@ -25,12 +24,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
/// </summary> /// </summary>
public double HitWindow => TickSpacing / 2; public double HitWindow => TickSpacing / 2;
protected override IEnumerable<Judgement> CreateJudgements() protected override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
{
yield return new TaikoDrumRollTickJudgement();
if (IsStrong)
yield return new TaikoStrongHitJudgement();
}
} }
} }

11
osu.Game.Rulesets.Taiko/Objects/Hit.cs
View File

@ -1,20 +1,9 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Taiko.Judgements;
namespace osu.Game.Rulesets.Taiko.Objects namespace osu.Game.Rulesets.Taiko.Objects
{ {
public class Hit : TaikoHitObject public class Hit : TaikoHitObject
{ {
protected override IEnumerable<Judgement> CreateJudgements()
{
yield return new TaikoJudgement();
if (IsStrong)
yield return new TaikoStrongHitJudgement();
}
} }
} }

11
osu.Game.Rulesets.Taiko/Objects/Swell.cs
View File

@ -1,10 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Taiko.Judgements;
namespace osu.Game.Rulesets.Taiko.Objects namespace osu.Game.Rulesets.Taiko.Objects
{ {
@ -18,13 +15,5 @@ namespace osu.Game.Rulesets.Taiko.Objects
/// The number of hits required to complete the swell successfully. /// The number of hits required to complete the swell successfully.
/// </summary> /// </summary>
public int RequiredHits = 10; public int RequiredHits = 10;
protected override IEnumerable<Judgement> CreateJudgements()
{
for (int i = 0; i < RequiredHits; i++)
yield return new TaikoIntermediateSwellJudgement();
yield return new TaikoJudgement();
}
} }
} }

4
osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
View File

@ -1,7 +1,9 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Taiko.Judgements;
namespace osu.Game.Rulesets.Taiko.Objects namespace osu.Game.Rulesets.Taiko.Objects
{ {
@ -28,6 +30,8 @@ namespace osu.Game.Rulesets.Taiko.Objects
/// </summary> /// </summary>
public bool IsStrong; public bool IsStrong;
protected override Judgement CreateJudgement() => new TaikoJudgement();
protected override HitWindows CreateHitWindows() => new TaikoHitWindows(); protected override HitWindows CreateHitWindows() => new TaikoHitWindows();
} }
} }