sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

DrawableStrongHandler -> DrawableNestedStrongHit

Browse Source
This commit is contained in:
smoogipoo
2018-08-14 14:28:05 +09:00
parent 7971d06df1
commit 732dfde8ed
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
View File

@ -99,11 +99,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
}
}
protected override DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => new StrongHandler(hitObject, this);
protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
private class StrongHandler : DrawableStrongHandler
private class StrongNestedHit : DrawableStrongNestedHit
{
public StrongHandler(StrongHitObject strong, DrawableDrumRoll drumRoll)
public StrongNestedHit(StrongHitObject strong, DrawableDrumRoll drumRoll)
: base(strong, drumRoll)
{
}

6
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
View File

@ -51,11 +51,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
public override bool OnPressed(TaikoAction action) => UpdateResult(true);
protected override DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => new StrongHandler(hitObject, this);
protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
private class StrongHandler : DrawableStrongHandler
private class StrongNestedHit : DrawableStrongNestedHit
{
public StrongHandler(StrongHitObject strong, DrawableDrumRollTick tick)
public StrongNestedHit(StrongHitObject strong, DrawableDrumRollTick tick)
: base(strong, tick)
{
}

6
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -127,9 +127,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
}
}
protected override DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => new StrongHandler(hitObject, this);
protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
private class StrongHandler : DrawableStrongHandler
private class StrongNestedHit : DrawableStrongNestedHit
{
/// <summary>
/// The lenience for the second key press.
@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
public new DrawableHit MainObject => (DrawableHit)base.MainObject;
public StrongHandler(StrongHitObject strong, DrawableHit hit)
public StrongNestedHit(StrongHitObject strong, DrawableHit hit)
: base(strong, hit)
{
}

4
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongHandler.cs
View File

@ -9,11 +9,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
/// <summary>
/// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoHitObject"/>s.
/// </summary>
public abstract class DrawableStrongHandler : DrawableTaikoHitObject
public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
{
public readonly DrawableHitObject MainObject;
protected DrawableStrongHandler(StrongHitObject strong, DrawableHitObject mainObject)
protected DrawableStrongNestedHit(StrongHitObject strong, DrawableHitObject mainObject)
: base(strong)
{
MainObject = mainObject;

4
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
View File

@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
var strongObject = HitObject.NestedHitObjects.OfType<StrongHitObject>().FirstOrDefault();
if (strongObject != null)
{
var vis = CreateStrongHandler(strongObject);
var vis = CreateStrongHit(strongObject);
if (vis != null)
{
AddNested(vis);
@ -127,6 +127,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
/// </summary>
/// <param name="hitObject">The strong hitobject.</param>
/// <returns>The strong hitobject handler.</returns>
protected virtual DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => null;
protected virtual DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => null;
}
}